/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

  • Committer: Jelmer Vernooij
  • Date: 2010-06-28 22:30:34 UTC
  • mto: (0.200.953 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100628223034-vylrgdyakmqoupl6
use transport repo objects even for local access.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
26
26
 
27
27
import bzrlib
28
28
import bzrlib.api
 
29
 
 
30
from info import (
 
31
    bzr_compatible_versions,
 
32
    bzr_plugin_version as version_info,
 
33
    dulwich_minimum_version,
 
34
    )
 
35
 
 
36
if version_info[3] == 'final':
 
37
    version_string = '%d.%d.%d' % version_info[:3]
 
38
else:
 
39
    version_string = '%d.%d.%d%s%d' % version_info
 
40
__version__ = version_string
 
41
 
 
42
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
 
43
 
 
44
 
29
45
from bzrlib import (
30
46
    bzrdir,
31
47
    errors as bzr_errors,
44
60
from bzrlib.commands import (
45
61
    plugin_cmds,
46
62
    )
47
 
from bzrlib.trace import (
48
 
    warning,
49
 
    )
50
63
from bzrlib.version_info_formats.format_rio import (
51
64
    RioVersionInfoBuilder,
52
65
    )
53
 
 
54
 
 
55
 
# versions ending in 'exp' mean experimental mappings
56
 
# versions ending in 'dev' mean development version
57
 
# versions ending in 'final' mean release (well tested, etc)
58
 
version_info = (0, 3, 1, 'final', 0)
59
 
 
60
 
if version_info[3] == 'final':
61
 
    version_string = '%d.%d.%d' % version_info[:3]
62
 
else:
63
 
    version_string = '%d.%d.%d%s%d' % version_info
64
 
__version__ = version_string
65
 
 
66
 
MINIMUM_DULWICH_VERSION = (0, 3, 1)
67
 
COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0)]
 
66
from bzrlib.send import (
 
67
    format_registry as send_format_registry,
 
68
    )
 
69
 
68
70
 
69
71
if getattr(sys, "frozen", None):
70
72
    # allow import additional libs from ./_lib for bzr.exe only
71
 
    sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
 
73
    sys.path.append(os.path.normpath(
 
74
        os.path.join(os.path.dirname(__file__), '_lib')))
72
75
 
73
76
_versions_checked = False
74
77
def lazy_check_versions():
79
82
    try:
80
83
        from dulwich import __version__ as dulwich_version
81
84
    except ImportError:
82
 
        raise ImportError("bzr-git: Please install dulwich, https://launchpad.net/dulwich")
 
85
        raise bzr_errors.DependencyNotPresent("dulwich",
 
86
            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
83
87
    else:
84
 
        if dulwich_version < MINIMUM_DULWICH_VERSION:
85
 
            raise ImportError("bzr-git: Dulwich is too old; at least %d.%d.%d is required" % MINIMUM_DULWICH_VERSION)
86
 
 
87
 
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
88
 
 
89
 
bzrdir.format_registry.register_lazy('git', 
 
88
        if dulwich_version < dulwich_minimum_version:
 
89
            raise bzr_errors.DependencyNotPresent("dulwich",
 
90
                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
 
91
                    dulwich_minimum_version)
 
92
 
 
93
bzrdir.format_registry.register_lazy('git',
90
94
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
91
95
    help='GIT repository.', native=False, experimental=True,
92
96
    )
93
97
 
94
98
from bzrlib.revisionspec import revspec_registry
95
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
 
99
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
96
100
    "RevisionSpec_git")
97
101
 
 
102
try:
 
103
    from bzrlib.revisionspec import dwim_revspecs
 
104
except ImportError:
 
105
    pass
 
106
else:
 
107
    from bzrlib.plugins.git.revspec import RevisionSpec_git
 
108
    dwim_revspecs.append(RevisionSpec_git)
 
109
 
98
110
 
99
111
class GitBzrDirFormat(bzrdir.BzrDirFormat):
 
112
 
100
113
    _lock_class = TransportLock
101
114
 
 
115
    colocated_branches = True
 
116
 
102
117
    def is_supported(self):
103
118
        return True
104
119
 
 
120
    def network_name(self):
 
121
        return "git"
 
122
 
105
123
 
106
124
class LocalGitBzrDirFormat(GitBzrDirFormat):
107
125
    """The .git directory control format."""
114
132
        """Open this directory.
115
133
 
116
134
        """
117
 
        import dulwich as git
118
 
        # we dont grok readonly - git isn't integrated with transport.
119
 
        url = transport.base
120
 
        if url.startswith('readonly+'):
121
 
            url = url[len('readonly+'):]
122
 
 
123
 
        try:
124
 
            gitrepo = git.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
125
 
        except bzr_errors.NotLocalUrl:
126
 
            raise bzr_errors.NotBranchError(path=transport.base)
 
135
        lazy_check_versions()
 
136
        from bzrlib.plugins.git.transportgit import TransportRepo
 
137
        gitrepo = TransportRepo(transport)
127
138
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
128
139
        lockfiles = GitLockableFiles(transport, GitLock())
129
140
        return LocalGitDir(transport, lockfiles, gitrepo, self)
130
141
 
131
142
    @classmethod
132
143
    def probe_transport(klass, transport):
133
 
        """Our format is present if the transport ends in '.not/'."""
134
 
        from bzrlib.transport.local import LocalTransport
135
 
 
136
 
        if not isinstance(transport, LocalTransport):
137
 
            raise bzr_errors.NotBranchError(path=transport.base)
138
 
 
139
 
        # This should quickly filter out most things that are not 
140
 
        # git repositories, saving us the trouble from loading dulwich.
141
 
        if not transport.has(".git") and not transport.has("objects"):
142
 
            raise bzr_errors.NotBranchError(path=transport.base)
143
 
 
144
 
        import dulwich as git
 
144
        try:
 
145
            if not transport.has_any(['info/refs', '.git/branches',
 
146
                                      'branches']):
 
147
                raise bzr_errors.NotBranchError(path=transport.base)
 
148
        except bzr_errors.NoSuchFile:
 
149
            raise bzr_errors.NotBranchError(path=transport.base)
 
150
        from bzrlib import urlutils
 
151
        if urlutils.split(transport.base)[1] == ".git":
 
152
            raise bzr_errors.NotBranchError(path=transport.base)
 
153
        lazy_check_versions()
 
154
        import dulwich
145
155
        format = klass()
146
156
        try:
147
157
            format.open(transport)
148
158
            return format
149
 
        except git.errors.NotGitRepository, e:
 
159
        except dulwich.errors.NotGitRepository, e:
150
160
            raise bzr_errors.NotBranchError(path=transport.base)
151
161
        raise bzr_errors.NotBranchError(path=transport.base)
152
162
 
160
170
        from bzrlib.transport.local import LocalTransport
161
171
 
162
172
        if not isinstance(transport, LocalTransport):
163
 
            raise NotImplementedError(self.initialize, 
 
173
            raise NotImplementedError(self.initialize,
164
174
                "Can't create Git Repositories/branches on "
165
175
                "non-local transports")
166
 
 
 
176
        lazy_check_versions()
167
177
        from dulwich.repo import Repo
168
 
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc)) 
 
