# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2016-02-24 22:44:14
# Node ID accdd5e6206680ebb1dc542802161ea75327453f
# Parent  e5aab82edf7f02682d6faabb74cbbbe15279db2e

revert: move code dealing with deletions closer together

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2976,13 +2976,6 @@ def revert(ui, repo, ctx, parents, *pats
         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
                 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: