Mercurial > hg-stable
changeset 22489:0d57bf80c7cb
revert: have an explicit action for "forget"
The distinction between "remove" and "forget" used to be in special logic
checking for the state of the file in the dirstate. Now that we have dedicated
filtering, we can stop relying on this logic and have two distinct actions.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 01 Sep 2014 12:36:48 +0200 |
| parents | 6c52ed3f888e |
| children | bcab7bc7280e |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Aug 30 18:20:29 2014 +0200 +++ b/mercurial/cmdutil.py Mon Sep 01 12:36:48 2014 +0200 @@ -2604,18 +2604,12 @@ dsremovunk.add(abs) dsremoved -= dsremovunk - ## computation of the action to performs on `names` content. - - def removeforget(abs): - if repo.dirstate[abs] == 'a': - return _('forgetting %s\n') - return _('removing %s\n') - # action to be actually performed by revert # (<list of file>, message>) tuple actions = {'revert': ([], _('reverting %s\n')), 'add': ([], _('adding %s\n')), - 'remove': ([], removeforget), + 'remove': ([], _('removing %s\n')), + 'forget': ([], _('forgetting %s\n')), 'undelete': ([], _('undeleting %s\n')), 'noop': (None, _('no changes needed to %s\n')), 'unknown': (None, _('file not managed: %s\n')), @@ -2642,7 +2636,7 @@ # Added since target (added, actions['remove'], discard), # Added in working directory - (dsadded, actions['remove'], discard), + (dsadded, actions['forget'], discard), # Removed since target, before working copy parent (removed, actions['add'], discard), # Same as `removed` but an unknown file exists at the same path @@ -2717,10 +2711,9 @@ repo.wwrite(f, fc.data(), fc.flags()) audit_path = pathutil.pathauditor(repo.root) + for f in actions['forget'][0]: + repo.dirstate.drop(f) for f in actions['remove'][0]: - if repo.dirstate[f] == 'a': - repo.dirstate.drop(f) - continue audit_path(f) try: util.unlinkpath(repo.wjoin(f))