This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8783

storageutil: allow modern hash sizes for fileids
ClosedPublic

Authored by joerg.sonnenberger on Jul 21 2020, 4:41 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc4a4a49589bf: storageutil: allow modern hash sizes for fileids

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.

Event Timeline

marmoute added a subscriber: marmoute.Aug 26 2020, 12:24 PM

This look good overall. I wonder how much the tuple creation and lookup cost and if we should have two explicite test instead.

This question leads me to wonder if we should not simply have the store advertise the size of the hash it use and strictly test against that. What do you think ?

joerg.sonnenberger added a comment.Aug 26 2020, 4:02 PM

The tuples result in bytecode constants, so it's a one time overhead.

pulkit accepted this revision.Sep 2 2020, 7:53 AM
This revision is now accepted and ready to land.Sep 2 2020, 7:53 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/storageutil.py (8 lines)

Diff 22519

mercurial/utils/storageutil.py

def fileidlookup(store, fileid, identifier): def fileidlookup(store, fileid, identifier):
"""Resolve the file node for a value. """Resolve the file node for a value.
``store`` is an object implementing the ``ifileindex`` interface. ``store`` is an object implementing the ``ifileindex`` interface.
``fileid`` can be: ``fileid`` can be:
* A 20 byte binary node. * A 20 or 32 byte binary node.
* An integer revision number * An integer revision number
* A 40 byte hex node. * A 40 or 64 byte hex node.
* 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: try:
return store.node(fileid) return store.node(fileid)
except IndexError: except IndexError:
raise error.LookupError( raise error.LookupError(
b'%d' % fileid, identifier, _(b'no match found') b'%d' % fileid, identifier, _(b'no match found')
) )
if len(fileid) == 20: if len(fileid) in (20, 32):
try: try:
store.rev(fileid) store.rev(fileid)
return fileid return fileid
except error.LookupError: except error.LookupError:
pass pass
if len(fileid) == 40: if len(fileid) in (40, 64):
try: try:
rawnode = bin(fileid) rawnode = bin(fileid)
store.rev(rawnode) store.rev(rawnode)
return rawnode return rawnode
except TypeError: except TypeError:
pass pass
try: try: