This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9035

mergestate: move most of of reset() into start()
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9ea4b52ac6bb: mergestate: move most of of reset() into start()
Summary

ms.reset() has somehow become a combination of two different things:

  1. A constructor-like function creating an empty instance
  2. A call to shutil.rmtree() to clear the mergestate.

It seems that all callers now care only about the latter (since we
changed one caller to use the new ms.start() method instead). Let's
move the code for the former into start(), since that's the only
place it's needed.

Diff Detail

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

Event Timeline

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

Ahhh - OK. This is much better.

This revision is now accepted and ready to land.Sep 17 2020, 10:18 PM
martinvonz added a commit: rHG9ea4b52ac6bb: mergestate: move most of of reset() into start().Sep 17 2020, 10:36 PM
Closed by commit rHG9ea4b52ac6bb: mergestate: move most of of reset() into start() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (12 lines)

Diff 22683

mercurial/mergestate.py

"""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): def reset(self):
shutil.rmtree(self._repo.vfs.join(b'merge'), True)
def start(self, node, other, labels=None):
self._local = node
self._other = other
self._labels = labels
indygregUnsubmitted
Not Done

Ahhh - OK. This is much better.

indygreg: Ahhh - OK. This is much better.
self._state = {} self._state = {}
self._stateextras = collections.defaultdict(dict) self._stateextras = collections.defaultdict(dict)
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)
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)