/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

Drop support for Bazaar < 2.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
46
46
    errors as bzr_errors,
47
47
    osutils,
48
48
    )
49
 
try:
50
 
    from bzrlib.controldir import (
51
 
        ControlDirFormat,
52
 
        ControlDir,
53
 
        Prober,
54
 
        format_registry,
55
 
        )
56
 
except ImportError:
57
 
    # bzr < 2.3
58
 
    from bzrlib.bzrdir import (
59
 
        BzrDirFormat,
60
 
        BzrDir,
61
 
        format_registry,
62
 
        )
63
 
    ControlDir = BzrDir
64
 
    ControlDirFormat = BzrDirFormat
65
 
    Prober = object
66
 
    has_controldir = False
67
 
else:
68
 
    has_controldir = True
 
49
 
 
50
from bzrlib.controldir import (
 
51
    ControlDirFormat,
 
52
    ControlDir,
 
53
    Prober,
 
54
    format_registry,
 
55
    )
69
56
 
70
57
from bzrlib.foreign import (
71
58
    foreign_vcs_registry,
116
103
    _versions_checked = True
117
104
 
118
105
format_registry.register_lazy('git',
119
 
    "bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
 
106
    "bzrlib.plugins.git", "LocalGitControlDirFormat",
120
107
    help='GIT repository.', native=False, experimental=False,
121
108
    )
122
109
 
123
110
format_registry.register_lazy('git-bare',
124
 
    "bzrlib.plugins.git.dir", "BareLocalGitControlDirFormat",
 
111
    "bzrlib.plugins.git", "BareLocalGitControlDirFormat",
125
112
    help='Bare GIT repository (no working tree).', native=False,
126
113
    experimental=False,
127
114
    )
130
117
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
131
118
    "RevisionSpec_git")
132
119
 
133
 
try:
134
 
    from bzrlib.revisionspec import dwim_revspecs, RevisionSpec_dwim
135
 
except ImportError: # bzr < 2.1
136
 
    pass
137
 
else:
138
 
    if getattr(RevisionSpec_dwim, "append_possible_lazy_revspec", None):
139
 
        RevisionSpec_dwim.append_possible_lazy_revspec(
140
 
            "bzrlib.plugins.git.revspec", "RevisionSpec_git")
141
 
    else: # bzr < 2.4
142
 
        from bzrlib.plugins.git.revspec import RevisionSpec_git
143
 
        dwim_revspecs.append(RevisionSpec_git)
 
120
from bzrlib.revisionspec import dwim_revspecs, RevisionSpec_dwim
 
121
if getattr(RevisionSpec_dwim, "append_possible_lazy_revspec", None):
 
122
    RevisionSpec_dwim.append_possible_lazy_revspec(
 
123
        "bzrlib.plugins.git.revspec", "RevisionSpec_git")
 
124
else: # bzr < 2.4
 
125
    from bzrlib.plugins.git.revspec import RevisionSpec_git
 
126
    dwim_revspecs.append(RevisionSpec_git)
144
127
 
145
128
 
146
129
class GitControlDirFormat(ControlDirFormat):
316
299
        raise bzr_errors.UninitializableFormat(self)
317
300
 
318
301
 
319
 
if has_controldir:
320
 
    ControlDirFormat.register_format(LocalGitControlDirFormat())
321
 
    ControlDirFormat.register_format(BareLocalGitControlDirFormat())
322
 
    ControlDirFormat.register_format(RemoteGitControlDirFormat())
323
 
    ControlDirFormat.register_prober(LocalGitProber)
324
 
    ControlDirFormat.register_prober(RemoteGitProber)
325
 
else:
326
 
    ControlDirFormat.register_control_format(LocalGitControlDirFormat)
327
 
    ControlDirFormat.register_control_format(BareLocalGitControlDirFormat)
328
 
    ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
 
302
ControlDirFormat.register_format(LocalGitControlDirFormat())
 
303
ControlDirFormat.register_format(BareLocalGitControlDirFormat())
 
304
ControlDirFormat.register_format(RemoteGitControlDirFormat())
 
305
ControlDirFormat.register_prober(LocalGitProber)
 
306
ControlDirFormat.register_prober(RemoteGitProber)
329
307
 
330
308
register_transport_proto('git://',
331
309
        help="Access using the Git smart server protocol.")
382
360
try:
383
361
    register_extra_lazy_repository_format = getattr(repository_format_registry,
384
362
        "register_extra_lazy")
385
 
except AttributeError:
 
363
except AttributeError: # bzr < 2.4
386
364
    pass
387
365
else:
388
366
    register_extra_lazy_repository_format('bzrlib.plugins.git.repository',
392
370
    from bzrlib.branch import (
393
371
        format_registry as branch_format_registry,
394
372
        )
395
 
except ImportError:
 
373
except ImportError: # bzr < 2.4
396
374
    pass
397
375
else:
398
376
    branch_format_registry.register_extra_lazy(
404
382
    from bzrlib.workingtree import (
405
383
        format_registry as workingtree_format_registry,
406
384
        )
407
 
except ImportError:
 
385
except ImportError: # bzr < 2.4
408
386
    pass
409
387
else:
410
388
    workingtree_format_registry.register_extra_lazy(
412
390
        'GitWorkingTreeFormat',
413
391
        )
414
392
 
415
 
try:
416
 
    from bzrlib.controldir import (
417
 
        network_format_registry as controldir_network_format_registry,
418
 
        )
419
 
except ImportError:
420
 
    from bzrlib.bzrdir import (
421
 
        network_format_registry as controldir_network_format_registry,
422
 
        )
 
393
from bzrlib.controldir import (
 
394
    network_format_registry as controldir_network_format_registry,
 
395
    )
423
396
controldir_network_format_registry.register('git', GitControlDirFormat)
424
397
 
425
398
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
429
402
                             'bzrlib.plugins.git.help',
430
403
                             'help_git', 'Using Bazaar with Git')
431
404
 
432
 
try:
433
 
    from bzrlib.diff import format_registry as diff_format_registry
434
 
except ImportError:
435
 
    pass
436
 
else:
437
 
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
438
 
        'GitDiffTree', 'Git am-style diff format')
 
405
from bzrlib.diff import format_registry as diff_format_registry
 
406
diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
407
    'GitDiffTree', 'Git am-style diff format')
439
408
 
440
409
def test_suite():
441
410
    from bzrlib.plugins.git import tests