( )⚙ D12116 merge-actions: add an explicite "no_op" attribute

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12116

merge-actions: add an explicite "no_op" attribute
ClosedPublic

Authored by marmoute on Jan 29 2022, 9:14 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5dfaca4464d1: merge-actions: add an explicite "no_op" attribute
Summary

This make the MergeAction smarter and able to describe themself. This is useful
to help introducing more MergeAction object that better the complexity of the
situation.

Diff Detail

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

Event Timeline

marmoute created this revision.Jan 29 2022, 9:14 AM
Alphare accepted this revision.Feb 3 2022, 4:13 AM
This revision is now accepted and ready to land.Feb 3 2022, 4:13 AM
marmoute added a commit: rHG5dfaca4464d1: merge-actions: add an explicite "no_op" attribute.Feb 4 2022, 5:30 AM
Closed by commit rHG5dfaca4464d1: merge-actions: add an explicite "no_op" attribute (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 32012

mercurial/merge.py

} }
# We mutate the items in the dict during iteration, so iterate # We mutate the items in the dict during iteration, so iterate
# over a copy. # over a copy.
for f, action in mresult.filemap(): for f, action in mresult.filemap():
if narrowmatch(f): if narrowmatch(f):
pass pass
elif not branchmerge: elif not branchmerge:
mresult.removefile(f) # just updating, ignore changes outside clone mresult.removefile(f) # just updating, ignore changes outside clone
elif action[0] in mergestatemod.NO_OP_ACTIONS: elif action[0].no_op:
mresult.removefile(f) # merge does not affect file mresult.removefile(f) # merge does not affect file
elif action[0] in nonconflicttypes: elif action[0] in nonconflicttypes:
msg = _( msg = _(
b'merge affects file \'%s\' outside narrow, ' b'merge affects file \'%s\' outside narrow, '
b'which is not yet supported' b'which is not yet supported'
) )
hint = _(b'merging in the other direction may work') hint = _(b'merging in the other direction may work')
raise error.Abort(msg % f, hint=hint) raise error.Abort(msg % f, hint=hint)
a a
not in ( not in (
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
mergestatemod.ACTION_EXEC, mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_REMOVE, mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
) )
and self._actionmapping[a] and self._actionmapping[a]
and a not in mergestatemod.NO_OP_ACTIONS and not a.no_op
): ):
return True return True
return False return False
def manifestmerge( def manifestmerge(
repo, repo,
ms = wctx.mergestate(clean=True) ms = wctx.mergestate(clean=True)
ms.start(wctx.p1().node(), mctx.node(), labels) ms.start(wctx.p1().node(), mctx.node(), labels)
for f, op in pycompat.iteritems(mresult.commitinfo): for f, op in pycompat.iteritems(mresult.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
ms.addcommitinfo(f, op) ms.addcommitinfo(f, op)
numupdates = mresult.len() - mresult.len(mergestatemod.NO_OP_ACTIONS) num_no_op = mresult.len(mergestatemod.MergeAction.NO_OP_ACTIONS)
numupdates = mresult.len() - num_no_op
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'updating'), unit=_(b'files'), total=numupdates _(b'updating'), unit=_(b'files'), total=numupdates
) )
if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]: if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:
subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
# record path conflicts # record path conflicts
# re-add/mark as modified (manifest only, just log it) # re-add/mark as modified (manifest only, just log it)
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_ADD_MODIFIED,), sort=True (mergestatemod.ACTION_ADD_MODIFIED,), sort=True
): ):
repo.ui.debug(b" %s: %s -> am\n" % (f, msg)) repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)
# keep (noop, just log it) # keep (noop, just log it)
for a in mergestatemod.NO_OP_ACTIONS: for a in mergestatemod.MergeAction.NO_OP_ACTIONS:
for f, args, msg in mresult.getactions((a,), sort=True): for f, args, msg in mresult.getactions((a,), sort=True):
repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a.__bytes__())) repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a.__bytes__()))
# no progress # no progress
# directory rename, move local # directory rename, move local
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
): ):

mercurial/mergestate.py

