Mercurial > hg

changeset 26659:df66736a128e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: group bothnew with other sets
author Matt Mackall <mpm@selenic.com>
date Wed, 19 Aug 2015 15:40:13 -0500
parents aabfa0fb7e3e
children 7e1baad90121
files mercurial/copies.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Wed Aug 19 15:32:27 2015 -0500
+++ b/mercurial/copies.py	Wed Aug 19 15:40:13 2015 -0500
@@ -323,9 +323,11 @@
     fullcopy1, fullcopy2 = {}, {}
     diverge = {}
 
+    # find interesting file sets from manifests
     addedinm1 = m1.filesnotin(ma)
     addedinm2 = m2.filesnotin(ma)
     u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
+    bothnew = sorted(addedinm1 & addedinm2)
 
     for f in u1:
         checkcopies(c1, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
@@ -351,7 +353,6 @@
         else:
             divergeset.update(fl) # reverse map for below
 
-    bothnew = sorted(addedinm1 & addedinm2)
     if bothnew:
         repo.ui.debug("  unmatched files new in both:\n   %s\n"
                       % "\n   ".join(bothnew))