Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 14434:cc8c09855d19
dirstate: rename forget to drop
It has substantially different semantics from forget at the command
layer, so change it to avoid confusion.
We can't simply combine it with remove because we need to explicitly
drop non-added files in some cases like commit.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 26 May 2011 17:15:35 -0500 |
| parents | c4c5e3802e9c |
| children | 5f6090e559fa |
comparison
equal
deleted
inserted
replaced
| 14433:7658221da551 | 14434:cc8c09855d19 |
|---|---|
| 840 try: | 840 try: |
| 841 for f in list: | 841 for f in list: |
| 842 if self._repo.dirstate[f] != 'a': | 842 if self._repo.dirstate[f] != 'a': |
| 843 self._repo.ui.warn(_("%s not added!\n") % f) | 843 self._repo.ui.warn(_("%s not added!\n") % f) |
| 844 else: | 844 else: |
| 845 self._repo.dirstate.forget(f) | 845 self._repo.dirstate.drop(f) |
| 846 finally: | 846 finally: |
| 847 wlock.release() | 847 wlock.release() |
| 848 | 848 |
| 849 def ancestors(self): | 849 def ancestors(self): |
| 850 for a in self._repo.changelog.ancestors( | 850 for a in self._repo.changelog.ancestors( |
| 861 except OSError, inst: | 861 except OSError, inst: |
| 862 if inst.errno != errno.ENOENT: | 862 if inst.errno != errno.ENOENT: |
| 863 raise | 863 raise |
| 864 for f in list: | 864 for f in list: |
| 865 if self._repo.dirstate[f] == 'a': | 865 if self._repo.dirstate[f] == 'a': |
| 866 self._repo.dirstate.forget(f) | 866 self._repo.dirstate.drop(f) |
| 867 elif f not in self._repo.dirstate: | 867 elif f not in self._repo.dirstate: |
| 868 self._repo.ui.warn(_("%s not tracked!\n") % f) | 868 self._repo.ui.warn(_("%s not tracked!\n") % f) |
| 869 else: | 869 else: |
| 870 self._repo.dirstate.remove(f) | 870 self._repo.dirstate.remove(f) |
| 871 finally: | 871 finally: |