This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3196

revsymbol: stop delegating to repo.__getitem__ for unhandled symbols (API)
ClosedPublic

Authored by martinvonz on Apr 8 2018, 1:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6639ac97ec3b: revsymbol: stop delegating to repo.__getitem__ for unhandled symbols (API)
Summary

The only remaining cases where we were delegating unhandled symbols to
repo.getitem should now be when the symbol could not be found. In
that case we just delegated to repo.getitem for the error
message. Let's just copy the error message instead.

If there were any cases where we got e.g. a binary nodeid or an
integer revnum into revsymbol() (e.g. via repo.lookup()), we'd now
start raising an exception instead. That is why this is marked (API).

This affects one test case, but the new behavior seems better to me. I
can't tell if the old behavior was desired or if the test was just
there to document how it happened to work.

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

PathPackages
Mmercurial/scmutil.py (2 lines)
Mtests/test-pull.t (2 lines)

Diff 7977

mercurial/scmutil.py

except KeyError: except KeyError:
pass pass
node = repo.unfiltered().changelog._partialmatch(symbol) node = repo.unfiltered().changelog._partialmatch(symbol)
if node is not None: if node is not None:
rev = repo.changelog.rev(node) rev = repo.changelog.rev(node)
return repo[rev] return repo[rev]
return repo[symbol] raise error.RepoLookupError(_("unknown revision '%s'") % symbol)
except error.WdirUnsupported: except error.WdirUnsupported:
return repo[None] return repo[None]
except (error.FilteredIndexError, error.FilteredLookupError, except (error.FilteredIndexError, error.FilteredLookupError,
error.FilteredRepoLookupError): error.FilteredRepoLookupError):
raise _filterederror(repo, symbol) raise _filterederror(repo, symbol)
def _filterederror(repo, changeid): def _filterederror(repo, changeid):

tests/test-pull.t

not are encoded like a node: not are encoded like a node:
$ hg pull -r 'xxxxxxxxxxxxxxxxxxxy' $ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
pulling from http://foo@localhost:$HGPORT/ pulling from http://foo@localhost:$HGPORT/
abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'! abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'!
[255] [255]
$ hg pull -r 'xxxxxxxxxxxxxxxxxx y' $ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
pulling from http://foo@localhost:$HGPORT/ pulling from http://foo@localhost:$HGPORT/
abort: unknown revision '7878787878787878787878787878787878782079'! abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'!
[255] [255]
Issue622: hg init && hg pull -u URL doesn't checkout default branch Issue622: hg init && hg pull -u URL doesn't checkout default branch
$ cd .. $ cd ..
$ hg init empty $ hg init empty
$ cd empty $ cd empty
$ hg pull -u ../test $ hg pull -u ../test