Show More
@@ -281,9 +281,24 b' def _changesetforwardcopies(a, b, match)' | |||
|
281 | 281 | iterrevs &= mrset |
|
282 | 282 | iterrevs.update(roots) |
|
283 | 283 | iterrevs.remove(b.rev()) |
|
284 | revs = sorted(iterrevs) | |
|
285 | return _combinechangesetcopies(revs, children, b.rev(), revinfo, match) | |
|
286 | ||
|
287 | ||
|
288 | def _combinechangesetcopies(revs, children, targetrev, revinfo, match): | |
|
289 | """combine the copies information for each item of iterrevs | |
|
290 | ||
|
291 | revs: sorted iterable of revision to visit | |
|
292 | children: a {parent: [children]} mapping. | |
|
293 | targetrev: the final copies destination revision (not in iterrevs) | |
|
294 | revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) | |
|
295 | match: a matcher | |
|
296 | ||
|
297 | It returns the aggregated copies information for `targetrev`. | |
|
298 | """ | |
|
284 | 299 | all_copies = {} |
|
285 | 300 | alwaysmatch = match.always() |
|
286 |
for r in |
|
|
301 | for r in revs: | |
|
287 | 302 | copies = all_copies.pop(r, None) |
|
288 | 303 | if copies is None: |
|
289 | 304 | # this is a root |
@@ -336,7 +351,7 b' def _changesetforwardcopies(a, b, match)' | |||
|
336 | 351 | else: |
|
337 | 352 | newcopies.update(othercopies) |
|
338 | 353 | all_copies[c] = newcopies |
|
339 |
return all_copies[ |
|
|
354 | return all_copies[targetrev] | |
|
340 | 355 | |
|
341 | 356 | |
|
342 | 357 | def _forwardcopies(a, b, base=None, match=None): |
General Comments 0
You need to be logged in to leave comments.
Login now