This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8256

git: make {shortest()} return shortest *unique* prefix
ClosedPublic

Authored by martinvonz on Mar 6 2020, 5:17 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6d953b3fc2bd: git: make {shortest()} return shortest *unique* prefix
rHGbd539f0a3771: git: make {shortest()} return shortest *unique* prefix
Summary

It used to return the prefix of the specified length as long as the
full node was unique (i.e. always).

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.

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (2 lines)
Mtests/test-git-interop.t (16 lines)

Diff 20616

hgext/git/gitlog.py

def shortest(self, node, minlength=1): def shortest(self, node, minlength=1):
nodehex = nodemod.hex(node) nodehex = nodemod.hex(node)
for attempt in pycompat.xrange(minlength, len(nodehex) + 1): for attempt in pycompat.xrange(minlength, len(nodehex) + 1):
candidate = nodehex[:attempt] candidate = nodehex[:attempt]
matches = int( matches = int(
self._db.execute( self._db.execute(
'SELECT COUNT(*) FROM changelog WHERE node LIKE ?', 'SELECT COUNT(*) FROM changelog WHERE node LIKE ?',
(pycompat.sysstr(nodehex + b'%'),), (pycompat.sysstr(candidate + b'%'),),
).fetchone()[0] ).fetchone()[0]
) )
if matches == 1: if matches == 1:
return candidate return candidate
return nodehex return nodehex
def headrevs(self, revs=None): def headrevs(self, revs=None):
realheads = [ realheads = [

tests/test-git-interop.t

: summary: more beta : summary: more beta
: :
o changeset: 1:3d9be8deba43 o changeset: 1:3d9be8deba43
| user: test <test@example.org> | user: test <test@example.org>
~ date: Mon Jan 01 00:00:11 2007 +0000 ~ date: Mon Jan 01 00:00:11 2007 +0000
summary: Add beta summary: Add beta
node|shortest works correctly
$ hg log -r tip --template "{node|shortest}\n"
6626
hg annotate hg annotate
$ hg annotate alpha $ hg annotate alpha
0: alpha 0: alpha
2: a 2: a
4: a 4: a
$ hg annotate beta $ hg annotate beta
1: beta 1: beta
hg and git status both clean hg and git status both clean
$ git status $ git status
On branch master On branch master
nothing to commit, working tree clean nothing to commit, working tree clean
$ hg status $ hg status
node|shortest works correctly
$ hg log -T '{node}\n' | sort
3d9be8deba43482be2c81a4cb4be1f10d85fa8bc
6626247b7dc8f231b183b8a4761c89139baca2ad
a1983dd7fb19cbd83ad5a1c2fc8bf3d775dea12f
ae1ab744f95bfd5b07cf573baef98a778058537b
c5864c9d16fb3431fe2c175ff84dc6accdbb2c18
d8ee22687733a1991813560b15128cd9734f4b48
$ hg log -r ae1ab744f95bfd5b07cf573baef98a778058537b --template "{shortest(node,1)}\n"
ae