This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3987

context: use hex nodeid in error about filtered node
ClosedPublic

Authored by martinvonz on Jul 30 2018, 5:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG545a3e6650cd: context: use hex nodeid in error about filtered node
Summary

I went a little too far in my cleanup in 9231148ea599 (context:
convert to hex for error message only for 20-byte changeid,
2018-04-06). I missed that the case where a binary nodeid refers to a
filtered node.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jul 30 2018, 5:46 PM
Closed by commit rHG545a3e6650cd: context: use hex nodeid in error about filtered node (authored by martinvonz). · Explain WhyJul 31 2018, 8:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (1 line)

Diff 9672

mercurial/context.py

self._rev = repo.unfiltered().changelog.rev(self._node) self._rev = repo.unfiltered().changelog.rev(self._node)
return return
elif len(changeid) == 20: elif 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:
changeid = hex(changeid) # for the error message
raise raise
except LookupError: except LookupError:
# 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()):