| pulkit |
| hg-reviewers |
We have to change how we deal with matching (see next changeset) and that
processing is common. So we shuffle things around before doing the semantic
change for clarity.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (166 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| adc9a78f5b89 | 490028696471 | Pierre-Yves David | Dec 13 2020, 2:26 PM |
| 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 and alwaysmatch: | ||||
| return 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: | |||||
| 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" | ||||
| for current_rev in revs: | for current_rev in revs: | ||||
| p1, p2, changes = revinfo(current_rev) | p1, p2, changes = revinfo(current_rev) | ||||
| current_copies = None | current_copies = None | ||||
| # iterate over all parents to chain the existing data with the | # iterate over all parents to chain the existing data with the | ||||
| # data from the parent → child edge. | # data from the parent → child edge. | ||||
| for parent, parent_rev in ((1, p1), (2, p2)): | for parent, parent_rev in ((1, p1), (2, p2)): | ||||
| if parent_rev == node.nullrev: | if parent_rev == node.nullrev: | ||||
| continue | continue | ||||
| remaining_children = children_count.get(parent_rev) | remaining_children = children_count.get(parent_rev) | ||||
| if remaining_children is None: | if remaining_children is None: | ||||
| continue | continue | ||||
| remaining_children -= 1 | remaining_children -= 1 | ||||
| children_count[parent_rev] = remaining_children | children_count[parent_rev] = remaining_children | ||||
| if remaining_children: | if remaining_children: | ||||
| copies = all_copies.get(parent_rev, None) | copies = all_copies.get(parent_rev, None) | ||||
| else: | else: | ||||
| copies = all_copies.pop(parent_rev, None) | copies = all_copies.pop(parent_rev, None) | ||||
| if copies is None: | if copies is None: | ||||
| # this is a root | # this is a root | ||||
| copies = {} | copies = {} | ||||
| newcopies = copies | newcopies = copies | ||||
| # 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: | if not alwaysmatch: | ||||
| childcopies = { | childcopies = { | ||||
| dst: src | dst: src | ||||
| for dst, src in childcopies.items() | for dst, src in childcopies.items() | ||||
| if match(dst) | 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 | ||||
| if changes.removed: | if changes.removed: | ||||
| if newcopies is copies: | if newcopies is copies: | ||||
| newcopies = copies.copy() | newcopies = copies.copy() | ||||
| for f in changes.removed: | for f in changes.removed: | ||||
| if f in newcopies: | if f in newcopies: | ||||
| if newcopies is copies: | if newcopies is copies: | ||||
| # copy on write to avoid affecting potential other | # copy on write to avoid affecting potential other | ||||
| # branches. when there are no other branches, this | # branches. when there are no other branches, this | ||||
| # could be avoided. | # could be avoided. | ||||
| newcopies = copies.copy() | newcopies = copies.copy() | ||||
| newcopies[f] = (current_rev, None) | newcopies[f] = (current_rev, None) | ||||
| # check potential need to combine the data from another parent (for | # check potential need to combine the data from another parent (for | ||||
| # that child). See comment below for details. | # that child). See comment below for details. | ||||
| if current_copies is None: | if current_copies is None: | ||||
| current_copies = newcopies | current_copies = newcopies | ||||
| elif current_copies is newcopies: | elif current_copies is newcopies: | ||||
| # nothing to merge: | # nothing to merge: | ||||
| pass | pass | ||||
| else: | else: | ||||
| # we are the second parent to work on c, we need to merge our | # we are the second parent to work on c, we need to merge our | ||||
| # work with the other. | # work with the other. | ||||
| # | # | ||||
| # In case of conflict, parent 1 take precedence over parent 2. | # In case of conflict, parent 1 take precedence over parent 2. | ||||
| # This is an arbitrary choice made anew when implementing | # This is an arbitrary choice made anew when implementing | ||||
| # changeset based copies. It was made without regards with | # changeset based copies. It was made without regards with | ||||
| # potential filelog related behavior. | # potential filelog related behavior. | ||||
| assert parent == 2 | assert parent == 2 | ||||
| current_copies = _merge_copies_dict( | current_copies = _merge_copies_dict( | ||||
| newcopies, current_copies, isancestor, changes | newcopies, current_copies, isancestor, changes | ||||
| ) | ) | ||||
| 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 | ||||
| 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. | ||||