178
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
169
179
        return self.open(transport)
170
180
 
171
181
    def is_supported(self):
187
197
        url = transport.base
188
198
        if url.startswith('readonly+'):
189
199
            url = url[len('readonly+'):]
190
 
        if (not url.startswith("git://") and 
191
 
            not url.startswith("git+")):
 
200
        if (not url.startswith("git://") and not url.startswith("git+")):
192
201
            raise bzr_errors.NotBranchError(transport.base)
193
202
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
194
203
        if not isinstance(transport, GitSmartTransport):
203
212
        url = transport.base
204
213
        if url.startswith('readonly+'):
205
214
            url = url[len('readonly+'):]
206
 
        if (not url.startswith("git://") and 
207
 
            not url.startswith("git+")):
 
215
        if (not url.startswith("git://") and not url.startswith("git+")):
208
216
            raise bzr_errors.NotBranchError(transport.base)
209
217
        # little ugly, but works
210
218
        format = klass()
226
234
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
227
235
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
228
236
 
229
 
register_transport_proto('git://', 
 
237
register_transport_proto('git://',
230
238
        help="Access using the Git smart server protocol.")
231
 
register_transport_proto('git+ssh://', 
 
239
register_transport_proto('git+ssh://',
232
240
        help="Access using the Git smart server protocol over SSH.")
233
241
 
234
242
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
236
244
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
237
245
                        'SSHGitSmartTransport')
238
246
 
239
 
foreign_vcs_registry.register_lazy("git", 
 
247
foreign_vcs_registry.register_lazy("git",
240
248
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
241
249
 
242
 
plugin_cmds.register_lazy("cmd_git_serve", [], "bzrlib.plugins.git.commands")
243
250
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
244
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
 
251
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
245
252
    "bzrlib.plugins.git.commands")
 
253
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
 
254
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
246
255
 
247
256
def update_stanza(rev, stanza):
248
257
    mapping = getattr(rev, "mapping", None)
254
263
if rio_hooks is not None:
255
264
    rio_hooks.install_named_hook('revision', update_stanza, None)
256
265
 
257
 
def get_rich_root_format(stacked=False):
258
 
    if stacked:
259
 
        return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
260
 
    else:
261
 
        return bzrdir.format_registry.make_bzrdir("default-rich-root")
 
266
 
 
267
from bzrlib.transport import transport_server_registry
 
268
transport_server_registry.register_lazy('git',
 
269
    'bzrlib.plugins.git.server',
 
270
    'serve_git',
 
271
    'Git Smart server protocol over TCP. (default port: 9418)')
 
272
 
 
273
 
 
274
from bzrlib.repository import (
 
275
    network_format_registry as repository_network_format_registry,
 
276
    )
 
277
repository_network_format_registry.register_lazy('git',
 
278
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
 
279
 
 
280
from bzrlib.bzrdir import (
 
281
    network_format_registry as bzrdir_network_format_registry,
 
282
    )
 
283
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
 
284
 
 
285
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
286
                                   'send_git', 'Git am-style diff format')
 
287
 
 
288
try:
 
289
    from bzrlib.diff import format_registry as diff_format_registry
 
290
except ImportError:
 
291
    pass
 
292
else:
 
293
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
 
294
        'GitDiffTree', 'Git am-style diff format')
262
295
 
263
296
def test_suite():
264
297
    from bzrlib.plugins.git import tests