This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3370

scmutil: introduce shortesthexnodeidprefix()
ClosedPublic

Authored by martinvonz on Apr 14 2018, 2:16 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe743b8524d60: scmutil: introduce shortesthexnodeidprefix()
Summary

We have scmutil.resolvehexnodeidprefix() for resolving a prefix to a
full nodeid, so it makes sense to have the inverse method next to
it. For now it just delegates to changelog.shortest(), but it will
soon also make sure it's called on the unfiltered repo, to match
resolvehexnodeidprefix().

Note that the change in show.py also makes it so the conversion from
revnum to nodeid is done on the filtered repo, but that should be
inconsequential since the revs are all from the filtered repo anyway.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 14 2018, 2:16 AM
martinvonz updated this revision to Diff 8254.Apr 14 2018, 3:20 AM
Closed by commit rHGe743b8524d60: scmutil: introduce shortesthexnodeidprefix() (authored by martinvonz). · Explain WhyApr 14 2018, 4:12 AM
This revision was automatically updated to reflect the committed changes.
martinvonz updated this revision to Diff 8285.Apr 14 2018, 12:16 PM

Revision Contents
Changeset List

PathPackages
Mhgext/show.py (7 lines)
Mmercurial/scmutil.py (4 lines)
Mmercurial/templatefuncs.py (4 lines)

Diff 8285

hgext/show.py

formatter, formatter,
graphmod, graphmod,
logcmdutil, logcmdutil,
phases, phases,
pycompat, pycompat,
registrar, registrar,
revset, revset,
revsetlang, revsetlang,
scmutil,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
The number of revisions in the repo is taken into account to prevent The number of revisions in the repo is taken into account to prevent
a numeric node prefix from conflicting with an integer revision number. a numeric node prefix from conflicting with an integer revision number.
If we fail to do this, a value of e.g. ``10023`` could mean either If we fail to do this, a value of e.g. ``10023`` could mean either
revision 10023 or node ``10023abc...``. revision 10023 or node ``10023abc...``.
""" """
if not revs: if not revs:
return minlen return minlen
# don't use filtered repo because it's slow. see templater.shortest(). # don't use filtered repo because it's slow. see templater.shortest().
cl = repo.unfiltered().changelog cl = repo.changelog
return max(len(cl.shortest(hex(cl.node(r)), minlen)) for r in revs) return max(len(scmutil.shortesthexnodeidprefix(repo.unfiltered(),
hex(cl.node(r)),
minlen)) for r in revs)
# Adjust the docstring of the show command so it shows all registered views. # Adjust the docstring of the show command so it shows all registered views.
# This is a bit hacky because it runs at the end of module load. When moved # This is a bit hacky because it runs at the end of module load. When moved
# into core or when another extension wants to provide a view, we'll need # into core or when another extension wants to provide a view, we'll need
# to do this more robustly. # to do this more robustly.
# TODO make this more robust. # TODO make this more robust.
def _updatedocstring(): def _updatedocstring():
longest = max(map(len, showview._table.keys())) longest = max(map(len, showview._table.keys()))

mercurial/scmutil.py

# Uses unfiltered repo because it's faster when prefix is ambiguous/ # Uses unfiltered repo because it's faster when prefix is ambiguous/
# This matches the "shortest" template function. # This matches the "shortest" template function.
node = repo.unfiltered().changelog._partialmatch(prefix) node = repo.unfiltered().changelog._partialmatch(prefix)
if node is None: if node is None:
return return
repo.changelog.rev(node) # make sure node isn't filtered repo.changelog.rev(node) # make sure node isn't filtered
return node return node
def shortesthexnodeidprefix(repo, hexnode, minlength=1):
"""Find the shortest unambiguous prefix that matches hexnode."""
return repo.changelog.shortest(hexnode, minlength)
def isrevsymbol(repo, symbol): def isrevsymbol(repo, symbol):
"""Checks if a symbol exists in the repo. """Checks if a symbol exists in the repo.
See revsymbol() for details. Raises error.LookupError if the symbol is an See revsymbol() for details. Raises error.LookupError if the symbol is an
ambiguous nodeid prefix. ambiguous nodeid prefix.
""" """
try: try:
revsymbol(repo, symbol) revsymbol(repo, symbol)

mercurial/templatefuncs.py

if len(args) > 1: if len(args) > 1:
minlength = evalinteger(context, mapping, args[1], minlength = evalinteger(context, mapping, args[1],
# i18n: "shortest" is a keyword # i18n: "shortest" is a keyword
_("shortest() expects an integer minlength")) _("shortest() expects an integer minlength"))
# _partialmatch() of filtered changelog could take O(len(repo)) time, # _partialmatch() of filtered changelog could take O(len(repo)) time,
# which would be unacceptably slow. so we look for hash collision in # which would be unacceptably slow. so we look for hash collision in
# unfiltered space, which means some hashes may be slightly longer. # unfiltered space, which means some hashes may be slightly longer.
cl = context.resource(mapping, 'ctx')._repo.unfiltered().changelog repo = context.resource(mapping, 'ctx')._repo
return cl.shortest(node, minlength) return scmutil.shortesthexnodeidprefix(repo.unfiltered(), node, minlength)
@templatefunc('strip(text[, chars])') @templatefunc('strip(text[, chars])')
def strip(context, mapping, args): def strip(context, mapping, args):
"""Strip characters from a string. By default, """Strip characters from a string. By default,
strips all leading and trailing whitespace.""" strips all leading and trailing whitespace."""
if not (1 <= len(args) <= 2): if not (1 <= len(args) <= 2):
# i18n: "strip" is a keyword # i18n: "strip" is a keyword
raise error.ParseError(_("strip expects one or two arguments")) raise error.ParseError(_("strip expects one or two arguments"))