Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 44198:8ad263c3a358

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move initialization of copy dicts to one place Differential Revision: https://phab.mercurial-scm.org/D7988
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 22 Jan 2020 16:45:56 -0800
parents faec51c76b7b
children 7f8bdee0034e
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jan 24 10:39:55 2020 -0800
+++ b/mercurial/merge.py	Wed Jan 22 16:45:56 2020 -0800
@@ -1256,14 +1256,13 @@
     if matcher is not None and matcher.always():
         matcher = None
 
-    copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
-
     # manifests fetched in order are going to be faster, so prime the caches
     [
         x.manifest()
         for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
     ]
 
+    copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
     if followcopies:
         ret = copies.mergecopies(repo, wctx, p2, pa)
         copy, movewithdir, diverge, renamedelete, dirmove = ret