| pulkit |
| hg-reviewers |
| 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 (20 lines) |
| minor[dest] = value | minor[dest] = value | ||||
| else: | else: | ||||
| pick = _compare_values(changes, isancestor, dest, other, value) | pick = _compare_values(changes, isancestor, dest, other, value) | ||||
| if pick == PICK_MAJOR: | if pick == PICK_MAJOR: | ||||
| minor[dest] = value | minor[dest] = value | ||||
| return minor | return minor | ||||
| def _compare_values(changes, isancestor, dest, other, value): | def _compare_values(changes, isancestor, dest, minor, major): | ||||
| """compare two value within a _merge_copies_dict loop iteration""" | """compare two value within a _merge_copies_dict loop iteration""" | ||||
| new_tt = value[0] | major_tt = major[0] | ||||
| other_tt = other[0] | minor_tt = minor[0] | ||||
| if value[1] == other[1]: | if major[1] == minor[1]: | ||||
| return PICK_EITHER | 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 major_tt == minor_tt: | ||||
| return PICK_MAJOR | return PICK_MAJOR | ||||
| elif changes is not None and value[1] is None and dest in changes.salvaged: | elif changes is not None and major[1] is None and dest in changes.salvaged: | ||||
| return PICK_MINOR | return PICK_MINOR | ||||
| elif changes is not None and other[1] is None and dest in changes.salvaged: | elif changes is not None and minor[1] is None and dest in changes.salvaged: | ||||
| return PICK_MAJOR | return PICK_MAJOR | ||||
| elif changes is not None and dest in changes.merged: | elif changes is not None and dest in changes.merged: | ||||
| return PICK_MAJOR | return PICK_MAJOR | ||||
| elif not isancestor(new_tt, other_tt): | elif not isancestor(major_tt, minor_tt): | ||||
| if value[1] is not None: | if major[1] is not None: | ||||
| return PICK_MAJOR | return PICK_MAJOR | ||||
| elif isancestor(other_tt, new_tt): | elif isancestor(minor_tt, major_tt): | ||||
| return PICK_MAJOR | return PICK_MAJOR | ||||
| return PICK_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 | ||||