This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4884

repo: remove the last few "pass" statements in localrepo.__getitem__
ClosedPublic

Authored by martinvonz on Oct 4 2018, 8:03 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf84d7ed3bb35: repo: remove the last few "pass" statements in localrepo.__getitem__
rHG7aae2d82045a: repo: remove the last few "pass" statements in localrepo.__getitem__
Summary

In case of IndexError or LookupError, we used "pass" statements and
fell through to the end of localrepo.getitem. I find the pass
statements easy to miss. Consistently raising and catching exceptions
seems easier to follow.

Oh -- and I didn't plan this before I wrote the above -- that probably
also lets us reuse the "return context.changectx(self, rev, node)" in
a later patch.

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/localrepo.py (18 lines)

Diff 11697

mercurial/localrepo.py

# #
# 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 (self.local() if (self.local()
and changeid in self.unfiltered().dirstate.parents()): and changeid in self.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))
changeid = hex(changeid) # for the error message changeid = hex(changeid) # for the error message
raise
elif len(changeid) == 40: elif len(changeid) == 40:
try:
node = bin(changeid) node = bin(changeid)
rev = self.changelog.rev(node) rev = self.changelog.rev(node)
return context.changectx(self, rev, node) return context.changectx(self, rev, node)
except error.FilteredLookupError:
raise
except LookupError:
pass
else: else:
raise error.ProgrammingError( raise error.ProgrammingError(
"unsupported changeid '%s' of type %s" % "unsupported changeid '%s' of type %s" %
(changeid, type(changeid))) (changeid, type(changeid)))
except (error.FilteredIndexError, error.FilteredLookupError): except (error.FilteredIndexError, error.FilteredLookupError):
raise error.FilteredRepoLookupError(_("filtered revision '%s'") raise error.FilteredRepoLookupError(_("filtered revision '%s'")
% pycompat.bytestr(changeid)) % pycompat.bytestr(changeid))
except IndexError: except (IndexError, LookupError):
pass raise error.RepoLookupError(_("unknown revision '%s'") % changeid)
except error.WdirUnsupported: except error.WdirUnsupported:
return context.workingctx(self) return context.workingctx(self)
raise error.RepoLookupError(
_("unknown revision '%s'") % changeid)
def __contains__(self, changeid): def __contains__(self, changeid):
"""True if the given changeid exists """True if the given changeid exists
error.AmbiguousPrefixLookupError is raised if an ambiguous node error.AmbiguousPrefixLookupError is raised if an ambiguous node
specified. specified.
""" """
try: try: