| pulkit |
| hg-reviewers |
This mirror what we did in the Rust code. This is useful to prepare rework for
this comparison logic that we will need to handle more advanced chaining cases
(when merges are chained).
| No Linters Available |
| No Unit Test Coverage |
In D9590#145063, @pulkit wrote:This mirror what we did in the Python code
s/Python/Rust (from commit description)
Good catch. This is fixed.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (59 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 03c83cd65aa4 | 112447b95604 | Pierre-Yves David | Dec 13 2020, 7:30 PM |
| final_copies[dest] = source | final_copies[dest] = source | ||||
| if not alwaysmatch: | if not alwaysmatch: | ||||
| for filename in list(final_copies.keys()): | for filename in list(final_copies.keys()): | ||||
| if not match(filename): | if not match(filename): | ||||
| del final_copies[filename] | del final_copies[filename] | ||||
| return final_copies | return final_copies | ||||
| # constant to decide which side to pick with _merge_copies_dict | |||||
| PICK_MINOR = 0 | |||||
| PICK_MAJOR = 1 | |||||
| PICK_EITHER = 2 | |||||
| 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. | ||||
| - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an | - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an | ||||
| ancestors of `high_rev`, | ancestors of `high_rev`, | ||||
| - `ismerged(path)`: callable return True if `path` have been merged in the | - `ismerged(path)`: callable return True if `path` have been merged in the | ||||
| current revision, | current revision, | ||||
| return the resulting dict (in practice, the "minor" object, updated) | return the resulting dict (in practice, the "minor" object, updated) | ||||
| """ | """ | ||||
| for dest, value in major.items(): | for dest, value in major.items(): | ||||
| other = minor.get(dest) | other = minor.get(dest) | ||||
| if other is None: | if other is None: | ||||
| minor[dest] = value | minor[dest] = value | ||||
| else: | else: | ||||
| pick = _compare_values(changes, isancestor, dest, other, value) | |||||
| if pick == PICK_MAJOR: | |||||
| minor[dest] = value | |||||
| return minor | |||||
| def _compare_values(changes, isancestor, dest, other, value): | |||||
| """compare two value within a _merge_copies_dict loop iteration""" | |||||
| new_tt = value[0] | new_tt = value[0] | ||||
| other_tt = other[0] | other_tt = other[0] | ||||
| if value[1] == other[1]: | if value[1] == other[1]: | ||||
| continue | return PICK_EITHER | ||||
| # content from "major" wins, unless it is older | # content from "major" wins, unless it is older | ||||
| # than the branch point or there is a merge | # than the branch point or there is a merge | ||||
| if new_tt == other_tt: | if new_tt == other_tt: | ||||
| minor[dest] = value | return PICK_MAJOR | ||||
| elif ( | elif changes is not None and value[1] is None and dest in changes.salvaged: | ||||
| changes is not None | return PICK_MINOR | ||||
| and value[1] is None | elif changes is not None and other[1] is None and dest in changes.salvaged: | ||||
| and dest in changes.salvaged | return PICK_MAJOR | ||||
| ): | |||||
| pass | |||||
| elif ( | |||||
| changes is not None | |||||
| and other[1] is None | |||||
| and dest in changes.salvaged | |||||
| ): | |||||
| minor[dest] = value | |||||
| elif changes is not None and dest in changes.merged: | elif changes is not None and dest in changes.merged: | ||||
| minor[dest] = value | return PICK_MAJOR | ||||
| elif not isancestor(new_tt, other_tt): | elif not isancestor(new_tt, other_tt): | ||||
| if value[1] is not None: | if value[1] is not None: | ||||
| minor[dest] = value | return PICK_MAJOR | ||||
| elif isancestor(other_tt, new_tt): | elif isancestor(other_tt, new_tt): | ||||
| minor[dest] = value | return PICK_MAJOR | ||||
| return minor | return PICK_MINOR | ||||
| def _revinfo_getter_extra(repo): | def _revinfo_getter_extra(repo): | ||||
| """return a function that return multiple data given a <rev>"i | """return a function that return multiple data given a <rev>"i | ||||
| * p1: revision number of first parent | * p1: revision number of first parent | ||||
| * p2: revision number of first parent | * p2: revision number of first parent | ||||
| * p1copies: mapping of copies from p1 | * p1copies: mapping of copies from p1 | ||||