This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3185

context: convert binary changeid to hex also for filtered ones
AbandonedPublic

Authored by martinvonz on Apr 7 2018, 2:14 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Summary

Funnily enough, within about a day of writing D3144, I ran into the
exception in practice. I spent some time trying figure out why I got
the "unknown revision" message when the node was clearly in the repo,
and then I finally remembered that I had just fixed that bug. Anyway,
even with the fix applied, the message wasn't ideal: now it would
instead be something like "abort: hidden revision 'K*}s!", because the
error message didn't go through the conversion to hex that happens at
the end of the try-block. Let's fix that by converting to hex before
re-raising.

(I included example output in D3144, which is apparently incorrect. I
suppose that must have been produced when the patch was later in my
stack of unsent patches, before I rebased it and sent it. Sorry about
that.)

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 7 2018, 2:14 AM
yuja requested changes to this revision.Apr 7 2018, 3:59 AM
yuja added a subscriber: yuja.

IIUC, Filtered*Errors are re-raised up to scmutil.revsymbol(), so fixing
up changeid here wouldn't work.

This revision now requires changes to proceed.Apr 7 2018, 3:59 AM
martinvonz added a comment.Apr 8 2018, 11:28 AM
In D3185#51146, @yuja wrote:

IIUC, Filtered*Errors are re-raised up to scmutil.revsymbol(), so fixing
up changeid here wouldn't work.

Sigh, you're right, of course. Thanks for checking. So this is already handled correctly. I suppose that's why I sent D3144 before D3143. I'll just drop this patch then.

martinvonz abandoned this revision.Apr 8 2018, 11:28 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (1 line)

Diff 7870

mercurial/context.py

self._rev = repo.unfiltered().changelog.rev(self._node) self._rev = repo.unfiltered().changelog.rev(self._node)
return return
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:
changeid = hex(changeid) # for the error message
raise raise
except LookupError: except LookupError:
pass pass
try: try:
r = int(changeid) r = int(changeid)
if '%d' % r != changeid: if '%d' % r != changeid:
raise ValueError raise ValueError