##// END OF EJS Templates
copies: pass changectx instead of manifest to _computenonoverlap...
Durham Goode -
r24625:2cebf17c default
parent child Browse files
Show More
@@ -209,12 +209,12 b' def pathcopies(x, y):'
209 return _backwardrenames(x, y)
209 return _backwardrenames(x, y)
210 return _chain(x, y, _backwardrenames(x, a), _forwardcopies(a, y))
210 return _chain(x, y, _backwardrenames(x, a), _forwardcopies(a, y))
211
211
212 def _computenonoverlap(repo, m1, m2, addedinm1, addedinm2):
212 def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2):
213 """Computes, based on addedinm1 and addedinm2, the files exclusive to m1
213 """Computes, based on addedinm1 and addedinm2, the files exclusive to c1
214 and m2. This is its own function so extensions can easily wrap this call
214 and c2. This is its own function so extensions can easily wrap this call
215 to see what files mergecopies is about to process.
215 to see what files mergecopies is about to process.
216
216
217 Even though m1 and m2 are not used in this function, they are useful in
217 Even though c1 and c2 are not used in this function, they are useful in
218 other extensions for being able to read the file nodes of the changed files.
218 other extensions for being able to read the file nodes of the changed files.
219 """
219 """
220 u1 = sorted(addedinm1 - addedinm2)
220 u1 = sorted(addedinm1 - addedinm2)
@@ -310,7 +310,7 b' def mergecopies(repo, c1, c2, ca):'
310
310
311 addedinm1 = m1.filesnotin(ma)
311 addedinm1 = m1.filesnotin(ma)
312 addedinm2 = m2.filesnotin(ma)
312 addedinm2 = m2.filesnotin(ma)
313 u1, u2 = _computenonoverlap(repo, m1, m2, addedinm1, addedinm2)
313 u1, u2 = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
314
314
315 for f in u1:
315 for f in u1:
316 ctx = setupctx(c1)
316 ctx = setupctx(c1)
General Comments 0
You need to be logged in to leave comments. Login now