This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3146

context: handle stringified ints in revsymbol()
ClosedPublic

Authored by martinvonz on Apr 5 2018, 6:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1c09481acdcc: context: handle stringified ints in revsymbol()
Summary

This patch copies the handling of stringified ints from changectx's
constructor. It then calls repo.getitem with the int. Since that
method only interprets integers as revnums the first thing it does,
this will not be redoing any of the work already done. We leave the
old code in place so we can later deprecate it instead of breaking
extensions.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 5 2018, 6:07 PM
martinvonz edited the summary of this revision. (Show Details)Apr 5 2018, 6:08 PM
martinvonz planned changes to this revision.Apr 6 2018, 12:47 AM

I should decide what to do about the changeid == repo.dirstate.p1() case before this patch. Also, I may find more cases that should be fixed when I move out other parts (I just found one case in hgweb), so please hold off reviewing this.

martinvonz edited the summary of this revision. (Show Details)Apr 8 2018, 1:04 PM
martinvonz retitled this revision from context: move handling of stringified ints to revsymbol (API) to context: handle stringified ints in revsymbol().
martinvonz added a child revision: D3193: scmutil: handle full hex nodeids in revsymbol().
martinvonz updated this revision to Diff 7884.
Closed by commit rHG1c09481acdcc: context: handle stringified ints in revsymbol() (authored by martinvonz). · Explain WhyApr 11 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (18 lines)
Mmercurial/scmutil.py (21 lines)

Diff 7757

mercurial/context.py

bin, bin,
hex, hex,
modifiednodeid, modifiednodeid,
nullid, nullid,
nullrev, nullrev,
short, short,
wdirid, wdirid,
wdirnodes, wdirnodes,
wdirrev,
) )
from . import ( from . import (
dagop, dagop,
encoding, encoding,
error, error,
fileset, fileset,
match as matchmod, match as matchmod,
obsolete as obsmod, obsolete as obsmod,
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 pass
try:
r = int(changeid)
if '%d' % r != changeid:
raise ValueError
l = len(repo.changelog)
if r < 0:
r += l
if r < 0 or r >= l and r != wdirrev:
raise ValueError
self._rev = r
self._node = repo.changelog.node(r)
return
except error.FilteredIndexError:
raise
except (ValueError, OverflowError, IndexError):
pass
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):

mercurial/scmutil.py

i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
not "max(public())". not "max(public())".
""" """
if not isinstance(symbol, bytes): if not isinstance(symbol, bytes):
msg = ("symbol (%s of type %s) was not a string, did you mean " msg = ("symbol (%s of type %s) was not a string, did you mean "
"repo[symbol]?" % (symbol, type(symbol))) "repo[symbol]?" % (symbol, type(symbol)))
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
try: try:
# TODO: We ideally should resolve these three here instead of
# delegating to repo.__getitem__
if symbol in ('.', 'tip', 'null'):
return repo[symbol] return repo[symbol]
try:
r = int(symbol)
if '%d' % r != symbol:
raise ValueError
l = len(repo.changelog)
if r < 0:
r += l
if r < 0 or r >= l and r != wdirrev:
raise ValueError
return repo[r]
except error.FilteredIndexError:
raise
except (ValueError, OverflowError, IndexError):
pass
return repo[symbol]
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):
"""build an exception to be raised about a filtered changeid """build an exception to be raised about a filtered changeid
This is extracted in a function to help extensions (eg: evolve) to This is extracted in a function to help extensions (eg: evolve) to