This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6661

lookup: don't use "00changelog.i@None" when lookup of prefix fails
ClosedPublic

Authored by martinvonz on Jul 19 2019, 1:36 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG24111fb9a725: lookup: don't use "00changelog.i@None" when lookup of prefix fails
rHGa979939da14e: lookup: don't use "00changelog.i@None" when lookup of prefix fails
Summary

We were shadowing the "node" variable, so we always passed None to the
LookupError instead of the node we meant to pass.

(This showed up in py3 tests since py3 doesn't like to format None
using "%s".)

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/revlog.py (4 lines)

Diff 15992

mercurial/revlog.py

return n return n
raise error.LookupError(id, self.indexfile, _('no match found')) raise error.LookupError(id, self.indexfile, _('no match found'))
def shortest(self, node, minlength=1): def shortest(self, node, minlength=1):
"""Find the shortest unambiguous prefix that matches node.""" """Find the shortest unambiguous prefix that matches node."""
def isvalid(prefix): def isvalid(prefix):
try: try:
node = self._partialmatch(prefix) matchednode = self._partialmatch(prefix)
except error.AmbiguousPrefixLookupError: except error.AmbiguousPrefixLookupError:
return False return False
except error.WdirUnsupported: except error.WdirUnsupported:
# single 'ff...' match # single 'ff...' match
return True return True
if node is None: if matchednode is None:
raise error.LookupError(node, self.indexfile, _('no node')) raise error.LookupError(node, self.indexfile, _('no node'))
return True return True
def maybewdir(prefix): def maybewdir(prefix):
return all(c == 'f' for c in pycompat.iterbytestr(prefix)) return all(c == 'f' for c in pycompat.iterbytestr(prefix))
hexnode = hex(node) hexnode = hex(node)