This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9592

copies: deal with the "same revision" special case earlier
ClosedPublic

Authored by marmoute on Dec 14 2020, 6:18 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGee63c1173c1b: copies: deal with the "same revision" special case earlier
rHG1c4f0288e0d8: copies: deal with the "same revision" special case earlier
Summary

This can happens a lot in case of deletion so we better deal with it early.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Dec 14 2020, 6:18 AM
baymax updated this revision to Diff 24256.Dec 14 2020, 9:15 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 24369.Dec 17 2020, 3:53 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit added a subscriber: pulkit.Dec 18 2020, 7:48 AM
pulkit added inline comments.
mercurial/copies.py
491

This comment seems to be misplaced now.

baymax updated this revision to Diff 24391.Dec 18 2020, 8:40 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added inline comments.Dec 18 2020, 9:07 AM
mercurial/copies.py
491

Not really, but the formatting is strange. I am sending an update (but that whole code is fully replaced soon after anyway.

baymax updated this revision to Diff 24396.Dec 18 2020, 9:07 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 24411.Dec 18 2020, 9:42 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax edited parent revisions, added: D9589: copies-tests: update to null in test-copies-chain-merge.t; removed: D9591: copies: rename value/other variable to minor/major for clarity.Dec 21 2020, 2:43 AM
baymax updated this revision to Diff 24450.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Dec 28 2020, 3:12 AM
This revision is now accepted and ready to land.Dec 28 2020, 3:12 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (12 lines)

Diff 24231

mercurial/copies.py

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, minor, major): 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"""
major_tt = major[0] major_tt, major_value = major
minor_tt = minor[0] minor_tt, minor_value = minor
if major[1] == minor[1]: 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 return PICK_EITHER
# content from "major" wins, unless it is older # content from "major" wins, unless it is older
pulkitUnsubmitted
Not Done

This comment seems to be misplaced now.

pulkit: This comment seems to be misplaced now.
marmouteAuthorUnsubmitted
Done

Not really, but the formatting is strange. I am sending an update (but that whole code is fully replaced soon after anyway.

marmoute: Not really, but the formatting is strange. I am sending an update (but that whole code is fully…
# than the branch point or there is a merge # than the branch point or there is a merge
if major_tt == minor_tt:
return PICK_MAJOR
elif changes is not None and major[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 minor[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(major_tt, minor_tt): elif not isancestor(major_tt, minor_tt):
if major[1] is not None: if major[1] is not None: