facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

revert: move code dealing with deletions closer together

Browse Source
This commit is contained in:
Martin von Zweigbergk 2016-02-24 14:44:14 -08:00
parent e1ac204a83
commit ee94a5599f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mercurial/cmdutil.py
View File

@ -2976,13 +2976,6 @@ def revert(ui, repo, ctx, parents, *pats, **opts):
clean = set(changes.clean)
modadded = set()
# determine the exact nature of the deleted changesets
deladded = set(_deleted)
for path in _deleted:
if path in mf:
deladded.remove(path)
deleted = _deleted - deladded
# We need to account for the state of the file in the dirstate,
# even when we revert against something else than parent. This will
# slightly alter the behavior of revert (doing back up or not, delete
@ -3040,6 +3033,13 @@ def revert(ui, repo, ctx, parents, *pats, **opts):
dsremoved.add(src)
names[src] = (repo.pathto(src, cwd), True)
# determine the exact nature of the deleted changesets
deladded = set(_deleted)
for path in _deleted:
if path in mf:
deladded.remove(path)
deleted = _deleted - deladded
# distinguish between file to forget and the other
added = set()
for abs in dsadded: