This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8744

merge: remove no longer required ACTION_GET_OTHER_AND_STORE
ClosedPublic

Authored by pulkit on Jul 14 2020, 8:31 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc515c54f6530: merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Summary

In 1b8fd4af33189c84feadb47c74d659ec31cde3b9 I (ab)used merge actions to pass
info from manifestmerge() to applyupdates() and store info in mergestate.

In previous patches, we introduced a separate return value from manifestmerge()
and calculateupdates() and an argument to applyupdates() which achieved the same
thing.

Let's remove this no longer required messy code.

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 14 2020, 8:31 AM
pulkit updated this revision to Diff 22065.Jul 23 2020, 10:12 AM
indygreg accepted this revision.Aug 2 2020, 12:51 PM
indygreg added a subscriber: indygreg.

I agree that this action was a bit wonky and this is a useful cleanup!

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

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (20 lines)
Mmercurial/mergestate.py (2 lines)

Diff 22198

mercurial/merge.py

if n1 == n2: # optimization: keep local content if n1 == n2: # optimization: keep local content
actions[f] = ( actions[f] = (
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
(fl2,), (fl2,),
b'update permissions', b'update permissions',
) )
else: else:
actions[f] = ( actions[f] = (
mergestatemod.ACTION_GET_OTHER_AND_STORE mergestatemod.ACTION_GET,
if branchmerge
else mergestatemod.ACTION_GET,
(fl2, False), (fl2, False),
b'remote is newer', b'remote is newer',
) )
if branchmerge: if branchmerge:
commitinfo[f] = b'other' commitinfo[f] = b'other'
elif nol and n2 == a: # remote only changed 'x' elif nol and n2 == a: # remote only changed 'x'
actions[f] = ( actions[f] = (
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
(fl2,), (fl2,),
b'update permissions', b'update permissions',
) )
elif nol and n1 == a: # local only changed 'x' elif nol and n1 == a: # local only changed 'x'
actions[f] = ( actions[f] = (
mergestatemod.ACTION_GET_OTHER_AND_STORE mergestatemod.ACTION_GET,
if branchmerge
else mergestatemod.ACTION_GET,
(fl1, False), (fl1, False),
b'remote is newer', b'remote is newer',
) )
if branchmerge: if branchmerge:
commitinfo[f] = b'other' commitinfo[f] = b'other'
else: # both changed something else: # both changed something
actions[f] = ( actions[f] = (
mergestatemod.ACTION_MERGE, mergestatemod.ACTION_MERGE,
diverge = mresult1.diverge diverge = mresult1.diverge
if renamedelete is None or len(renamedelete) < len( if renamedelete is None or len(renamedelete) < len(
mresult1.renamedelete mresult1.renamedelete
): ):
renamedelete = mresult1.renamedelete renamedelete = mresult1.renamedelete
for f, a in sorted(pycompat.iteritems(mresult1.actions)): for f, a in sorted(pycompat.iteritems(mresult1.actions)):
m, args, msg = a m, args, msg = a
if m == mergestatemod.ACTION_GET_OTHER_AND_STORE:
m = mergestatemod.ACTION_GET
repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
if f in fbids: if f in fbids:
d = fbids[f] d = fbids[f]
if m in d: if m in d:
d[m].append(a) d[m].append(a)
else: else:
d[m] = [a] d[m] = [a]
else: else:
mergestatemod.ACTION_REMOVE, mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL, mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
mergestatemod.ACTION_MERGE, mergestatemod.ACTION_MERGE,
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_KEEP, mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_PATH_CONFLICT, mergestatemod.ACTION_PATH_CONFLICT,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
mergestatemod.ACTION_GET_OTHER_AND_STORE,
) )
} }
def applyupdates( def applyupdates(
repo, repo,
actions, actions,
wctx, wctx,
commitinfo = {} commitinfo = {}
for f, op in pycompat.iteritems(commitinfo): for f, op in pycompat.iteritems(commitinfo):
# the other side of filenode was choosen while merging, store this in # the other side of filenode was choosen while merging, store this in
# mergestate so that it can be reused on commit # mergestate so that it can be reused on commit
if op == b'other': if op == b'other':
ms.addmergedother(f) ms.addmergedother(f)
# add ACTION_GET_OTHER_AND_STORE to mergestate
for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
ms.addmergedother(e[0])
moves = [] moves = []
for m, l in actions.items(): for m, l in actions.items():
l.sort() l.sort()
# 'cd' and 'dc' actions are treated like other merge conflicts # 'cd' and 'dc' actions are treated like other merge conflicts
mergeactions = sorted(actions[mergestatemod.ACTION_CHANGED_DELETED]) mergeactions = sorted(actions[mergestatemod.ACTION_CHANGED_DELETED])
mergeactions.extend(sorted(actions[mergestatemod.ACTION_DELETED_CHANGED])) mergeactions.extend(sorted(actions[mergestatemod.ACTION_DELETED_CHANGED]))
mergeactions.extend(actions[mergestatemod.ACTION_MERGE]) mergeactions.extend(actions[mergestatemod.ACTION_MERGE])
if updatecheck == UPDATECHECK_NO_CONFLICT: if updatecheck == UPDATECHECK_NO_CONFLICT:
for f, (m, args, msg) in pycompat.iteritems(actionbyfile): for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
if m not in ( if m not in (
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
mergestatemod.ACTION_KEEP, mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_REMOVE, mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
mergestatemod.ACTION_GET_OTHER_AND_STORE,
): ):
msg = _(b"conflicting changes") msg = _(b"conflicting changes")
hint = _(b"commit or update --clean to discard changes") hint = _(b"commit or update --clean to discard changes")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
# Prompt and create actions. Most of this is in the resolve phase # Prompt and create actions. Most of this is in the resolve phase
# already, but we can't handle .hgsubstate in filemerge or # already, but we can't handle .hgsubstate in filemerge or
# subrepoutil.submerge yet so we have to keep prompting for it. # subrepoutil.submerge yet so we have to keep prompting for it.
# Convert to dictionary-of-lists format # Convert to dictionary-of-lists format
actions = emptyactions() actions = emptyactions()
for f, (m, args, msg) in pycompat.iteritems(actionbyfile): for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
if m not in actions: if m not in actions:
actions[m] = [] actions[m] = []
actions[m].append((f, args, msg)) actions[m].append((f, args, msg))
# ACTION_GET_OTHER_AND_STORE is a mergestatemod.ACTION_GET + store in mergestate
for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]:
actions[mergestatemod.ACTION_GET].append(e)
if not util.fscasesensitive(repo.path): if not util.fscasesensitive(repo.path):
# check collision between files only in p2 for clean update # check collision between files only in p2 for clean update
if not branchmerge and ( if not branchmerge and (
force or not wc.dirty(missing=True, branch=False) force or not wc.dirty(missing=True, branch=False)
): ):
_checkcollision(repo, p2.manifest(), None) _checkcollision(repo, p2.manifest(), None)
else: else:
_checkcollision(repo, wc.manifest(), actions) _checkcollision(repo, wc.manifest(), actions)

mercurial/mergestate.py

ACTION_DELETED_CHANGED = b'dc' ACTION_DELETED_CHANGED = b'dc'
ACTION_CHANGED_DELETED = b'cd' ACTION_CHANGED_DELETED = b'cd'
ACTION_MERGE = b'm' ACTION_MERGE = b'm'
ACTION_LOCAL_DIR_RENAME_GET = b'dg' ACTION_LOCAL_DIR_RENAME_GET = b'dg'
ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
ACTION_KEEP = b'k' ACTION_KEEP = b'k'
ACTION_EXEC = b'e' ACTION_EXEC = b'e'
ACTION_CREATED_MERGE = b'cm' ACTION_CREATED_MERGE = b'cm'
# GET the other/remote side and store this info in mergestate
ACTION_GET_OTHER_AND_STORE = b'gs'
class mergestate(object): class mergestate(object):
'''track 3-way merge state of individual files '''track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with The merge state is stored on disk when needed. Two files are used: one with
an old format (version 1), and one with a new format (version 2). Version 2 an old format (version 1), and one with a new format (version 2). Version 2
stores a superset of the data in version 1, including new kinds of records stores a superset of the data in version 1, including new kinds of records