This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8834

merge: unify logic of couple of if-else's in manifestmerge()
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:03 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGcb0cd87e16b4: merge: unify logic of couple of if-else's in manifestmerge()
Summary

Right now manifestmerge() contains very nested if-else conditions and it's not
easy to understand what is happening. I was looking for easy unifications and
found these two.

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.Jul 25 2020, 6:03 AM
indygreg accepted this revision.Aug 2 2020, 1:27 PM
indygreg added a subscriber: indygreg.

I'm only +0 on this refactor, as I don't think it changes readability much. But whatever.

This revision is now accepted and ready to land.Aug 2 2020, 1:27 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (36 lines)

Diff 22217

mercurial/merge.py

for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff): for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff):
if n1 and n2: # file exists on both local and remote side if n1 and n2: # file exists on both local and remote side
if f not in ma: if f not in ma:
# TODO: what if they're renamed from different sources? # TODO: what if they're renamed from different sources?
fa = branch_copies1.copy.get( fa = branch_copies1.copy.get(
f, None f, None
) or branch_copies2.copy.get(f, None) ) or branch_copies2.copy.get(f, None)
args, msg = None, None
if fa is not None: if fa is not None:
mresult.addfile( args = (f, f, fa, False, pa.node())
f, msg = b'both renamed from %s' % fa
mergestatemod.ACTION_MERGE,
(f, f, fa, False, pa.node()),
b'both renamed from %s' % fa,
)
else: else:
mresult.addfile( args = (f, f, None, False, pa.node())
f, msg = b'both created'
mergestatemod.ACTION_MERGE, mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
(f, f, None, False, pa.node()),
b'both created',
)
else: else:
a = ma[f] a = ma[f]
fla = ma.flags(f) fla = ma.flags(f)
nol = b'l' not in fl1 + fl2 + fla nol = b'l' not in fl1 + fl2 + fla
if n2 == a and fl2 == fla: if n2 == a and fl2 == fla:
mresult.addfile( mresult.addfile(
f, mergestatemod.ACTION_KEEP, (), b'remote unchanged', f, mergestatemod.ACTION_KEEP, (), b'remote unchanged',
) )
mresult.addfile( mresult.addfile(
f2, f2,
mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
(f, fl2), (f, fl2),
b'local directory rename - get from %s' % f, b'local directory rename - get from %s' % f,
) )
elif f in branch_copies2.copy: elif f in branch_copies2.copy:
f2 = branch_copies2.copy[f] f2 = branch_copies2.copy[f]
msg, args = None, None
if f2 in m2: if f2 in m2:
mresult.addfile( args = (f2, f, f2, False, pa.node())
f, msg = b'remote copied from %s' % f2
mergestatemod.ACTION_MERGE,
(f2, f, f2, False, pa.node()),
b'remote copied from %s' % f2,
)
else: else:
mresult.addfile( args = (f2, f, f2, True, pa.node())
f, msg = b'remote moved from %s' % f2
mergestatemod.ACTION_MERGE, mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
(f2, f, f2, True, pa.node()),
b'remote moved from %s' % f2,
)
elif f not in ma: elif f not in ma:
# local unknown, remote created: the logic is described by the # local unknown, remote created: the logic is described by the
# following table: # following table:
# #
# force branchmerge different | action # force branchmerge different | action
# n * * | create # n * * | create
# y n * | create # y n * | create
# y y n | create # y y n | create