Mercurial > public > mercurial-scm > hg-stable
diff hgext/git/manifest.py @ 44496:ec54b3d2af0b
git: don't fail import when pygit2 is not install
`test-duplicateoptions.py` was failing on py2 for be because I didn't
have pygit2 installed. It failed because we depend on pygit2 at import
time. This patch makes it so we successfully load the git extension
even if pygit2 doesn't exist -- we just won't be able to use it in
that case.
Differential Revision: https://phab.mercurial-scm.org/D8268
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 09 Mar 2020 11:18:33 -0700 |
| parents | 7518ea76eff4 |
| children | e9e7156a8d6c |
line wrap: on
line diff
--- a/hgext/git/manifest.py Mon Mar 09 12:53:21 2020 -0700 +++ b/hgext/git/manifest.py Mon Mar 09 11:18:33 2020 -0700 @@ -1,7 +1,5 @@ from __future__ import absolute_import -import pygit2 - from mercurial import ( match as matchmod, pathutil, @@ -15,6 +13,9 @@ from . import gitutil +pygit2 = gitutil.get_pygit2() + + @interfaceutil.implementer(repository.imanifestdict) class gittreemanifest(object): """Expose git trees (and optionally a builder's overlay) as a manifestdict.