Show More
@@ -209,10 +209,13 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, addedinm1, addedinm2): |
|
212 | def _computenonoverlap(repo, m1, m2, 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 m1 | |
214 | and m2. This is its own function so extensions can easily wrap this call |
|
214 | and m2. 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 | ||||
|
217 | Even though m1 and m2 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. | |||
216 | """ |
|
219 | """ | |
217 | u1 = sorted(addedinm1 - addedinm2) |
|
220 | u1 = sorted(addedinm1 - addedinm2) | |
218 | u2 = sorted(addedinm2 - addedinm1) |
|
221 | u2 = sorted(addedinm2 - addedinm1) | |
@@ -280,7 +283,7 b' def mergecopies(repo, c1, c2, ca):' | |||||
280 |
|
283 | |||
281 | addedinm1 = m1.filesnotin(ma) |
|
284 | addedinm1 = m1.filesnotin(ma) | |
282 | addedinm2 = m2.filesnotin(ma) |
|
285 | addedinm2 = m2.filesnotin(ma) | |
283 | u1, u2 = _computenonoverlap(repo, addedinm1, addedinm2) |
|
286 | u1, u2 = _computenonoverlap(repo, m1, m2, addedinm1, addedinm2) | |
284 |
|
287 | |||
285 | for f in u1: |
|
288 | for f in u1: | |
286 | checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy) |
|
289 | checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy) |
General Comments 0
You need to be logged in to leave comments.
Login now