[PATCH 5 of 5] copies: group bothnew with other sets

Matt Mackall mpm at selenic.com
Tue Oct 13 17:36:01 CDT 2015


# HG changeset patch
# User Matt Mackall <mpm at selenic.com>
# Date 1440016813 18000
#      Wed Aug 19 15:40:13 2015 -0500
# Node ID 7dd1aacc2d2f23fd4866e2fc8caa22f5999ec433
# Parent  3cba6981a8d2c17670dd09ecc86ca23f894c62d1
copies: group bothnew with other sets

diff -r 3cba6981a8d2 -r 7dd1aacc2d2f mercurial/copies.py
--- 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))


More information about the Mercurial-devel mailing list