Mercurial > public > mercurial-scm > hg
diff mercurial/copies.py @ 46562:c692384bb559
copies: rearrange all value comparison conditional
To properly handle the newly tested case (chaining of merges) we will need to
detect more accurately when an actualy merging of the copy information (and
superseed the two existing data). Before starting to do so, we need to
reorganise the values comparison to introduce different conditional branches
when such actual merging is needed/detected.
To avoid mixing too many change in this complicated code, we do the
reorganisation before adding the "overwrite detection" logic in the next
changesets.
Differential Revision: https://phab.mercurial-scm.org/D9612
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 14 Dec 2020 19:26:33 +0100 |
| parents | 892eb7c5edaa |
| children | c19c662097e1 |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Feb 22 12:21:00 2021 +0100 +++ b/mercurial/copies.py Mon Dec 14 19:26:33 2020 +0100 @@ -481,32 +481,60 @@ 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 + + return pick + + - pick is one of PICK_MINOR, PICK_MAJOR or PICK_EITHER + """ major_tt, major_value = major minor_tt, minor_value = minor - # evacuate some simple case first: if major_tt == minor_tt: # if it comes from the same revision it must be the same value assert major_value == minor_value return PICK_EITHER - elif major[1] == minor[1]: - return PICK_EITHER - - # actual merging needed: content from "major" wins, unless it is older than - # the branch point or there is a merge - elif changes is not None and major[1] is None and dest in changes.salvaged: + elif ( + changes is not None + and minor_value is not None + and major_value is None + and dest in changes.salvaged + ): + # In this case, a deletion was reverted, the "alive" value overwrite + # the deleted one. return PICK_MINOR - elif changes is not None and minor[1] is None and dest in changes.salvaged: + elif ( + changes is not None + and major_value is not None + and minor_value is None + and dest in changes.salvaged + ): + # In this case, a deletion was reverted, the "alive" value overwrite + # the deleted one. return PICK_MAJOR - elif changes is not None and dest in changes.merged: + elif isancestor(minor_tt, major_tt): + if changes is not None and dest in changes.merged: + # change to dest happened on the branch without copy-source change, + # so both source are valid and "major" wins. + return PICK_MAJOR + else: + return PICK_MAJOR + elif isancestor(major_tt, minor_tt): + if changes is not None and dest in changes.merged: + # change to dest happened on the branch without copy-source change, + # so both source are valid and "major" wins. + return PICK_MAJOR + else: + return PICK_MINOR + elif minor_value is None: + # in case of conflict, the "alive" side wins. return PICK_MAJOR - elif not isancestor(major_tt, minor_tt): - if major[1] is not None: - return PICK_MAJOR - elif isancestor(minor_tt, major_tt): - return PICK_MAJOR - return PICK_MINOR + elif major_value is None: + # in case of conflict, the "alive" side wins. + return PICK_MINOR + else: + # in case of conflict where both side are alive, major wins. + return PICK_MAJOR def _revinfo_getter_extra(repo):