[PATCH 2 of 5] copies: begin separating mergecopies sides
Matt Mackall
mpm at selenic.com
Wed Sep 23 15:07:08 CDT 2015
# HG changeset patch
# User Matt Mackall <mpm at selenic.com>
# Date 1440009618 18000
# Wed Aug 19 13:40:18 2015 -0500
# Node ID ae018fcd2e7b76bf4a4c95793675f2692749a9ef
# Parent dcad26a3da77b22847b9995aa816dd6290f2db65
copies: begin separating mergecopies sides
diff -r dcad26a3da77 -r ae018fcd2e7b mercurial/copies.py
--- a/mercurial/copies.py Wed Aug 19 13:09:54 2015 -0500
+++ b/mercurial/copies.py Wed Aug 19 13:40:18 2015 -0500
@@ -316,9 +316,9 @@
return fctx
return util.lrucachefunc(makectx)
- copy = {}
- movewithdir = {}
- fullcopy = {}
+ copy1, copy2, = {}, {}
+ movewithdir1, movewithdir2 = {}, {}
+ fullcopy1, fullcopy2 = {}, {}
diverge = {}
repo.ui.debug(" searching for copies back to rev %d\n" % limit)
@@ -329,11 +329,15 @@
for f in u1:
getfctx = setupctx(c1)
- checkcopies(getfctx, f, m1, m2, ca, limit, diverge, copy, fullcopy)
+ checkcopies(getfctx, f, m1, m2, ca, limit, diverge, copy1, fullcopy1)
for f in u2:
getfctx = setupctx(c2)
- checkcopies(getfctx, f, m2, m1, ca, limit, diverge, copy, fullcopy)
+ checkcopies(getfctx, f, m2, m1, ca, limit, diverge, copy2, fullcopy2)
+
+ copy = dict(copy1.items() + copy2.items())
+ movewithdir = dict(movewithdir1.items() + movewithdir2.items())
+ fullcopy = dict(fullcopy1.items() + fullcopy2.items())
renamedelete = {}
renamedelete2 = set()
More information about the Mercurial-devel
mailing list