This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9032

mergestate: simplify reset(), knowing that `other` and `node` go together
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGaad11a26a054: mergestate: simplify reset(), knowing that `other` and `node` go together
Summary

There's only one caller of reset() that passes any arguments at all,
and that originates from merge.py:1371. That code always passes
values for both node and other.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (7 lines)

Diff 22680

mercurial/mergestate.py

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, node=None, other=None, labels=None):
self._state = {} self._state = {}
self._stateextras = collections.defaultdict(dict) self._stateextras = collections.defaultdict(dict)
self._local = None self._local = node
self._other = None self._other = other
self._labels = labels 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)
if node:
self._local = node
self._other = other
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