This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8683

revlog: avoid hard-coded hash sizes
ClosedPublic

Authored by joerg.sonnenberger on Jul 6 2020, 8:43 AM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcc2572923ea3: revlog: avoid hard-coded hash sizes

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

pulkit accepted this revision.Jul 7 2020, 2:15 PM
pulkit added a subscriber: pulkit.

There are couple of other mentions of 40 in this file, looks like in future we should introduce a constant for this.

Queued, thanks!

This revision is now accepted and ready to land.Jul 7 2020, 2:15 PM
joerg.sonnenberger added a commit: rHGcc2572923ea3: revlog: avoid hard-coded hash sizes.Jul 7 2020, 4:45 PM
Closed by commit rHGcc2572923ea3: revlog: avoid hard-coded hash sizes (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (6 lines)

Diff 21789

mercurial/revlog.py

def maybewdir(prefix): def maybewdir(prefix):
return all(c == b'f' for c in pycompat.iterbytestr(prefix)) return all(c == b'f' for c in pycompat.iterbytestr(prefix))
hexnode = hex(node) hexnode = hex(node)
def disambiguate(hexnode, minlength): def disambiguate(hexnode, minlength):
"""Disambiguate against wdirid.""" """Disambiguate against wdirid."""
for length in range(minlength, 41): for length in range(minlength, len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if not maybewdir(prefix): if not maybewdir(prefix):
return prefix return prefix
if not getattr(self, 'filteredrevs', None): if not getattr(self, 'filteredrevs', None):
try: try:
length = max(self.index.shortest(node), minlength) length = max(self.index.shortest(node), minlength)
return disambiguate(hexnode, length) return disambiguate(hexnode, length)
except error.RevlogError: except error.RevlogError:
if node != wdirid: if node != wdirid:
raise error.LookupError(node, self.indexfile, _(b'no node')) raise error.LookupError(node, self.indexfile, _(b'no node'))
except AttributeError: except AttributeError:
# Fall through to pure code # Fall through to pure code
pass pass
if node == wdirid: if node == wdirid:
for length in range(minlength, 41): for length in range(minlength, len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if isvalid(prefix): if isvalid(prefix):
return prefix return prefix
for length in range(minlength, 41): for length in range(minlength, len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if isvalid(prefix): if isvalid(prefix):
return disambiguate(hexnode, length) return disambiguate(hexnode, length)
def cmp(self, node, text): def cmp(self, node, text):
"""compare text with a given file revision """compare text with a given file revision
returns True if text is different than what is stored. returns True if text is different than what is stored.