comparison mercurial/revlog.py @ 42629:24111fb9a725

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

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".)

Differential Revision: https://phab.mercurial-scm.org/D6661

42628:eb27d9eee2cc

    def shortest(self, node, minlength=1):
        """Find the shortest unambiguous prefix that matches node."""
        def isvalid(prefix):
            try:
                node = self._partialmatch(prefix)
            except error.AmbiguousPrefixLookupError:
                return False
            except error.WdirUnsupported:
                # single 'ff...' match
                return True
            if node is None:
                raise error.LookupError(node, self.indexfile, _('no node'))
            return True

        def maybewdir(prefix):
            return all(c == 'f' for c in pycompat.iterbytestr(prefix))

42629:24111fb9a725

    def shortest(self, node, minlength=1):
        """Find the shortest unambiguous prefix that matches node."""
        def isvalid(prefix):
            try:
                matchednode = self._partialmatch(prefix)
            except error.AmbiguousPrefixLookupError:
                return False
            except error.WdirUnsupported:
                # single 'ff...' match
                return True
            if matchednode is None:
                raise error.LookupError(node, self.indexfile, _('no node'))
            return True

        def maybewdir(prefix):
            return all(c == 'f' for c in pycompat.iterbytestr(prefix))