D8267: hghave: add a check for pygit2

Submitter	phabricator
Date	March 9, 2020, 9:18 p.m.
Message ID	<differential-rev-PHID-DREV-kfpn4lrwpjftcxcekjky-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/45642/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Mon, 9 Mar 2020 21:18:31 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "martinvonz (Martin von Zweigbergk)" <phabricator@mercurial-scm.org> Subject: D8267: hghave: add a check for pygit2 Message-ID: <differential-rev-PHID-DREV-kfpn4lrwpjftcxcekjky-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-kfpn4lrwpjftcxcekjky Thread-Index: ZGYyYTQ3ZWM2Y2YzZmEzMDBlMGRlMGNhNTRl MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "martinvonz \(Martin von Zweigbergk\)" <phabricator+D8267+public+7ecfb0c98e078cba@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - March 9, 2020, 9:18 p.m.

martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This will make it easy to use availability of pygit2 as in conditions
  such as `#if pygit2` and `(pygit2 !)`. It also makes it a little
  clearer why the test case skipped (when that happens).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8267

AFFECTED FILES
  tests/hghave.py
  tests/test-git-interop.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-git-interop.t b/tests/test-git-interop.t
--- a/tests/test-git-interop.t
+++ b/tests/test-git-interop.t
@@ -1,5 +1,4 @@ 
-This test requires pygit2:
-  > $PYTHON -c 'import pygit2' || exit 80
+#require pygit2
 
 Setup:
   > GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -381,6 +381,17 @@ 
     return (int(m.group(1)), int(m.group(2)))
 
 
+@check("pygit2", "pygit2 Python library")
+def has_git():
+    try:
+        import pygit2
+
+        pygit2.Oid  # silence unused import
+        return True
+    except ImportError:
+        return False
+
+
 # https://github.com/git-lfs/lfs-test-server
 @check("lfs-test-server", "git-lfs test server")
 def has_lfsserver():

Patchwork D8267: hghave: add a check for pygit2

Comments

Patch