Mercurial > public > mercurial-scm > hg

comparison mercurial/mergestate.py @ 45495:3dd481e11c25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: remove unnecessary clearing of `localctx` and `otherctx` 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. Differential Revision: https://phab.mercurial-scm.org/D9036
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 19:33:55 -0700
parents 9ea4b52ac6bb
children ef3273ac5f6e
comparison
equal deleted inserted replaced
45494:9ea4b52ac6bb 45495:3dd481e11c25
10 bin, 10 bin,
11 hex, 11 hex,
12 nullhex, 12 nullhex,
13 nullid, 13 nullid,
14 ) 14 )
15 from .pycompat import delattr
16 from . import ( 15 from . import (
17 error, 16 error,
18 filemerge, 17 filemerge,
19 pycompat, 18 pycompat,
20 util, 19 util,
206 self._local = node 205 self._local = node
207 self._other = other 206 self._other = other
208 self._labels = labels 207 self._labels = labels
209 self._state = {} 208 self._state = {}
210 self._stateextras = collections.defaultdict(dict) 209 self._stateextras = collections.defaultdict(dict)
211 for var in ('localctx', 'otherctx'):
212 if var in vars(self):
213 delattr(self, var)
214 self._readmergedriver = None 210 self._readmergedriver = None
215 if self.mergedriver: 211 if self.mergedriver:
216 self._mdstate = MERGE_DRIVER_STATE_SUCCESS 212 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
217 else: 213 else:
218 self._mdstate = MERGE_DRIVER_STATE_UNMARKED 214 self._mdstate = MERGE_DRIVER_STATE_UNMARKED
227 """ 223 """
228 self._state = {} 224 self._state = {}
229 self._stateextras = collections.defaultdict(dict) 225 self._stateextras = collections.defaultdict(dict)
230 self._local = None 226 self._local = None
231 self._other = None 227 self._other = None
232 for var in ('localctx', 'otherctx'):
233 if var in vars(self):
234 delattr(self, var)
235 self._readmergedriver = None 228 self._readmergedriver = None
236 self._mdstate = MERGE_DRIVER_STATE_SUCCESS 229 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
237 unsupported = set() 230 unsupported = set()
238 records = self._readrecords() 231 records = self._readrecords()
239 for rtype, record in records: 232 for rtype, record in records: