This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9033

mergestate: split up reset() for its two use cases
ClosedPublic

Authored by martinvonz on Sep 17 2020, 4:10 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG08c6d6962b2a: mergestate: split up reset() for its two use cases
Summary

We only have one place that calls ms.reset() with any
arguments. That place is mergestate.clean(). The callers that call
the function with no arguments seem to all just want delete the
mergestate -- none of them look at the instance after calling
reset(). Let's separate out the two different use cases to make the
code clearer. I'll clean up further soon.

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

martinvonz created this revision.Sep 17 2020, 4:10 PM
indygreg accepted this revision.Sep 17 2020, 10:16 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/mergestate.py
205

It is slightly weird to me that reset() doesn't wipe out these attributes after this change. Shouldn't a reset... reset to default state (None)?

This revision is now accepted and ready to land.Sep 17 2020, 10:16 PM
martinvonz added a commit: rHG08c6d6962b2a: mergestate: split up reset() for its two use cases.Sep 17 2020, 10:36 PM
Closed by commit rHG08c6d6962b2a: mergestate: split up reset() for its two use cases (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (13 lines)

Diff 22700

mercurial/mergestate.py

statepathv1 = b'merge/state' statepathv1 = b'merge/state'
statepathv2 = b'merge/state2' statepathv2 = b'merge/state2'
@staticmethod @staticmethod
def clean(repo, node=None, other=None, labels=None): def clean(repo, node=None, other=None, labels=None):
"""Initialize a brand new merge state, removing any existing state on """Initialize a brand new merge state, removing any existing state on
disk.""" disk."""
ms = mergestate(repo) ms = mergestate(repo)
ms.reset(node, other, labels) ms.reset()
ms.start(node, other, labels)
return ms return ms
@staticmethod @staticmethod
def read(repo): def read(repo):
"""Initialize the merge state, reading it from disk.""" """Initialize the merge state, reading it from disk."""
ms = mergestate(repo) ms = mergestate(repo)
ms._read() ms._read()
return ms return ms
def __init__(self, repo): def __init__(self, repo):
"""Initialize the merge state. """Initialize the merge state.
Do not use this directly! Instead call read() or clean().""" Do not use this directly! Instead call read() or clean()."""
self._repo = repo self._repo = repo
self._dirty = False self._dirty = False
self._labels = None self._labels = None
def reset(self, node=None, other=None, labels=None): def reset(self):
self._state = {} self._state = {}
self._stateextras = collections.defaultdict(dict) self._stateextras = collections.defaultdict(dict)
self._local = node
indygregUnsubmitted
Not Done

It is slightly weird to me that reset() doesn't wipe out these attributes after this change. Shouldn't a reset... reset to default state (None)?

indygreg: It is slightly weird to me that `reset()` doesn't wipe out these attributes after this change.
self._other = other
self._labels = labels
for var in ('localctx', 'otherctx'): for var in ('localctx', 'otherctx'):
if var in vars(self): if var in vars(self):
delattr(self, var) delattr(self, var)
self._readmergedriver = None self._readmergedriver = None
if self.mergedriver: if self.mergedriver:
self._mdstate = MERGE_DRIVER_STATE_SUCCESS self._mdstate = MERGE_DRIVER_STATE_SUCCESS
else: else:
self._mdstate = MERGE_DRIVER_STATE_UNMARKED self._mdstate = MERGE_DRIVER_STATE_UNMARKED
shutil.rmtree(self._repo.vfs.join(b'merge'), True) shutil.rmtree(self._repo.vfs.join(b'merge'), True)
self._results = {} self._results = {}
self._dirty = False self._dirty = False
def start(self, node, other, labels=None):
self._local = node
self._other = other
self._labels = labels
def _read(self): def _read(self):
"""Analyse each record content to restore a serialized state from disk """Analyse each record content to restore a serialized state from disk
This function process "record" entry produced by the de-serialization This function process "record" entry produced by the de-serialization
of on disk file. of on disk file.
""" """
self._state = {} self._state = {}
self._stateextras = collections.defaultdict(dict) self._stateextras = collections.defaultdict(dict)