This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4798

storageutil: consistently raise LookupError (API)
ClosedPublic

Authored by indygreg on Sep 28 2018, 8:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGad8389ecd3f5: storageutil: consistently raise LookupError (API)
Summary

The interface docs say this is supposed to raise LookupError on
failure. But for invalid revision number input, it could raise
IndexError because ifileindex.node() is documented to raise
IndexError.

lookup() for files isn't used that much (pretty much just in
basefilectx in core AFAICT). And callers should already be catching
LookupError. So I don't anticipate that much fallout from this
change.

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 11612

mercurial/testing/storage.py

self.assertEqual(f.lookup(0), node) self.assertEqual(f.lookup(0), node)
self.assertEqual(f.lookup(-1), nullid) self.assertEqual(f.lookup(-1), nullid)
self.assertEqual(f.lookup(b'0'), node) self.assertEqual(f.lookup(b'0'), node)
self.assertEqual(f.lookup(hex(node)), node) self.assertEqual(f.lookup(hex(node)), node)
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.lookup(hex(node)[0:12]) f.lookup(hex(node)[0:12])
with self.assertRaises(IndexError): with self.assertRaises(error.LookupError):
f.lookup(-2) f.lookup(-2)
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.lookup(b'-2') f.lookup(b'-2')
with self.assertRaises(IndexError): with self.assertRaises(error.LookupError):
f.lookup(1) f.lookup(1)
with self.assertRaises(error.LookupError): with self.assertRaises(error.LookupError):
f.lookup(b'1') f.lookup(b'1')
self.assertEqual(f.linkrev(0), 0) self.assertEqual(f.linkrev(0), 0)
with self.assertRaises(IndexError): with self.assertRaises(IndexError):

mercurial/utils/storageutil.py

* A bytes that can be parsed as an integer representing a revision number. * A bytes that can be parsed as an integer representing a revision number.
``identifier`` is used to populate ``error.LookupError`` with an identifier ``identifier`` is used to populate ``error.LookupError`` with an identifier
for the store. for the store.
Raises ``error.LookupError`` on failure. Raises ``error.LookupError`` on failure.
""" """
if isinstance(fileid, int): if isinstance(fileid, int):
try:
return store.node(fileid) return store.node(fileid)
except IndexError:
raise error.LookupError(fileid, identifier, _('no match found'))
if len(fileid) == 20: if len(fileid) == 20:
try: try:
store.rev(fileid) store.rev(fileid)
return fileid return fileid
except error.LookupError: except error.LookupError:
pass pass