| pulkit |
| hg-reviewers |
By filtering "during" the iteration we were excluding rename information that
were not in the matched set but that file served as base information for the
matched set.
We now do all copy tracing matching at the end of the process to ensure we raise
proper result.
If we were aggregating information top down instead of bottom up we could do
filtering during processing. However, we don't.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (16 lines) | |||
| M | tests/test-copies-chain-merge.t (13 lines) |
| cl = repo.changelog | cl = repo.changelog | ||||
| parents = cl.parentrevs | parents = cl.parentrevs | ||||
| flags = cl.flags | flags = cl.flags | ||||
| HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO | HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO | ||||
| changelogrevision = cl.changelogrevision | changelogrevision = cl.changelogrevision | ||||
| alwaysmatch = match.always() | if rustmod is not None: | ||||
| if rustmod is not None and alwaysmatch: | |||||
| def revinfo(rev): | def revinfo(rev): | ||||
| p1, p2 = parents(rev) | p1, p2 = parents(rev) | ||||
| if flags(rev) & HASCOPIESINFO: | if flags(rev) & HASCOPIESINFO: | ||||
| raw = changelogrevision(rev)._sidedata.get(sidedatamod.SD_FILES) | raw = changelogrevision(rev)._sidedata.get(sidedatamod.SD_FILES) | ||||
| else: | else: | ||||
| raw = None | raw = None | ||||
| return (p1, p2, raw) | return (p1, p2, raw) | ||||
| revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) | revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) | ||||
| match: a matcher | match: a matcher | ||||
| It returns the aggregated copies information for `targetrev`. | It returns the aggregated copies information for `targetrev`. | ||||
| """ | """ | ||||
| alwaysmatch = match.always() | alwaysmatch = match.always() | ||||
| if rustmod is not None and alwaysmatch: | if rustmod is not None: | ||||
| final_copies = rustmod.combine_changeset_copies( | final_copies = rustmod.combine_changeset_copies( | ||||
| list(revs), children_count, targetrev, revinfo, isancestor | list(revs), children_count, targetrev, revinfo, isancestor | ||||
| ) | ) | ||||
| else: | else: | ||||
| isancestor = cached_is_ancestor(isancestor) | isancestor = cached_is_ancestor(isancestor) | ||||
| all_copies = {} | all_copies = {} | ||||
| # iterate over all the "children" side of copy tracing "edge" | # iterate over all the "children" side of copy tracing "edge" | ||||
| # chain the data in the edge with the existing data | # chain the data in the edge with the existing data | ||||
| if changes is not None: | if changes is not None: | ||||
| childcopies = {} | childcopies = {} | ||||
| if parent == 1: | if parent == 1: | ||||
| childcopies = changes.copied_from_p1 | childcopies = changes.copied_from_p1 | ||||
| elif parent == 2: | elif parent == 2: | ||||
| childcopies = changes.copied_from_p2 | childcopies = changes.copied_from_p2 | ||||
| if not alwaysmatch: | |||||
| childcopies = { | |||||
| dst: src | |||||
| for dst, src in childcopies.items() | |||||
| if match(dst) | |||||
| } | |||||
| if childcopies: | if childcopies: | ||||
| newcopies = copies.copy() | newcopies = copies.copy() | ||||
| for dest, source in pycompat.iteritems(childcopies): | for dest, source in pycompat.iteritems(childcopies): | ||||
| prev = copies.get(source) | prev = copies.get(source) | ||||
| if prev is not None and prev[1] is not None: | if prev is not None and prev[1] is not None: | ||||
| source = prev[1] | source = prev[1] | ||||
| newcopies[dest] = (current_rev, source) | newcopies[dest] = (current_rev, source) | ||||
| assert newcopies is not copies | assert newcopies is not copies | ||||
| ) | ) | ||||
| all_copies[current_rev] = current_copies | all_copies[current_rev] = current_copies | ||||
| # filter out internal details and return a {dest: source mapping} | # filter out internal details and return a {dest: source mapping} | ||||
| final_copies = {} | final_copies = {} | ||||
| for dest, (tt, source) in all_copies[targetrev].items(): | for dest, (tt, source) in all_copies[targetrev].items(): | ||||
| if source is not None: | if source is not None: | ||||
| final_copies[dest] = source | final_copies[dest] = source | ||||
| if not alwaysmatch: | |||||
| for filename in list(final_copies.keys()): | |||||
| if not match(filename): | |||||
| del final_copies[filename] | |||||
| return final_copies | return final_copies | ||||
| def _merge_copies_dict(minor, major, isancestor, changes): | def _merge_copies_dict(minor, major, isancestor, changes): | ||||
| """merge two copies-mapping together, minor and major | """merge two copies-mapping together, minor and major | ||||
| In case of conflict, value from "major" will be picked. | In case of conflict, value from "major" will be picked. | ||||
| '\x00\x00\x00\x00' | '\x00\x00\x00\x00' | ||||
| #endif | #endif | ||||
| Test copy information chaining | Test copy information chaining | ||||
| ============================== | ============================== | ||||
| Check that matching only affect the destination and not intermediate path | |||||
| ------------------------------------------------------------------------- | |||||
| The two status call should give the same value for f | |||||
| $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' | |||||
| A f | |||||
| a | |||||
| R a | |||||
| $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f | |||||
| A f | |||||
| a (no-changeset no-compatibility !) | |||||
| merging with unrelated change does not interfere with the renames | merging with unrelated change does not interfere with the renames | ||||
| --------------------------------------------------------------- | --------------------------------------------------------------- | ||||
| - rename on one side | - rename on one side | ||||
| - unrelated change on the other side | - unrelated change on the other side | ||||
| $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' | $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' | ||||
| o 12 mABm-0 simple merge - the other way | o 12 mABm-0 simple merge - the other way | ||||