This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3450

context: only bother looking for broken dirstate for 20-byte changeid
ClosedPublic

Authored by martinvonz on May 6 2018, 12:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfdd8da79eb85: context: only bother looking for broken dirstate for 20-byte changeid
Summary

If we fail to look up a changeid in changectx.init, we check if it
exactly matches any of the dirstate parents, and if it does, we print
a more specific message ("working directory has unknown parent '...'!"
instead of "unknown revision '...'"). The dirstate parents are always
20 bytes, so there's no need to check for a match when the given
changeid is not 20 bytes. (And now that all the other allowed forms of
changeid have been moved out of the constructor, there's no risk that
a changeid that did match a dirstate parent was actually a valid
bookmark.)

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

Diff 8476

mercurial/context.py

if len(changeid) == 20: if len(changeid) == 20:
try: try:
self._node = changeid self._node = changeid
self._rev = repo.changelog.rev(changeid) self._rev = repo.changelog.rev(changeid)
return return
except error.FilteredLookupError: except error.FilteredLookupError:
raise raise
except LookupError: except LookupError:
pass # check if it might have come from damaged dirstate
#
# XXX we could avoid the unfiltered if we had a recognizable
# 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))
if len(changeid) == 40: if 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
# check if it might have come from damaged dirstate
#
# XXX we could avoid the unfiltered if we had a recognizable
# 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))
try: try:
if len(changeid) == 20 and nonascii(changeid): if len(changeid) == 20 and nonascii(changeid):
changeid = hex(changeid) changeid = hex(changeid)
except TypeError: except TypeError:
pass 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)