Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 14467:f3b50431eb7e
workingctx.remove: use self.forget
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 27 May 2011 21:11:44 +0200 |
parents | 5f6090e559fa |
children | a67e866f46f9 |
comparison
equal
deleted
inserted
replaced
14466:bd34a027f3ed | 14467:f3b50431eb7e |
---|---|
861 try: | 861 try: |
862 util.unlinkpath(self._repo.wjoin(f)) | 862 util.unlinkpath(self._repo.wjoin(f)) |
863 except OSError, inst: | 863 except OSError, inst: |
864 if inst.errno != errno.ENOENT: | 864 if inst.errno != errno.ENOENT: |
865 raise | 865 raise |
866 for f in list: | 866 self.forget(list) |
867 if self._repo.dirstate[f] == 'a': | |
868 self._repo.dirstate.drop(f) | |
869 elif f not in self._repo.dirstate: | |
870 self._repo.ui.warn(_("%s not tracked!\n") % f) | |
871 else: | |
872 self._repo.dirstate.remove(f) | |
873 finally: | 867 finally: |
874 wlock.release() | 868 wlock.release() |
875 | 869 |
876 def undelete(self, list): | 870 def undelete(self, list): |
877 pctxs = self.parents() | 871 pctxs = self.parents() |