Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 43421:be384a2052aa stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: don't use bytes with vars() or __dict__ Inspired by D7227. These were all the remaining instances I could find. Differential Revision: https://phab.mercurial-scm.org/D7230
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 05 Nov 2019 08:42:42 -0800
parents 8ff1ecfadcd1
children 0b7733719d21
comparison
equal deleted inserted replaced
43420:93aeebc90ff9 43421:be384a2052aa
169 self._state = {} 169 self._state = {}
170 self._stateextras = {} 170 self._stateextras = {}
171 self._local = None 171 self._local = None
172 self._other = None 172 self._other = None
173 self._labels = labels 173 self._labels = labels
174 for var in (b'localctx', b'otherctx'): 174 for var in ('localctx', 'otherctx'):
175 if var in vars(self): 175 if var in vars(self):
176 delattr(self, var) 176 delattr(self, var)
177 if node: 177 if node:
178 self._local = node 178 self._local = node
179 self._other = other 179 self._other = other
194 """ 194 """
195 self._state = {} 195 self._state = {}
196 self._stateextras = {} 196 self._stateextras = {}
197 self._local = None 197 self._local = None
198 self._other = None 198 self._other = None
199 for var in (b'localctx', b'otherctx'): 199 for var in ('localctx', 'otherctx'):
200 if var in vars(self): 200 if var in vars(self):
201 delattr(self, var) 201 delattr(self, var)
202 self._readmergedriver = None 202 self._readmergedriver = None
203 self._mdstate = MERGE_DRIVER_STATE_SUCCESS 203 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
204 unsupported = set() 204 unsupported = set()