Show More
@@ -315,13 +315,15 b' class mergestate(object):' | |||
|
315 | 315 | @util.propertycache |
|
316 | 316 | def localctx(self): |
|
317 | 317 | if self._local is None: |
|
318 |
|
|
|
318 | msg = "localctx accessed but self._local isn't set" | |
|
319 | raise error.ProgrammingError(msg) | |
|
319 | 320 | return self._repo[self._local] |
|
320 | 321 | |
|
321 | 322 | @util.propertycache |
|
322 | 323 | def otherctx(self): |
|
323 | 324 | if self._other is None: |
|
324 |
|
|
|
325 | msg = "otherctx accessed but self._other isn't set" | |
|
326 | raise error.ProgrammingError(msg) | |
|
325 | 327 | return self._repo[self._other] |
|
326 | 328 | |
|
327 | 329 | def active(self): |
General Comments 0
You need to be logged in to leave comments.
Login now