This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12115

merge-actions: gather all created action into a set
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG773ad0f5152d: merge-actions: gather all created action into a set
Summary

This is mostly to demonstrate we can do this before we start adding more
specialized set.

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 29 2022, 9:14 AM
Alphare accepted this revision.Feb 3 2022, 4:11 AM
This revision is now accepted and ready to land.Feb 3 2022, 4:11 AM
marmoute added a commit: rHG773ad0f5152d: merge-actions: gather all created action into a set.Feb 4 2022, 5:30 AM
Closed by commit rHG773ad0f5152d: merge-actions: gather all created action into a set (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (4 lines)

Diff 32073

mercurial/mergestate.py

from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import errno import errno
import shutil import shutil
import struct import struct
import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullrev, nullrev,
) )
from . import ( from . import (
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
""" """
ALL_ACTIONS = weakref.WeakSet()
def __init__(self, short): def __init__(self, short):
self._short = short self._short = short
self.ALL_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):