This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9436

git: show the version of `pygit2` with verbose version output
ClosedPublic

Authored by mharbison72 on Nov 27 2020, 11:48 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc7c1efdfd4de: git: show the version of `pygit2` with verbose version output
Summary

This seems like useful info to have when debugging. I followed the precedent of
hg-git, which prints something like:

hggit        external  0.9.0a1 (dulwich 0.19.15)

We don't have a version number assigned (because it's internal), so it's just
the parenthetical.

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/__init__.py (3 lines)
Mhgext/git/gitutil.py (13 lines)
Mtests/test-git-interop.t (4 lines)

Diff 23772

hgext/git/__init__.py

configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
# git.log-index-cache-miss: internal knob for testing # git.log-index-cache-miss: internal knob for testing
configitem( configitem(
b"git", b"git",
b"log-index-cache-miss", b"log-index-cache-miss",
default=False, default=False,
) )
getversion = gitutil.pygit2_version
# TODO: extract an interface for this in core # TODO: extract an interface for this in core
class gitstore(object): # store.basicstore): class gitstore(object): # store.basicstore):
def __init__(self, path, vfstype): def __init__(self, path, vfstype):
self.vfs = vfstype(path) self.vfs = vfstype(path)
self.path = self.vfs.base self.path = self.vfs.base
self.createmode = store._calcmode(self.vfs) self.createmode = store._calcmode(self.vfs)
# above lines should go away in favor of: # above lines should go away in favor of:
# super(gitstore, self).__init__(path, vfstype) # super(gitstore, self).__init__(path, vfstype)

hgext/git/gitutil.py

import pygit2 as pygit2_module import pygit2 as pygit2_module
pygit2_module.InvalidSpecError pygit2_module.InvalidSpecError
except (ImportError, AttributeError): except (ImportError, AttributeError):
pass pass
return pygit2_module return pygit2_module
def pygit2_version():
mod = get_pygit2()
v = "N/A"
if mod:
try:
v = mod.__version__
except AttributeError:
pass
return b"(pygit2 %s)" % v.encode("utf-8")
def togitnode(n): def togitnode(n):
"""Wrapper to convert a Mercurial binary node to a unicode hexlified node. """Wrapper to convert a Mercurial binary node to a unicode hexlified node.
pygit2 and sqlite both need nodes as strings, not bytes. pygit2 and sqlite both need nodes as strings, not bytes.
""" """
assert len(n) == 20 assert len(n) == 20
return pycompat.sysstr(hex(n)) return pycompat.sysstr(hex(n))

tests/test-git-interop.t

> gitcommit() { > gitcommit() {
> GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"; > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000";
> GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
> git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" > git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
> count=`expr $count + 1` > count=`expr $count + 1`
> } > }
$ hg version -v --config extensions.git= | grep '^[E ]'
Enabled extensions:
git internal (pygit2 *) (glob)
Test auto-loading extension works: Test auto-loading extension works:
$ mkdir nogit $ mkdir nogit
$ cd nogit $ cd nogit
$ mkdir .hg $ mkdir .hg
$ echo git >> .hg/requires $ echo git >> .hg/requires
$ hg status $ hg status
abort: repository specified git format in .hg/requires but has no .git directory abort: repository specified git format in .hg/requires but has no .git directory
[255] [255]