comparison mercurial/context.py @ 37857:9231148ea599

context: convert to hex for error message only for 20-byte changeid

Now that 20-byte strings unambiguously mean binary (or a bug), we can
specialize the conversion to hex for that case.

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

37856:bb8e93b332a7

from __future__ import absolute_import

import errno
import filecmp
import os
import re
import stat

from .i18n import _
from .node import (
    addednodeid,

    dateutil,
    stringutil,
)

propertycache = util.propertycache

nonascii = re.compile(br'[^\x21-\x7f]').search

class basectx(object):
    """A basectx object represents the common logic for its children:
    changectx: read-only context that is already present in the repo,
    workingctx: a context that represents the working directory and can

                    # exception for filtered changeset access
                    if (repo.local()
                        and changeid in repo.unfiltered().dirstate.parents()):
                        msg = _("working directory has unknown parent '%s'!")
                        raise error.Abort(msg % short(changeid))

            elif len(changeid) == 40:
                try:
                    self._node = bin(changeid)
                    self._rev = repo.changelog.rev(self._node)

                    raise
                except (TypeError, LookupError):
                    pass

            # lookup failed
            try:
                if len(changeid) == 20 and nonascii(changeid):
                    changeid = hex(changeid)
            except TypeError:
                pass
        except (error.FilteredIndexError, error.FilteredLookupError):
            raise error.FilteredRepoLookupError(_("filtered revision '%s'")
                                                % changeid)
        except error.FilteredRepoLookupError:
            raise

37857:9231148ea599

from __future__ import absolute_import

import errno
import filecmp
import os
import stat

from .i18n import _
from .node import (
    addednodeid,

    dateutil,
    stringutil,
)

propertycache = util.propertycache

class basectx(object):
    """A basectx object represents the common logic for its children:
    changectx: read-only context that is already present in the repo,
    workingctx: a context that represents the working directory and can

                    # exception for filtered changeset access
                    if (repo.local()
                        and changeid in repo.unfiltered().dirstate.parents()):
                        msg = _("working directory has unknown parent '%s'!")
                        raise error.Abort(msg % short(changeid))
                    changeid = hex(changeid) # for the error message

            elif len(changeid) == 40:
                try:
                    self._node = bin(changeid)
                    self._rev = repo.changelog.rev(self._node)

                    raise
                except (TypeError, LookupError):
                    pass

            # lookup failed
        except (error.FilteredIndexError, error.FilteredLookupError):
            raise error.FilteredRepoLookupError(_("filtered revision '%s'")
                                                % changeid)
        except error.FilteredRepoLookupError:
            raise