This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12117

merge-actions: have an attribute for narrow safetiness
ClosedPublic

Authored by marmoute on Jan 30 2022, 3:15 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc5f05c0d1c8c: merge-actions: have an attribute for narrow safetiness
Summary

This allow the core doing narrow filtering to process action without
explicitely listing all possible actions. This is important to make the actions
system more flexible in the future.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (13 lines)
Mmercurial/mergestate.py (23 lines)

Diff 32075

mercurial/merge.py

def _filternarrowactions(narrowmatch, branchmerge, mresult): def _filternarrowactions(narrowmatch, branchmerge, mresult):
""" """
Filters out actions that can ignored because the repo is narrowed. Filters out actions that can ignored because the repo is narrowed.
Raise an exception if the merge cannot be completed because the repo is Raise an exception if the merge cannot be completed because the repo is
narrowed. narrowed.
""" """
# TODO: handle with nonconflicttypes
nonconflicttypes = {
mergestatemod.ACTION_ADD,
mergestatemod.ACTION_ADD_MODIFIED,
mergestatemod.ACTION_CREATED,
mergestatemod.ACTION_CREATED_MERGE,
mergestatemod.ACTION_FORGET,
mergestatemod.ACTION_GET,
mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_EXEC,
}
# 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].no_op: 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].narrow_safe: # TODO: handle these cases
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)
else: else:
msg = _(b'conflict in file \'%s\' is outside narrow clone') msg = _(b'conflict in file \'%s\' is outside narrow clone')

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 no_op: True if the action does affect the file content or tracking status
narrow_safe:
True if the action can be safely used for a file outside of the narrow
set
""" """
ALL_ACTIONS = weakref.WeakSet() ALL_ACTIONS = weakref.WeakSet()
NO_OP_ACTIONS = weakref.WeakSet() NO_OP_ACTIONS = weakref.WeakSet()
def __init__(self, short, no_op=False): def __init__(self, short, no_op=False, narrow_safe=False):
self._short = short self._short = short
self.ALL_ACTIONS.add(self) self.ALL_ACTIONS.add(self)
self.no_op = no_op self.no_op = no_op
if self.no_op: if self.no_op:
self.NO_OP_ACTIONS.add(self) self.NO_OP_ACTIONS.add(self)
self.narrow_safe = narrow_safe
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):
return self._short return self._short
def __eq__(self, other): def __eq__(self, other):
if other is None: if other is None:
return False return False
assert isinstance(other, MergeAction) assert isinstance(other, MergeAction)
return self._short == other._short return self._short == other._short
def __lt__(self, other): def __lt__(self, other):
return self._short < other._short return self._short < other._short
ACTION_FORGET = MergeAction(b'f') ACTION_FORGET = MergeAction(b'f', narrow_safe=True)
ACTION_REMOVE = MergeAction(b'r') ACTION_REMOVE = MergeAction(b'r', narrow_safe=True)
ACTION_ADD = MergeAction(b'a') ACTION_ADD = MergeAction(b'a', narrow_safe=True)
ACTION_GET = MergeAction(b'g') ACTION_GET = MergeAction(b'g', narrow_safe=True)
ACTION_PATH_CONFLICT = MergeAction(b'p') ACTION_PATH_CONFLICT = MergeAction(b'p')
ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr') ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr')
ACTION_ADD_MODIFIED = MergeAction(b'am') ACTION_ADD_MODIFIED = MergeAction(b'am', narrow_safe=True)
ACTION_CREATED = MergeAction(b'c') ACTION_CREATED = MergeAction(b'c', narrow_safe=True)
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', no_op=True) 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', no_op=True) 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', no_op=True) ACTION_KEEP_NEW = MergeAction(b'kn', no_op=True)
ACTION_EXEC = MergeAction(b'e') ACTION_EXEC = MergeAction(b'e', narrow_safe=True)
ACTION_CREATED_MERGE = MergeAction(b'cm') ACTION_CREATED_MERGE = MergeAction(b'cm', narrow_safe=True)
# 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,