This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10116

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

Authored by pulkit on Mar 5 2021, 12:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG39be29fafd91: 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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 5 2021, 12:30 PM
pulkit added a commit: rHG39be29fafd91: commit: reorder if-else conditional to give mergestate info priority.Mar 8 2021, 3:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG39be29fafd91: 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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commit.py (21 lines)

Diff 26146

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')