| hg-reviewers |
Now that 20-byte strings unambiguously mean binary (or a bug), we can
specialize the conversion to hex for that case.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # context.py - changeset and file context objects for mercurial | # context.py - changeset and file context objects for mercurial | ||||
| # | # | ||||
| # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno | import errno | ||||
| import filecmp | import filecmp | ||||
| import os | import os | ||||
| import re | |||||
| import stat | import stat | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| addednodeid, | addednodeid, | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| modifiednodeid, | modifiednodeid, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| dateutil, | dateutil, | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| propertycache = util.propertycache | propertycache = util.propertycache | ||||
| nonascii = re.compile(br'[^\x21-\x7f]').search | |||||
| class basectx(object): | class basectx(object): | ||||
| """A basectx object represents the common logic for its children: | """A basectx object represents the common logic for its children: | ||||
| changectx: read-only context that is already present in the repo, | changectx: read-only context that is already present in the repo, | ||||
| workingctx: a context that represents the working directory and can | workingctx: a context that represents the working directory and can | ||||
| be committed, | be committed, | ||||
| memctx: a context that represents changes in-memory and can also | memctx: a context that represents changes in-memory and can also | ||||
| be committed.""" | be committed.""" | ||||
| # check if it might have come from damaged dirstate | # check if it might have come from damaged dirstate | ||||
| # | # | ||||
| # XXX we could avoid the unfiltered if we had a recognizable | # XXX we could avoid the unfiltered if we had a recognizable | ||||
| # exception for filtered changeset access | # exception for filtered changeset access | ||||
| if (repo.local() | if (repo.local() | ||||
| and changeid in repo.unfiltered().dirstate.parents()): | and changeid in repo.unfiltered().dirstate.parents()): | ||||
| msg = _("working directory has unknown parent '%s'!") | msg = _("working directory has unknown parent '%s'!") | ||||
| raise error.Abort(msg % short(changeid)) | raise error.Abort(msg % short(changeid)) | ||||
| changeid = hex(changeid) # for the error message | |||||
| elif len(changeid) == 40: | elif len(changeid) == 40: | ||||
| try: | try: | ||||
| self._node = bin(changeid) | self._node = bin(changeid) | ||||
| self._rev = repo.changelog.rev(self._node) | self._rev = repo.changelog.rev(self._node) | ||||
| return | return | ||||
| except error.FilteredLookupError: | except error.FilteredLookupError: | ||||
| raise | raise | ||||
| except (TypeError, LookupError): | except (TypeError, LookupError): | ||||
| pass | pass | ||||
| # lookup failed | # lookup failed | ||||
| try: | |||||
| if len(changeid) == 20 and nonascii(changeid): | |||||
| changeid = hex(changeid) | |||||
| except TypeError: | |||||
| pass | |||||
| except (error.FilteredIndexError, error.FilteredLookupError): | except (error.FilteredIndexError, error.FilteredLookupError): | ||||
| raise error.FilteredRepoLookupError(_("filtered revision '%s'") | raise error.FilteredRepoLookupError(_("filtered revision '%s'") | ||||
| % changeid) | % changeid) | ||||
| except error.FilteredRepoLookupError: | except error.FilteredRepoLookupError: | ||||
| raise | raise | ||||
| except IndexError: | except IndexError: | ||||
| pass | pass | ||||
| raise error.RepoLookupError( | raise error.RepoLookupError( | ||||