facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

copies: group bothnew with other sets

Browse Source
This commit is contained in:
Matt Mackall 2015-08-19 15:40:13 -05:00
parent a4a77851e3
commit 3b6391ff9a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/copies.py
View File

@ -323,9 +323,11 @@ def mergecopies(repo, c1, c2, ca):
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 @@ def mergecopies(repo, c1, c2, ca):
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))