/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

Cope with newer *system* dulwich

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
20
20
 
21
21
"""A GIT branch and repository format implementation for bzr."""
22
22
 
23
 
try:
24
 
    import dulwich as git
25
 
except ImportError:
26
 
    import os, sys
27
 
    sys.path.insert(0, os.path.join(os.path.dirname(__file__), "dulwich"))
28
 
    import dulwich as git
29
23
from bzrlib import bzrdir
30
24
from bzrlib.foreign import ForeignVcs, VcsMappingRegistry, foreign_vcs_registry
31
 
from bzrlib.plugins.git.dir import LocalGitBzrDirFormat, RemoteGitBzrDirFormat
32
25
from bzrlib.transport import register_lazy_transport
33
26
from bzrlib.commands import Command, register_command
34
27
from bzrlib.option import Option
 
28
from bzrlib.trace import warning
 
29
 
 
30
MINIMUM_DULWICH_VERSION = (0, 1, 0)
 
31
 
 
32
try:
 
33
    from dulwich import __version__ as dulwich_version
 
34
except ImportError:
 
35
    warning("Please install dulwich, https://launchpad.net/dulwich")
 
36
    raise
 
37
else:
 
38
    if dulwich_version < MINIMUM_DULWICH_VERSION:
 
39
        warning("Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
 
40
        raise ImportError
 
41
 
 
42
from bzrlib.plugins.git.dir import LocalGitBzrDirFormat, RemoteGitBzrDirFormat
35
43
 
36
44
bzrdir.format_registry.register(
37
45
    'git', LocalGitBzrDirFormat,