This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3451

context: clarify that only one attempt is made to interpret changeid
ClosedPublic

Authored by martinvonz on May 6 2018, 12:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbb8e93b332a7: context: clarify that only one attempt is made to interpret changeid
Summary

We can now tell what type of revision specifier we have just by
looking at it (we no longer attempt to interpret it in one way after
the other -- that's now in scmutil.revsymbol()). Let's clarify this in
the code by swithing to if/elif.

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

Diff 8477

mercurial/context.py

"""changeid is a revision number, node, or tag""" """changeid is a revision number, node, or tag"""
super(changectx, self).__init__(repo) super(changectx, self).__init__(repo)
try: try:
if isinstance(changeid, int): if isinstance(changeid, int):
self._node = repo.changelog.node(changeid) self._node = repo.changelog.node(changeid)
self._rev = changeid self._rev = changeid
return return
if changeid == 'null': elif changeid == 'null':
self._node = nullid self._node = nullid
self._rev = nullrev self._rev = nullrev
return return
if changeid == 'tip': elif changeid == 'tip':
self._node = repo.changelog.tip() self._node = repo.changelog.tip()
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
return return
if (changeid == '.' elif (changeid == '.'
or repo.local() and changeid == repo.dirstate.p1()): or repo.local() and changeid == repo.dirstate.p1()):
# this is a hack to delay/avoid loading obsmarkers # this is a hack to delay/avoid loading obsmarkers
# when we know that '.' won't be hidden # when we know that '.' won't be hidden
self._node = repo.dirstate.p1() self._node = repo.dirstate.p1()
self._rev = repo.unfiltered().changelog.rev(self._node) self._rev = repo.unfiltered().changelog.rev(self._node)
return return
if 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:
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()):
msg = _("working directory has unknown parent '%s'!") msg = _("working directory has unknown parent '%s'!")
raise error.Abort(msg % short(changeid)) raise error.Abort(msg % short(changeid))
if len(changeid) == 40: elif 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):
pass pass