Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.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 | a8e3931e3fb5 |
| children | 58b36e9ea783 |
comparison
equal
deleted
inserted
replaced
| 14433:7658221da551 | 14434:cc8c09855d19 |
|---|---|
| 1035 # update bookmarks, dirstate and mergestate | 1035 # update bookmarks, dirstate and mergestate |
| 1036 bookmarks.update(self, p1, ret) | 1036 bookmarks.update(self, p1, ret) |
| 1037 for f in changes[0] + changes[1]: | 1037 for f in changes[0] + changes[1]: |
| 1038 self.dirstate.normal(f) | 1038 self.dirstate.normal(f) |
| 1039 for f in changes[2]: | 1039 for f in changes[2]: |
| 1040 self.dirstate.forget(f) | 1040 self.dirstate.drop(f) |
| 1041 self.dirstate.setparents(ret) | 1041 self.dirstate.setparents(ret) |
| 1042 ms.reset() | 1042 ms.reset() |
| 1043 finally: | 1043 finally: |
| 1044 wlock.release() | 1044 wlock.release() |
| 1045 | 1045 |