equal
deleted
inserted
replaced
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: |