This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12118

merge-actions: add some information about the "changes" the action do
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7d073df49a54: merge-actions: add some information about the "changes" the action do
Summary

This will be useful when processing merges action outside of the narrow-spec.

"support" outside of narrow file on commit

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

marmoute created this revision.Jan 30 2022, 3:15 PM
Alphare accepted this revision.Feb 3 2022, 4:20 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/mergestate.py
120

this action*

This revision is now accepted and ready to land.Feb 3 2022, 4:20 AM
baymax updated this revision to Diff 32052.Feb 3 2022, 11:55 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (37 lines)

Diff 32076

mercurial/mergestate.py

LEGACY_RECORD_RESOLVED_OTHER = b'R' LEGACY_RECORD_RESOLVED_OTHER = b'R'
# This record was release in 3.7 and usage was removed in 5.6 # This record was release in 3.7 and usage was removed in 5.6
LEGACY_RECORD_DRIVER_RESOLVED = b'd' LEGACY_RECORD_DRIVER_RESOLVED = b'd'
# This record was release in 3.7 and usage was removed in 5.6 # This record was release in 3.7 and usage was removed in 5.6
LEGACY_MERGE_DRIVER_STATE = b'm' LEGACY_MERGE_DRIVER_STATE = b'm'
# This record was release in 3.7 and usage was removed in 5.6 # This record was release in 3.7 and usage was removed in 5.6
LEGACY_MERGE_DRIVER_MERGE = b'D' LEGACY_MERGE_DRIVER_MERGE = b'D'
CHANGE_ADDED = b'added'
CHANGE_REMOVED = b'removed'
CHANGE_MODIFIED = b'modified'
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: narrow_safe:
True if the action can be safely used for a file outside of the narrow True if the action can be safely used for a file outside of the narrow
set set
changes:
The types of changes that this actions involves. This is a work in
AlphareUnsubmitted
Not Done

this action*

Alphare: this action*
progress and not all actions have one yet. In addition, some requires
user changes and cannot be fully decided. The value currently available
are:
- ADDED: the files is new in both parents
- REMOVED: the files existed in one parent and is getting removed
- MODIFIED: the files existed in at least one parent and is getting changed
""" """
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, narrow_safe=False): def __init__(self, short, no_op=False, narrow_safe=False, changes=None):
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 self.narrow_safe = narrow_safe
self.changes = changes
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', narrow_safe=True) ACTION_FORGET = MergeAction(b'f', narrow_safe=True, changes=CHANGE_REMOVED)
ACTION_REMOVE = MergeAction(b'r', narrow_safe=True) ACTION_REMOVE = MergeAction(b'r', narrow_safe=True, changes=CHANGE_REMOVED)
ACTION_ADD = MergeAction(b'a', narrow_safe=True) ACTION_ADD = MergeAction(b'a', narrow_safe=True, changes=CHANGE_ADDED)
ACTION_GET = MergeAction(b'g', narrow_safe=True) ACTION_GET = MergeAction(b'g', narrow_safe=True, changes=CHANGE_MODIFIED)
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', narrow_safe=True) ACTION_ADD_MODIFIED = MergeAction(
ACTION_CREATED = MergeAction(b'c', narrow_safe=True) b'am', narrow_safe=True, changes=CHANGE_ADDED
) # not 100% about the changes value here
ACTION_CREATED = MergeAction(b'c', narrow_safe=True, changes=CHANGE_ADDED)
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', narrow_safe=True) ACTION_EXEC = MergeAction(b'e', narrow_safe=True, changes=CHANGE_MODIFIED)
ACTION_CREATED_MERGE = MergeAction(b'cm', narrow_safe=True) ACTION_CREATED_MERGE = MergeAction(
b'cm', narrow_safe=True, changes=CHANGE_ADDED
)
# 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,