Mercurial > hg
diff mercurial/copies.py @ 46162:6b9d65298484
copies: rename value/other variable to minor/major for clarity
Differential Revision: https://phab.mercurial-scm.org/D9591
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 14 Dec 2020 01:32:22 +0100 |
parents | 3a0c41336961 |
children | ee63c1173c1b |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Dec 14 01:30:32 2020 +0100 +++ b/mercurial/copies.py Mon Dec 14 01:32:22 2020 +0100 @@ -476,27 +476,27 @@ 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""" - new_tt = value[0] - other_tt = other[0] + major_tt = major[0] + minor_tt = minor[0] - if value[1] == other[1]: + if major[1] == minor[1]: return PICK_EITHER # content from "major" wins, unless it is older # than the branch point or there is a merge - if new_tt == other_tt: + if major_tt == minor_tt: 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 - 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 elif changes is not None and dest in changes.merged: return PICK_MAJOR - elif not isancestor(new_tt, other_tt): - if value[1] is not None: + elif not isancestor(major_tt, minor_tt): + if major[1] is not None: return PICK_MAJOR - elif isancestor(other_tt, new_tt): + elif isancestor(minor_tt, major_tt): return PICK_MAJOR return PICK_MINOR