This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8040

mergestate: add accessors for local and other nodeid, not just contexts
ClosedPublic

Authored by martinvonz on Jan 29 2020, 7:56 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb1069b369d6e: mergestate: add accessors for local and other nodeid, not just contexts
rHGb8b4d9ad4613: mergestate: add accessors for local and other nodeid, not just contexts
Summary

The mergestate can contain invalid nodeids. In that case,
mergestate.localctx or mergestate.otherctx will fail. This patch
provides a way of accessing the nodeid without failing in such cases.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (22 lines)

Diff 19721

mercurial/merge.py

raise error.ConfigError( raise error.ConfigError(
_(b"merge driver changed since merge started"), _(b"merge driver changed since merge started"),
hint=_(b"revert merge driver change or abort merge"), hint=_(b"revert merge driver change or abort merge"),
) )
return configmergedriver return configmergedriver
@util.propertycache @util.propertycache
def localctx(self): def local(self):
if self._local is None: 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) raise error.ProgrammingError(msg)
return self._repo[self._local] return self._local
@util.propertycache @util.propertycache
def otherctx(self): def localctx(self):
return self._repo[self.local]
@util.propertycache
def other(self):
if self._other is None: if self._other is None:
msg = b"otherctx accessed but self._other isn't set" msg = b"other accessed but self._other isn't set"
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
return self._repo[self._other] return self._other
@util.propertycache
def otherctx(self):
return self._repo[self.other]
def active(self): def active(self):
"""Whether mergestate is active. """Whether mergestate is active.
Returns True if there appears to be mergestate. This is a rough proxy Returns True if there appears to be mergestate. This is a rough proxy
for "is a merge in progress." for "is a merge in progress."
""" """
# Check local variables before looking at filesystem for performance # Check local variables before looking at filesystem for performance