This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9036

mergestate: remove unnecessary clearing of `localctx` and `otherctx`
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3dd481e11c25: mergestate: remove unnecessary clearing of `localctx` and `otherctx`
Summary

As noted in the previous commit, there are no callers that (re-)use
the instance after calling reset(). There are also no callers that
call _read() after doing anything with the instance (it's only
called right after an instance is created).

If reviewers feel that this is too risky, I can extract and reuse the
poisoning code that indygreg once added for poisining repo instances.

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:19 PM
indygreg added a subscriber: indygreg.

Use of delattr is a bit wonky in the first place, as optional instance attributes feel like an anti-pattern to me. This is probably fine.

This revision is now accepted and ready to land.Sep 17 2020, 10:19 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (6 lines)

Diff 22684

mercurial/mergestate.py

shutil.rmtree(self._repo.vfs.join(b'merge'), True) shutil.rmtree(self._repo.vfs.join(b'merge'), True)
def start(self, node, other, labels=None): def start(self, node, other, labels=None):
self._local = node self._local = node
self._other = other self._other = other
self._labels = labels self._labels = labels
self._state = {} self._state = {}
self._stateextras = collections.defaultdict(dict) self._stateextras = collections.defaultdict(dict)
for var in ('localctx', 'otherctx'):
if var in vars(self):
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
self._results = {} self._results = {}
self._dirty = False self._dirty = False
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)
self._local = None self._local = None
self._other = None self._other = None
for var in ('localctx', 'otherctx'):
if var in vars(self):
delattr(self, var)
self._readmergedriver = None self._readmergedriver = None
self._mdstate = MERGE_DRIVER_STATE_SUCCESS self._mdstate = MERGE_DRIVER_STATE_SUCCESS
unsupported = set() unsupported = set()
records = self._readrecords() records = self._readrecords()
for rtype, record in records: for rtype, record in records:
if rtype == RECORD_LOCAL: if rtype == RECORD_LOCAL:
self._local = bin(record) self._local = bin(record)
elif rtype == RECORD_OTHER: elif rtype == RECORD_OTHER: