This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7651

nodetree: simplify a conditionnal in shortesthexnodeidprefix
ClosedPublic

Authored by marmoute on Dec 13 2019, 3:11 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf2de8dc9c52f: nodetree: simplify a conditionnal in shortesthexnodeidprefix
Summary

instead of try to catch some attribute error, we could just nicely look if the
attribute will be available. This make the code simpler to follow and less error
prone since we no longer rely on a wider attribute catching.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (8 lines)

Diff 18886

mercurial/scmutil.py

if cache is not None: if cache is not None:
cache[b'disambiguationrevset'] = revs cache[b'disambiguationrevset'] = revs
if cl.rev(node) in revs: if cl.rev(node) in revs:
hexnode = hex(node) hexnode = hex(node)
nodetree = None nodetree = None
if cache is not None: if cache is not None:
nodetree = cache.get(b'disambiguationnodetree') nodetree = cache.get(b'disambiguationnodetree')
if not nodetree: if not nodetree:
try: if util.safehasattr(parsers, 'nodetree'):
# The CExt is the only implementation to provide a nodetree
# class so far.
nodetree = parsers.nodetree(cl.index, len(revs)) nodetree = parsers.nodetree(cl.index, len(revs))
except AttributeError:
# no native nodetree
pass
else:
for r in revs: for r in revs:
nodetree.insert(r) nodetree.insert(r)
if cache is not None: if cache is not None:
cache[b'disambiguationnodetree'] = nodetree cache[b'disambiguationnodetree'] = nodetree
if nodetree is not None: if nodetree is not None:
length = max(nodetree.shortest(node), minlength) length = max(nodetree.shortest(node), minlength)
prefix = hexnode[:length] prefix = hexnode[:length]
return disambiguate(prefix) return disambiguate(prefix)