D8040: mergestate: add accessors for local and other nodeid, not just contexts
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jan 30 10:39:33 EST 2020
Closed by commit rHGb8b4d9ad4613: mergestate: add accessors for local and other nodeid, not just contexts (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8040?vs=19700&id=19721
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8040/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8040
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -386,18 +386,26 @@
return configmergedriver
@util.propertycache
- def localctx(self):
+ def local(self):
if self._local is None:
- msg = b"localctx accessed but self._local isn't set"
+ msg = b"local accessed but self._local isn't set"
raise error.ProgrammingError(msg)
- return self._repo[self._local]
+ return self._local
+
+ @util.propertycache
+ def localctx(self):
+ return self._repo[self.local]
+
+ @util.propertycache
+ def other(self):
+ if self._other is None:
+ msg = b"other accessed but self._other isn't set"
+ raise error.ProgrammingError(msg)
+ return self._other
@util.propertycache
def otherctx(self):
- if self._other is None:
- msg = b"otherctx accessed but self._other isn't set"
- raise error.ProgrammingError(msg)
- return self._repo[self._other]
+ return self._repo[self.other]
def active(self):
"""Whether mergestate is active.
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list