Mercurial > public > mercurial-scm > hg

comparison mercurial/mergestate.py @ 45491:aad11a26a054

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: simplify reset(), knowing that `other` and `node` go together 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`. Differential Revision: https://phab.mercurial-scm.org/D9032
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 15 Sep 2020 23:19:14 -0700
parents bb9888d32601
children 08c6d6962b2a
comparison
equal deleted inserted replaced
45490:0ce6af73f481 45491:aad11a26a054
200 self._labels = None 200 self._labels = None
201 201
202 def reset(self, node=None, other=None, labels=None): 202 def reset(self, node=None, other=None, labels=None):
203 self._state = {} 203 self._state = {}
204 self._stateextras = collections.defaultdict(dict) 204 self._stateextras = collections.defaultdict(dict)
205 self._local = None 205 self._local = node
206 self._other = None 206 self._other = other
207 self._labels = labels 207 self._labels = labels
208 for var in ('localctx', 'otherctx'): 208 for var in ('localctx', 'otherctx'):
209 if var in vars(self): 209 if var in vars(self):
210 delattr(self, var) 210 delattr(self, var)
211 if node:
212 self._local = node
213 self._other = other
214 self._readmergedriver = None 211 self._readmergedriver = None
215 if self.mergedriver: 212 if self.mergedriver:
216 self._mdstate = MERGE_DRIVER_STATE_SUCCESS 213 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
217 else: 214 else:
218 self._mdstate = MERGE_DRIVER_STATE_UNMARKED 215 self._mdstate = MERGE_DRIVER_STATE_UNMARKED