This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3455

shortest: make {shortest("fffffffff")} work again
ClosedPublic

Authored by martinvonz on May 7 2018, 12:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG66dc9db6ed2c: shortest: make {shortest("fffffffff")} work again
Summary

{shortest("fffffffff")} should shorten it to the shortest unambiguous
prefix for the working directory. It used to do that until I broke it
in 7b2955624777 (scmutil: make shortesthexnodeidprefix() take a full
binary nodeid, 2018-04-14), when we started returning the full hex
nodeid for any working directory prefix shorter than 40 hex
digits. This patch fixes it by catching WdirUnsupported
specifically.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 7 2018, 12:37 PM
martinvonz edited the summary of this revision. (Show Details)May 7 2018, 6:18 PM
martinvonz updated this revision to Diff 8487.
Closed by commit rHG66dc9db6ed2c: shortest: make {shortest("fffffffff")} work again (authored by martinvonz). · Explain WhyMay 8 2018, 8:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8480

mercurial/templatefuncs.py

# templatefuncs.py - common template functions # templatefuncs.py - common template functions
# #
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import re import re
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
wdirid,
) )
from . import ( from . import (
color, color,
encoding, encoding,
error, error,
minirst, minirst,
obsutil, obsutil,
pycompat, pycompat,
elif len(hexnode) == 40: elif len(hexnode) == 40:
try: try:
node = bin(hexnode) node = bin(hexnode)
except TypeError: except TypeError:
return hexnode return hexnode
else: else:
try: try:
node = scmutil.resolvehexnodeidprefix(repo, hexnode) node = scmutil.resolvehexnodeidprefix(repo, hexnode)
except (error.LookupError, error.WdirUnsupported): except error.WdirUnsupported:
node = wdirid
except error.LookupError:
return hexnode return hexnode
if not node: if not node:
return hexnode return hexnode
return scmutil.shortesthexnodeidprefix(repo, node, minlength) return scmutil.shortesthexnodeidprefix(repo, 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,

tests/test-command-template.t

f7769ec2ab f7769ec2ab
$ hg log -r 0 -T '{shortest(node, "not an int")}\n' $ hg log -r 0 -T '{shortest(node, "not an int")}\n'
hg: parse error: shortest() expects an integer minlength hg: parse error: shortest() expects an integer minlength
[255] [255]
$ hg log -r 'wdir()' -T '{node|shortest}\n' $ hg log -r 'wdir()' -T '{node|shortest}\n'
ffff ffff
$ hg log --template '{shortest("f")}\n' -l1 $ hg log --template '{shortest("a")}\n' -l1
f a
$ hg log --template '{shortest("0123456789012345678901234567890123456789")}\n' -l1 $ hg log --template '{shortest("0123456789012345678901234567890123456789")}\n' -l1
0123456789012345678901234567890123456789 0123456789012345678901234567890123456789
$ hg log --template '{shortest("01234567890123456789012345678901234567890123456789")}\n' -l1 $ hg log --template '{shortest("01234567890123456789012345678901234567890123456789")}\n' -l1
01234567890123456789012345678901234567890123456789 01234567890123456789012345678901234567890123456789
$ hg log --template '{shortest("not a hex string")}\n' -l1 $ hg log --template '{shortest("not a hex string")}\n' -l1
not a hex string not a hex string
$ hg log --template '{shortest("not a hex string, but it'\''s 40 bytes long")}\n' -l1 $ hg log --template '{shortest("not a hex string, but it'\''s 40 bytes long")}\n' -l1
not a hex string, but it's 40 bytes long not a hex string, but it's 40 bytes long
$ hg log --template '{shortest("ffffffffffffffffffffffffffffffffffffffff")}\n' -l1
ffff
$ hg log --template '{shortest("fffffff")}\n' -l1
ffff
$ hg log --template '{shortest("f")}\n' -l1
ffff
$ cd .. $ cd ..
Test shortest(node) with the repo having short hash collision: Test shortest(node) with the repo having short hash collision:
$ hg init hashcollision $ hg init hashcollision
$ cd hashcollision $ cd hashcollision
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]