This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10521

git: fix partial node matching
ClosedPublic

Authored by mharbison72 on Apr 27 2021, 7:52 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG846920d89476: git: fix partial node matching
Summary

Looks like everything is meant to be a str here.

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

mharbison72 created this revision.Apr 27 2021, 7:52 PM
pulkit accepted this revision.Apr 28 2021, 6:25 AM
This revision is now accepted and ready to land.Apr 28 2021, 6:25 AM
mharbison72 added a commit: rHG846920d89476: git: fix partial node matching.May 3 2021, 10:07 AM
Closed by commit rHG846920d89476: git: fix partial node matching (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (3 lines)
Mtests/test-git-interop.t (14 lines)

Diff 27429

hgext/git/gitlog.py

return next(t) return next(t)
def _partialmatch(self, id): def _partialmatch(self, id):
if wdirhex.startswith(id): if wdirhex.startswith(id):
raise error.WdirUnsupported raise error.WdirUnsupported
candidates = [ candidates = [
bin(x[0]) bin(x[0])
for x in self._db.execute( for x in self._db.execute(
'SELECT node FROM changelog WHERE node LIKE ?', (id + b'%',) 'SELECT node FROM changelog WHERE node LIKE ?',
(pycompat.sysstr(id + b'%'),),
) )
] ]
if nullhex.startswith(id): if nullhex.startswith(id):
candidates.append(nullid) candidates.append(nullid)
if len(candidates) > 1: if len(candidates) > 1:
raise error.AmbiguousPrefixLookupError( raise error.AmbiguousPrefixLookupError(
id, b'00changelog.i', _(b'ambiguous identifier') id, b'00changelog.i', _(b'ambiguous identifier')
) )

tests/test-git-interop.t

6626247b7dc8f231b183b8a4761c89139baca2ad 6626247b7dc8f231b183b8a4761c89139baca2ad
a1983dd7fb19cbd83ad5a1c2fc8bf3d775dea12f a1983dd7fb19cbd83ad5a1c2fc8bf3d775dea12f
ae1ab744f95bfd5b07cf573baef98a778058537b ae1ab744f95bfd5b07cf573baef98a778058537b
c5864c9d16fb3431fe2c175ff84dc6accdbb2c18 c5864c9d16fb3431fe2c175ff84dc6accdbb2c18
d8ee22687733a1991813560b15128cd9734f4b48 d8ee22687733a1991813560b15128cd9734f4b48
$ hg log -r ae1ab744f95bfd5b07cf573baef98a778058537b --template "{shortest(node,1)}\n" $ hg log -r ae1ab744f95bfd5b07cf573baef98a778058537b --template "{shortest(node,1)}\n"
ae ae
This covers gitlog._partialmatch()
$ hg log -r a
abort: ambiguous revision identifier: a
[10]
$ hg log -r a1
changeset: 2:a1983dd7fb19
user: test <test>
date: Fri Mar 06 14:26:27 2020 -0500
summary: more alpha
$ hg log -r dead
abort: unknown revision 'dead'
[255]
This coveres changelog.findmissing() This coveres changelog.findmissing()
$ hg merge --preview 3d9be8deba43 $ hg merge --preview 3d9be8deba43
This covers manifest.diff() This covers manifest.diff()
$ hg diff -c 3d9be8deba43 $ hg diff -c 3d9be8deba43
diff -r c5864c9d16fb -r 3d9be8deba43 beta diff -r c5864c9d16fb -r 3d9be8deba43 beta
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/beta Mon Jan 01 00:00:11 2007 +0000 +++ b/beta Mon Jan 01 00:00:11 2007 +0000