This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8260

git: hide pygit2 imports from gendoc and other scripts not using demandimport
AbandonedPublic

Authored by durin42 on Mar 7 2020, 4:45 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Summary

Without this, I can't seem to build a working rpm for my fedora machine.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Mar 7 2020, 4:45 PM
pulkit accepted this revision.Mar 9 2020, 4:53 AM
This revision is now accepted and ready to land.Mar 9 2020, 4:53 AM
pulkit requested changes to this revision.Mar 9 2020, 5:45 AM

test-duplicateoptions.py is failing with this patch. I dropped this from my push list, stripping the patch was resulting in complex state for me, so I used prune, kindly use touch locally.

This revision now requires changes to proceed.Mar 9 2020, 5:45 AM
durin42 abandoned this revision.Mar 10 2020, 12:35 PM

Revision Contents
Changeset List

PathPackages
Mhgext/git/__init__.py (24 lines)

Diff 20609

hgext/git/__init__.py

"""grant Mercurial the ability to operate on Git repositories. (EXPERIMENTAL) """grant Mercurial the ability to operate on Git repositories. (EXPERIMENTAL)
This is currently super experimental. It probably will consume your This is currently super experimental. It probably will consume your
firstborn a la Rumpelstiltskin, etc. firstborn a la Rumpelstiltskin, etc.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import pygit2
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
commands, commands,
error, error,
extensions, extensions,
localrepo, localrepo,
pycompat, pycompat,
store, store,
util, util,
) )
# gendoc.py ends up causing all extensions to be imported, so we need
# to hide attempts to load pygit2 from it so that it can finish
# generating documentation.
try:
import pygit2
except ImportError:
pygit2 = None
if pygit2 is not None:
from . import ( from . import (
dirstate, dirstate,
gitlog, gitlog,
gitutil, gitutil,
index, index,
) )
# 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)
def _bookmarks(self): def _bookmarks(self):
return gitbmstore(self.store.git) return gitbmstore(self.store.git)
repo.__class__ = gitlocalrepo repo.__class__ = gitlocalrepo
return repo return repo
def extsetup(ui): def extsetup(ui):
assert pygit2 is not None, 'git extension requires pygit2'
extensions.wrapfunction(localrepo, b'makestore', _makestore) extensions.wrapfunction(localrepo, b'makestore', _makestore)
extensions.wrapfunction(localrepo, b'makefilestorage', _makefilestorage) extensions.wrapfunction(localrepo, b'makefilestorage', _makefilestorage)
# Inject --git flag for `hg init` # Inject --git flag for `hg init`
entry = extensions.wrapcommand(commands.table, b'init', init) entry = extensions.wrapcommand(commands.table, b'init', init)
entry[1].extend( entry[1].extend(
[(b'', b'git', None, b'setup up a git repository instead of hg')] [(b'', b'git', None, b'setup up a git repository instead of hg')]
) )