Skip to content
Snippets Groups Projects
Commit 167b22a906f3 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

context: make repo[<filtered binary nodeid>] match node

If you pass in a binary nodeid of a filtered node to repo.__getitem__,
it would run through this code:

    try:
        self._node = changeid
	self._rev = repo.changelog.rev(changeid)
	return
    except error.FilteredLookupError:
        raise
    except LookupError:
         pass

However, repo.changelog.rev() would raise a FilteredLookupError, not
FilteredRepoLookupError. Instead, we would hit the "except
LookupError" and continue, trying to interpret the nodeid as a
bookmark etc. The end result would be an error like this:

  abort: unknown revision 'ddadbd7c40ef8b8ad6d0d01a7a842092fc431798'!

After this patch, it would instead be:

  abort: 00changelog.i@ddadbd7c40ef8b8ad6d0d01a7a842092fc431798: filtered node!

This only happens when we get a binary nodeid, which means it's not
string directly from the user, so it would be a programming error if
it happened. It's therefore a little hard to test (I checked
test-context.py, but it doesn't use obsmarkers).

It looks like this has been wrong ever since dc25ed84bee8 (changectx:
issue a FilteredRepoLookupError when applicable, 2014-10-15).

Differential Revision: https://phab.mercurial-scm.org/D3144
parent ecd3f6909184
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment