This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10147

commit: reorder if-else conditional to give mergestate info priority
ClosedPublic

Authored by pulkit on Mar 10 2021, 4:04 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd6fa9fbd375d: commit: reorder if-else conditional to give mergestate info priority
Summary

Looking at the code now, I was unable to find a good reason as why we only rely
on mergestate extras info after checking whether a filelog parent is ancestor of
other or not.

I mean if we have stored in mergestate that other was chosed, we should
blindly pick that one.

This cleanup will also help introduce more cases when both fparent1 and
fparent2 are non-null but using info from mergestate, we can fastpath.

The test change actually demonstrates the point of the patch. During merge we
were getting the other side of the file but on commit we were marking that as
merged.

Diff Detail

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

Event Timeline

pulkit created this revision.Mar 10 2021, 4:04 AM
Alphare accepted this revision.Mar 10 2021, 6:41 AM
pulkit added a commit: rHGd6fa9fbd375d: commit: reorder if-else conditional to give mergestate info priority.Mar 15 2021, 1:13 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd6fa9fbd375d: commit: reorder if-else conditional to give mergestate info priority (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 26368.Mar 15 2021, 2:10 PM

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

Revision Contents
Changeset List

PathPackages
Mmercurial/commit.py (18 lines)
Mtests/test-rebase-conflicts.t (8 lines)

Diff 26368

mercurial/commit.py

b"copied from '%s'!\n" b"copied from '%s'!\n"
) )
% (fname, cfname) % (fname, cfname)
) )
elif fparent1 == nullid: elif fparent1 == nullid:
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 != nullid: elif fparent2 != nullid:
if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other':
fparent1, fparent2 = fparent2, nullid
# is one parent an ancestor of the other? # is one parent an ancestor of the other?
else:
fparentancestors = flog.commonancestorsheads(fparent1, fparent2) fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
if fparent1 in fparentancestors: if fparent1 in fparentancestors:
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 in fparentancestors: elif fparent2 in fparentancestors:
fparent2 = nullid fparent2 = nullid
elif not fparentancestors:
# TODO: this whole if-else might be simplified much more
if (
ms.active()
and ms.extras(fname).get(b'filenode-source') == b'other'
):
fparent1, fparent2 = fparent2, nullid
force_new_node = False force_new_node = False
# The file might have been deleted by merge code and user explicitly choose # The file might have been deleted by merge code and user explicitly choose
# to revert the file and keep it. The other case can be where there is # to revert the file and keep it. The other case can be where there is
# change-delete or delete-change conflict and user explicitly choose to keep # change-delete or delete-change conflict and user explicitly choose to keep
# the file. The goal is to create a new filenode for users explicit choices # the file. The goal is to create a new filenode for users explicit choices
if ( if (
repo.ui.configbool(b'experimental', b'merge-track-salvaged') repo.ui.configbool(b'experimental', b'merge-track-salvaged')

tests/test-rebase-conflicts.t

ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
f1.txt: remote is newer -> g f1.txt: remote is newer -> g
getting f1.txt getting f1.txt
committing files: committing files:
f1.txt f1.txt
committing manifest committing manifest
committing changelog committing changelog
updating the branch cache updating the branch cache
rebased as 2a7f09cac94c rebased as c1ffa3b5274e
rebase status stored rebase status stored
rebase merging completed rebase merging completed
update back to initial working directory parent update back to initial working directory parent
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 ancestor: c1ffa3b5274e, local: c1ffa3b5274e+, remote: d79e2059b5c0
f1.txt: other deleted -> r f1.txt: other deleted -> r
removing f1.txt removing f1.txt
f2.txt: remote created -> g f2.txt: remote created -> g
getting f2.txt getting f2.txt
2 changesets found 2 changesets found
list of changesets: list of changesets:
e31216eec445e44352c5f01588856059466a24c9 e31216eec445e44352c5f01588856059466a24c9
2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
bundle2-output-bundle: "HG20", (1 params) 3 parts total bundle2-output-bundle: "HG20", (1 params) 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
3 changesets found 3 changesets found
list of changesets: list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
19c888675e133ab5dff84516926a65672eaf04d9 19c888675e133ab5dff84516926a65672eaf04d9
2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf c1ffa3b5274e92a9388fe782854e295d2e8d0443
bundle2-output-bundle: "HG20", 3 parts total bundle2-output-bundle: "HG20", 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
adding branch adding branch
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
adding changesets adding changesets
add changeset 4c9fbe56a16f add changeset 4c9fbe56a16f
add changeset 19c888675e13 add changeset 19c888675e13
add changeset 2a7f09cac94c add changeset c1ffa3b5274e
adding manifests adding manifests
adding file changes adding file changes
adding f1.txt revisions adding f1.txt revisions
bundle2-input-part: total payload size 1686 bundle2-input-part: total payload size 1686
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 74 bundle2-input-part: total payload size 74
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24