class MergeAction(object): class MergeAction(object):
"""represent an "action" merge need to take for a given file """represent an "action" merge need to take for a given file
Attributes: Attributes:
_short: internal representation used to identify each action _short: internal representation used to identify each action
no_op: True if the action does affect the file content or tracking status
""" """
ALL_ACTIONS = weakref.WeakSet() ALL_ACTIONS = weakref.WeakSet()
NO_OP_ACTIONS = weakref.WeakSet()
def __init__(self, short): def __init__(self, short, no_op=False):
self._short = short self._short = short
self.ALL_ACTIONS.add(self) self.ALL_ACTIONS.add(self)
self.no_op = no_op
if self.no_op:
self.NO_OP_ACTIONS.add(self)
def __hash__(self): def __hash__(self):
return hash(self._short) return hash(self._short)
def __repr__(self): def __repr__(self):
return 'MergeAction<%s>' % self._short.decode('ascii') return 'MergeAction<%s>' % self._short.decode('ascii')
def __bytes__(self): def __bytes__(self):
ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr') ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr')
ACTION_ADD_MODIFIED = MergeAction(b'am') ACTION_ADD_MODIFIED = MergeAction(b'am')
ACTION_CREATED = MergeAction(b'c') ACTION_CREATED = MergeAction(b'c')
ACTION_DELETED_CHANGED = MergeAction(b'dc') ACTION_DELETED_CHANGED = MergeAction(b'dc')
ACTION_CHANGED_DELETED = MergeAction(b'cd') ACTION_CHANGED_DELETED = MergeAction(b'cd')
ACTION_MERGE = MergeAction(b'm') ACTION_MERGE = MergeAction(b'm')
ACTION_LOCAL_DIR_RENAME_GET = MergeAction(b'dg') ACTION_LOCAL_DIR_RENAME_GET = MergeAction(b'dg')
ACTION_DIR_RENAME_MOVE_LOCAL = MergeAction(b'dm') ACTION_DIR_RENAME_MOVE_LOCAL = MergeAction(b'dm')
ACTION_KEEP = MergeAction(b'k') ACTION_KEEP = MergeAction(b'k', no_op=True)
# the file was absent on local side before merge and we should # the file was absent on local side before merge and we should
# keep it absent (absent means file not present, it can be a result # keep it absent (absent means file not present, it can be a result
# of file deletion, rename etc.) # of file deletion, rename etc.)
ACTION_KEEP_ABSENT = MergeAction(b'ka') ACTION_KEEP_ABSENT = MergeAction(b'ka', no_op=True)
# the file is absent on the ancestor and remote side of the merge # the file is absent on the ancestor and remote side of the merge
# hence this file is new and we should keep it # hence this file is new and we should keep it
ACTION_KEEP_NEW = MergeAction(b'kn') ACTION_KEEP_NEW = MergeAction(b'kn', no_op=True)
ACTION_EXEC = MergeAction(b'e') ACTION_EXEC = MergeAction(b'e')
ACTION_CREATED_MERGE = MergeAction(b'cm') ACTION_CREATED_MERGE = MergeAction(b'cm')
# actions which are no op
NO_OP_ACTIONS = (
ACTION_KEEP,
ACTION_KEEP_ABSENT,
ACTION_KEEP_NEW,
)
# Used by concert to detect situation it does not like, not sure what the exact # Used by concert to detect situation it does not like, not sure what the exact
# criteria is # criteria is
CONVERT_MERGE_ACTIONS = ( CONVERT_MERGE_ACTIONS = (
ACTION_MERGE, ACTION_MERGE,
ACTION_DIR_RENAME_MOVE_LOCAL, ACTION_DIR_RENAME_MOVE_LOCAL,
ACTION_CHANGED_DELETED, ACTION_CHANGED_DELETED,
ACTION_DELETED_CHANGED, ACTION_DELETED_CHANGED,

mercurial/sparse.py

type, args, msg = action type, args, msg = action
files.add(file) files.add(file)
if sparsematch(file): if sparsematch(file):
prunedactions[file] = action prunedactions[file] = action
elif type == mergestatemod.ACTION_MERGE: elif type == mergestatemod.ACTION_MERGE:
temporaryfiles.append(file) temporaryfiles.append(file)
prunedactions[file] = action prunedactions[file] = action
elif branchmerge: elif branchmerge:
if type not in mergestatemod.NO_OP_ACTIONS: if not type.no_op:
temporaryfiles.append(file) temporaryfiles.append(file)
prunedactions[file] = action prunedactions[file] = action
elif type == mergestatemod.ACTION_FORGET: elif type == mergestatemod.ACTION_FORGET:
prunedactions[file] = action prunedactions[file] = action
elif file in wctx: elif file in wctx:
prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg) prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)
# in case or rename on one side, it is possible that f1 might not # in case or rename on one side, it is possible that f1 might not