Mercurial > hg

comparison mercurial/copies.py @ 46149:294d5aca4ff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: iterate over children directly (instead of parents) Before this change we would gather all parent → child edges and iterate on all parent, gathering copy information for children and aggregating them from there. They are not strict requirement for edges to be processed in that specific order. We could also simply iterate over all "children" revision and aggregate data from both parents at the same time. This patch does that. It make various things simpler: * since both parents are processed at the same time, we no longer need to cache data for merge (see next changeset for details), * we no longer need nested loop to process data, * we no longer need to store partial merge data for a rev from distinct loop interaction to another when processing merges, * we no longer need to build a full parent -> children mapping (we only rely on a simpler "parent -> number of children" map (for memory efficiency), * the data access pattern is now simpler (from lower revisions to higher revisions) and entirely predicable. That predictability open the way to prefetching and parallel processing. So that new iterations order requires simpler code and open the way to interesting optimisation. The effect on performance is quite good. In the worse case, we don't see any significant negative impact. And in the best case, the reduction of roundtrip to Python provide us with a significant speed. Some example below: Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev # full comparison between the previous changeset and this one Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9422
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 14 Dec 2020 11:32:24 +0100
parents 70a9eb899637
children a132aa5979ec
comparison
equal deleted inserted replaced
46148:70a9eb899637 46149:294d5aca4ff5
286 repo = a.repo().unfiltered() 286 repo = a.repo().unfiltered()
287 children = {} 287 children = {}
288 288
289 cl = repo.changelog 289 cl = repo.changelog
290 isancestor = cl.isancestorrev 290 isancestor = cl.isancestorrev
291 missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()]) 291
292 mrset = set(missingrevs) 292 # To track rename from "A" to B, we need to gather all parent → children
293 # edges that are contains in `::B` but not in `::A`.
294 #
295 #
296 # To do so, we need to gather all revisions exclusive¹ to "B" (ie¹: `::b -
297 # ::a`) and also all the "roots point", ie the parents of the exclusive set
298 # that belong to ::a. These are exactly all the revisions needed to express
299 # the parent → children we need to combine.
300 #
301 # [1] actually, we need to gather all the edges within `(::a)::b`, ie:
302 # excluding paths that leads to roots that are not ancestors of `a`. We
303 # keep this out of the explanation because it is hard enough without this special case..
304
305 parents = cl._uncheckedparentrevs
306 graph_roots = (nullrev, nullrev)
307
308 ancestors = cl.ancestors([a.rev()], inclusive=True)
309 revs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
293 roots = set() 310 roots = set()
294 for r in missingrevs: 311 has_graph_roots = False
295 for p in cl.parentrevs(r): 312
296 if p == nullrev: 313 # iterate over `only(B, A)`
297 continue 314 for r in revs:
298 if p not in children: 315 ps = parents(r)
299 children[p] = [r] 316 if ps == graph_roots:
300 else: 317 has_graph_roots = True
301 children[p].append(r) 318 else:
302 if p not in mrset: 319 p1, p2 = ps
303 roots.add(p) 320
321 # find all the "root points" (see larger comment above)
322 if p1 != nullrev and p1 in ancestors:
323 roots.add(p1)
324 if p2 != nullrev and p2 in ancestors:
325 roots.add(p2)
304 if not roots: 326 if not roots:
305 # no common revision to track copies from 327 # no common revision to track copies from
306 return {} 328 return {}
307 min_root = min(roots) 329 if has_graph_roots:
308 330 # this deal with the special case mentionned in the [1] footnotes. We
309 from_head = set( 331 # must filter out revisions that leads to non-common graphroots.
310 cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True) 332 roots = list(roots)
311 ) 333 m = min(roots)
312 334 h = [b.rev()]
313 iterrevs = set(from_head) 335 roots_to_head = cl.reachableroots(m, h, roots, includepath=True)
314 iterrevs &= mrset 336 roots_to_head = set(roots_to_head)
315 iterrevs.update(roots) 337 revs = [r for r in revs if r in roots_to_head]
316 iterrevs.remove(b.rev())
317 revs = sorted(iterrevs)
318 338
319 if repo.filecopiesmode == b'changeset-sidedata': 339 if repo.filecopiesmode == b'changeset-sidedata':
340 # When using side-data, we will process the edges "from" the children.
341 # We iterate over the childre, gathering previous collected data for
342 # the parents. Do know when the parents data is no longer necessary, we
343 # keep a counter of how many children each revision has.
344 #
345 # An interresting property of `children_count` is that it only contains
346 # revision that will be relevant for a edge of the graph. So if a
347 # children has parent not in `children_count`, that edges should not be
348 # processed.
349 children_count = dict((r, 0) for r in roots)
350 for r in revs:
351 for p in cl.parentrevs(r):
352 if p == nullrev:
353 continue
354 children_count[r] = 0
355 if p in children_count:
356 children_count[p] += 1
320 revinfo = _revinfo_getter(repo, match) 357 revinfo = _revinfo_getter(repo, match)
321 return _combine_changeset_copies( 358 return _combine_changeset_copies(
322 revs, children, b.rev(), revinfo, match, isancestor 359 revs, children_count, b.rev(), revinfo, match, isancestor
323 ) 360 )
324 else: 361 else:
362 # When not using side-data, we will process the edges "from" the parent.
363 # so we need a full mapping of the parent -> children relation.
364 children = dict((r, []) for r in roots)
365 for r in revs:
366 for p in cl.parentrevs(r):
367 if p == nullrev:
368 continue
369 children[r] = []
370 if p in children:
371 children[p].append(r)
372 x = revs.pop()
373 assert x == b.rev()
374 revs.extend(roots)
375 revs.sort()
376
325 revinfo = _revinfo_getter_extra(repo) 377 revinfo = _revinfo_getter_extra(repo)
326 return _combine_changeset_copies_extra( 378 return _combine_changeset_copies_extra(
327 revs, children, b.rev(), revinfo, match, isancestor 379 revs, children, b.rev(), revinfo, match, isancestor
328 ) 380 )
329 381
330 382
331 def _combine_changeset_copies( 383 def _combine_changeset_copies(
332 revs, children, targetrev, revinfo, match, isancestor 384 revs, children_count, targetrev, revinfo, match, isancestor
333 ): 385 ):
334 """combine the copies information for each item of iterrevs 386 """combine the copies information for each item of iterrevs
335 387
336 revs: sorted iterable of revision to visit 388 revs: sorted iterable of revision to visit
337 children: a {parent: [children]} mapping. 389 children_count: a {parent: <number-of-relevant-children>} mapping.
338 targetrev: the final copies destination revision (not in iterrevs) 390 targetrev: the final copies destination revision (not in iterrevs)
339 revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) 391 revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed)
340 match: a matcher 392 match: a matcher
341 393
342 It returns the aggregated copies information for `targetrev`. 394 It returns the aggregated copies information for `targetrev`.
344 396
345 alwaysmatch = match.always() 397 alwaysmatch = match.always()
346 398
347 if rustmod is not None and alwaysmatch: 399 if rustmod is not None and alwaysmatch:
348 return rustmod.combine_changeset_copies( 400 return rustmod.combine_changeset_copies(
349 list(revs), children, targetrev, revinfo, isancestor 401 list(revs), children_count, targetrev, revinfo, isancestor
350 ) 402 )
351 403
352 isancestor = cached_is_ancestor(isancestor) 404 isancestor = cached_is_ancestor(isancestor)
353 405
354 all_copies = {} 406 all_copies = {}
355 # iterate over all the "parent" side of copy tracing "edge" 407 # iterate over all the "children" side of copy tracing "edge"
356 for r in revs: 408 for current_rev in revs:
357 # fetch potential previously computed data for that parent 409 p1, p2, changes = revinfo(current_rev)
358 copies = all_copies.pop(r, None) 410 current_copies = None
359 if copies is None: 411
360 # this is a root 412 # iterate over all parents to chain the existing data with the
361 copies = {}
362
363 # iterate over all known children to chain the existing data with the
364 # data from the parent → child edge. 413 # data from the parent → child edge.
365 for i, c in enumerate(children[r]): 414 for parent, parent_rev in ((1, p1), (2, p2)):
366 p1, p2, changes = revinfo(c) 415 if parent_rev == nullrev:
367 childcopies = {} 416 continue
368 417 remaining_children = children_count.get(parent_rev)
369 # select the right parent → child edge 418 if remaining_children is None:
370 if r == p1: 419 continue
371 parent = 1 420 remaining_children -= 1
372 if changes is not None: 421 children_count[parent_rev] = remaining_children
422 if remaining_children:
423 copies = all_copies.get(parent_rev, None)
424 else:
425 copies = all_copies.pop(parent_rev, None)
426
427 if copies is None:
428 # this is a root
429 copies = {}
430
431 newcopies = copies
432 # chain the data in the edge with the existing data
433 if changes is not None:
434 childcopies = {}
435 if parent == 1:
373 childcopies = changes.copied_from_p1 436 childcopies = changes.copied_from_p1
374 else: 437 elif parent == 2:
375 assert r == p2
376 parent = 2
377 if changes is not None:
378 childcopies = changes.copied_from_p2 438 childcopies = changes.copied_from_p2
379 if not alwaysmatch: 439
380 childcopies = { 440 if not alwaysmatch:
381 dst: src for dst, src in childcopies.items() if match(dst) 441 childcopies = {
382 } 442 dst: src
383 443 for dst, src in childcopies.items()
384 # chain the data in the edge with the existing data 444 if match(dst)
385 newcopies = copies 445 }
386 if childcopies: 446 if childcopies:
387 newcopies = copies.copy()
388 for dest, source in pycompat.iteritems(childcopies):
389 prev = copies.get(source)
390 if prev is not None and prev[1] is not None:
391 source = prev[1]
392 newcopies[dest] = (c, source)
393 assert newcopies is not copies
394 if changes is not None and changes.removed:
395 if newcopies is copies:
396 newcopies = copies.copy() 447 newcopies = copies.copy()
397 for f in changes.removed: 448 for dest, source in pycompat.iteritems(childcopies):
398 if f in newcopies: 449 prev = copies.get(source)
399 if newcopies is copies: 450 if prev is not None and prev[1] is not None:
400 # copy on write to avoid affecting potential other 451 source = prev[1]
401 # branches. when there are no other branches, this 452 newcopies[dest] = (current_rev, source)
402 # could be avoided. 453 assert newcopies is not copies
403 newcopies = copies.copy() 454 if changes.removed:
404 newcopies[f] = (c, None) 455 if newcopies is copies:
456 newcopies = copies.copy()
457 for f in changes.removed:
458 if f in newcopies:
459 if newcopies is copies:
460 # copy on write to avoid affecting potential other
461 # branches. when there are no other branches, this
462 # could be avoided.
463 newcopies = copies.copy()
464 newcopies[f] = (current_rev, None)
405 465
406 # check potential need to combine the data from another parent (for 466 # check potential need to combine the data from another parent (for
407 # that child). See comment below for details. 467 # that child). See comment below for details.
408 othercopies = all_copies.get(c) 468 if current_copies is None:
409 if othercopies is None: 469 current_copies = newcopies
410 all_copies[c] = newcopies 470 elif current_copies is newcopies:
411 elif newcopies is othercopies:
412 # nothing to merge: 471 # nothing to merge:
413 pass 472 pass
414 else: 473 else:
415 # we are the second parent to work on c, we need to merge our 474 # we are the second parent to work on c, we need to merge our
416 # work with the other. 475 # work with the other.
417 # 476 #
418 # In case of conflict, parent 1 take precedence over parent 2. 477 # In case of conflict, parent 1 take precedence over parent 2.
419 # This is an arbitrary choice made anew when implementing 478 # This is an arbitrary choice made anew when implementing
420 # changeset based copies. It was made without regards with 479 # changeset based copies. It was made without regards with
421 # potential filelog related behavior. 480 # potential filelog related behavior.
422 if parent == 1: 481 assert parent == 2
423 if newcopies is copies: 482 current_copies = _merge_copies_dict(
424 newcopies = copies.copy() 483 newcopies, current_copies, isancestor, changes
425 minor, major = othercopies, newcopies 484 )
426 else: 485 all_copies[current_rev] = current_copies
427 # we do not know if the other dict is a copy or not, so we
428 # need to blindly copy it. Future change should make this
429 # unnecessary.
430 minor, major = newcopies, othercopies.copy()
431 copies = _merge_copies_dict(minor, major, isancestor, changes)
432 all_copies[c] = copies
433 486
434 # filter out internal details and return a {dest: source mapping} 487 # filter out internal details and return a {dest: source mapping}
435 final_copies = {} 488 final_copies = {}
436 for dest, (tt, source) in all_copies[targetrev].items(): 489 for dest, (tt, source) in all_copies[targetrev].items():
437 if source is not None: 490 if source is not None: