/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

Implement InterTree.iter_changes() as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
43
43
 
44
44
 
45
45
from bzrlib import (
 
46
    bzrdir,
46
47
    errors as bzr_errors,
47
48
    osutils,
48
49
    )
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
69
 
 
70
50
from bzrlib.foreign import (
71
51
    foreign_vcs_registry,
72
52
    )
73
 
from bzrlib.help_topics import (
74
 
    topic_registry,
75
 
    )
76
53
from bzrlib.lockable_files import (
77
54
    TransportLock,
78
55
    )
93
70
 
94
71
if getattr(sys, "frozen", None):
95
72
    # allow import additional libs from ./_lib for bzr.exe only
96
 
    sys.path.append(os.path.normpath(
97
 
        os.path.join(os.path.dirname(__file__), '_lib')))
98
 
 
99
 
 
100
 
def import_dulwich():
101
 
    try:
102
 
        from dulwich import __version__ as dulwich_version
103
 
    except ImportError:
104
 
        raise bzr_errors.DependencyNotPresent("dulwich",
105
 
            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
106
 
    else:
107
 
        if dulwich_version < dulwich_minimum_version:
108
 
            raise bzr_errors.DependencyNotPresent("dulwich",
109
 
                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
110
 
                    dulwich_minimum_version)
111
 
 
 
73
    sys.path.append(os.path.normpath(os.path.join(os.path.dirname(__file__), '_lib')))
112
74
 
113
75
_versions_checked = False
114
76
def lazy_check_versions():
115
77
    global _versions_checked
116
78
    if _versions_checked:
117
79
        return
118
 
    import_dulwich()
119
80
    _versions_checked = True
120
 
 
121
 
format_registry.register_lazy('git',
122
 
    "bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
123
 
    help='GIT repository.', native=False, experimental=False,
124
 
    )
125
 
 
126
 
format_registry.register_lazy('git-bare',
127
 
    "bzrlib.plugins.git.dir", "BareLocalGitControlDirFormat",
128
 
    help='Bare GIT repository (no working tree).', native=False,
129
 
    experimental=False,
 
81
    try:
 
82
        from dulwich import __version__ as dulwich_version
 
83
    except ImportError:
 
84
        raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
 
85
    else:
 
86
        if dulwich_version < dulwich_minimum_version:
 
87
            raise bzr_errors.DependencyNotPresent("dulwich", "bzr-git: Dulwich is too old; at least %d.%d.%d is required" % dulwich_minimum_version)
 
88
 
 
89
bzrdir.format_registry.register_lazy('git', 
 
90
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
 
91
    help='GIT repository.', native=False, experimental=True,
130
92
    )
131
93
 
132
94
from bzrlib.revisionspec import revspec_registry
133
 
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
 
95
revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec", 
134
96
    "RevisionSpec_git")
135
97
 
136
 
try:
137
 
    from bzrlib.revisionspec import dwim_revspecs
138
 
except ImportError:
139
 
    pass
140
 
else:
141
 
    from bzrlib.plugins.git.revspec import RevisionSpec_git
142
 
    dwim_revspecs.append(RevisionSpec_git)
143
 
 
144
 
 
145
 
class GitControlDirFormat(ControlDirFormat):
146
 
 
 
98
 
 
99
class GitBzrDirFormat(bzrdir.BzrDirFormat):
147
100
    _lock_class = TransportLock
148
101
 
149
 
    colocated_branches = True
150
 
 
151
 
    def __eq__(self, other):
152
 
        return type(self) == type(other)
153
 
 
154
102
    def is_supported(self):
155
103
        return True
156
104
 
158
106
        return "git"
159
107
 
160
108
 
161
 
class LocalGitProber(Prober):
162
 
 
163
 
    def probe_transport(self, transport):
164
 
        try:
165
 
            if not transport.has_any(['info/refs', '.git/branches',
166
 
                                      'branches']):
167
 
                raise bzr_errors.NotBranchError(path=transport.base)
168
 
        except bzr_errors.NoSuchFile:
169
 
            raise bzr_errors.NotBranchError(path=transport.base)
170
 
        from bzrlib import urlutils
171
 
        if urlutils.split(transport.base)[1] == ".git":
172
 
            raise bzr_errors.NotBranchError(path=transport.base)
173
 
        lazy_check_versions()
174
 
        import dulwich
175
 
        from bzrlib.plugins.git.transportgit import TransportRepo
176
 
        try:
177
 
            gitrepo = TransportRepo(transport)
178
 
        except dulwich.errors.NotGitRepository, e:
179
 
            raise bzr_errors.NotBranchError(path=transport.base)
180
 
        else:
181
 
            if gitrepo.bare:
182
 
                return BareLocalGitControlDirFormat()
183
 
            else:
184
 
                return LocalGitControlDirFormat()
185
 
 
186
 
 
187
 
class LocalGitControlDirFormat(GitControlDirFormat):
 
109
class LocalGitBzrDirFormat(GitBzrDirFormat):
188
110
    """The .git directory control format."""
189
111
 
190
 
    bare = False
191
 
 
192
112
    @classmethod
193
113
    def _known_formats(self):
194
 
        return set([LocalGitControlDirFormat()])
 
114
        return set([LocalGitBzrDirFormat()])
195
115
 
196
116
    def open(self, transport, _found=None):
197
117
        """Open this directory.
198
118
 
199
119
        """
200
120
        lazy_check_versions()
201
 
        from bzrlib.plugins.git.transportgit import TransportRepo
202
 
        gitrepo = TransportRepo(transport)
 
121
        import dulwich
 
122
        # we dont grok readonly - git isn't integrated with transport.
 
123
        url = transport.base
 
124
        if url.startswith('readonly+'):
 
125
            url = url[len('readonly+'):]
 
126
 
 
127
        try:
 
128
            gitrepo = dulwich.repo.Repo(transport.local_abspath(".").encode(osutils._fs_enc))
 
129
        except bzr_errors.NotLocalUrl:
 
130
            raise bzr_errors.NotBranchError(path=transport.base)
203
131
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
132
        lockfiles = GitLockableFiles(transport, GitLock())
205
133
        return LocalGitDir(transport, lockfiles, gitrepo, self)
206
134
 
207
135
    @classmethod
208
136
    def probe_transport(klass, transport):
209
 
        prober = LocalGitProber()
210
 
        return prober.probe_transport(transport)
 
137
        """Our format is present if the transport ends in '.not/'."""
 
138
        from bzrlib.transport.local import LocalTransport
 
139
 
 
140
        if not isinstance(transport, LocalTransport):
 
141
            raise bzr_errors.NotBranchError(path=transport.base)
 
142
 
 
143
        # This should quickly filter out most things that are not 
 
144
        # git repositories, saving us the trouble from loading dulwich.
 
145
        if not transport.has(".git") and not transport.has("objects"):
 
146
            raise bzr_errors.NotBranchError(path=transport.base)
 
147
 
 
148
        lazy_check_versions()
 
149
        import dulwich
 
150
        format = klass()
 
151
        try:
 
152
            format.open(transport)
 
153
            return format
 
154
        except dulwich.errors.NotGitRepository, e:
 
155
            raise bzr_errors.NotBranchError(path=transport.base)
 
156
        raise bzr_errors.NotBranchError(path=transport.base)
211
157
 
212
158
    def get_format_description(self):
213
159
        return "Local Git Repository"
214
160
 
 
161
    def get_format_string(self):
 
162
        return "Local Git Repository"
 
163
 
215
164
    def initialize_on_transport(self, transport):
216
165
        from bzrlib.transport.local import LocalTransport
217
166
 
218
167
        if not isinstance(transport, LocalTransport):
219
 
            raise NotImplementedError(self.initialize,
 
168
            raise NotImplementedError(self.initialize, 
220
169
                "Can't create Git Repositories/branches on "
221
170
                "non-local transports")
 
171
 
222
172
        lazy_check_versions()
223
173
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
 
174
        Repo.create(transport.local_abspath(".").encode(osutils._fs_enc)) 
226
175
        return self.open(transport)
227
176
 
228
177
    def is_supported(self):
229
178
        return True
230
179
 
231
180
 
232
 
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
233
 
 
234
 
    bare = True
235
 
    supports_workingtrees = False
236
 
 
237
 
    @classmethod
238
 
    def _known_formats(self):
239
 
        return set([RemoteGitControlDirFormat()])
240
 
 
241
 
    def get_format_description(self):
242
 
        return "Local Git Repository (bare)"
243
 
 
244
 
 
245
 
class RemoteGitProber(Prober):
246
 
 
247
 
    def probe_transport(self, transport):
248
 
        url = transport.base
249
 
        if url.startswith('readonly+'):
250
 
            url = url[len('readonly+'):]
251
 
        if (not url.startswith("git://") and not url.startswith("git+")):
252
 
            raise bzr_errors.NotBranchError(transport.base)
253
 
        # little ugly, but works
254
 
        from bzrlib.plugins.git.remote import GitSmartTransport
255
 
        if not isinstance(transport, GitSmartTransport):
256
 
            raise bzr_errors.NotBranchError(transport.base)
257
 
        return RemoteGitControlDirFormat()
258
 
 
259
 
 
260
 
 
261
 
class RemoteGitControlDirFormat(GitControlDirFormat):
 
181
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
182
    """The .git directory control format."""
263
183
 
264
 
    supports_workingtrees = False
265
 
 
266
184
    @classmethod
267
185
    def _known_formats(self):
268
 
        return set([RemoteGitControlDirFormat()])
 
186
        return set([RemoteGitBzrDirFormat()])
269
187
 
270
188
    def open(self, transport, _found=None):
271
189
        """Open this directory.
275
193
        url = transport.base
276
194
        if url.startswith('readonly+'):
277
195
            url = url[len('readonly+'):]
278
 
        if (not url.startswith("git://") and not url.startswith("git+")):
 
196
        if (not url.startswith("git://") and 
 
197
            not url.startswith("git+")):
279
198
            raise bzr_errors.NotBranchError(transport.base)
280
199
        from bzrlib.plugins.git.remote import RemoteGitDir, GitSmartTransport
281
200
        if not isinstance(transport, GitSmartTransport):
287
206
    @classmethod
288
207
    def probe_transport(klass, transport):
289
208
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
 
209
        url = transport.base
 
210
        if url.startswith('readonly+'):
 
211
            url = url[len('readonly+'):]
 
212
        if (not url.startswith("git://") and 
 
213
            not url.startswith("git+")):
 
214
            raise bzr_errors.NotBranchError(transport.base)
 
215
        # little ugly, but works
 
216
        format = klass()
 
217
        from bzrlib.plugins.git.remote import GitSmartTransport
 
218
        if not isinstance(transport, GitSmartTransport):
 
219
            raise bzr_errors.NotBranchError(transport.base)
 
220
        return format
292
221
 
293
222
    def get_format_description(self):
294
223
        return "Remote Git Repository"
295
224
 
 
225
    def get_format_string(self):
 
226
        return "Remote Git Repository"
 
227
 
296
228
    def initialize_on_transport(self, transport):
297
229
        raise bzr_errors.UninitializableFormat(self)
298
230
 
299
231
 
300
 
if has_controldir:
301
 
    ControlDirFormat.register_format(LocalGitControlDirFormat())
302
 
    ControlDirFormat.register_format(BareLocalGitControlDirFormat())
303
 
    ControlDirFormat.register_format(RemoteGitControlDirFormat())
304
 
    ControlDirFormat.register_prober(LocalGitProber)
305
 
    ControlDirFormat.register_prober(RemoteGitProber)
306
 
else:
307
 
    ControlDirFormat.register_control_format(LocalGitControlDirFormat)
308
 
    ControlDirFormat.register_control_format(BareLocalGitControlDirFormat)
309
 
    ControlDirFormat.register_control_format(RemoteGitControlDirFormat)
 
232
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
 
233
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
310
234
 
311
 
register_transport_proto('git://',
 
235
register_transport_proto('git://', 
312
236
        help="Access using the Git smart server protocol.")
313
 
register_transport_proto('git+ssh://',
 
237
register_transport_proto('git+ssh://', 
314
238
        help="Access using the Git smart server protocol over SSH.")
315
239
 
316
240
register_lazy_transport("git://", 'bzrlib.plugins.git.remote',
318
242
register_lazy_transport("git+ssh://", 'bzrlib.plugins.git.remote',
319
243
                        'SSHGitSmartTransport')
320
244
 
321
 
foreign_vcs_registry.register_lazy("git",
 
245
foreign_vcs_registry.register_lazy("git", 
322
246
    "bzrlib.plugins.git.mapping", "foreign_git", "Stupid content tracker")
323
247
 
324
248
plugin_cmds.register_lazy("cmd_git_import", [], "bzrlib.plugins.git.commands")
325
 
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
 
249
plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"], 
326
250
    "bzrlib.plugins.git.commands")
327
 
plugin_cmds.register_lazy("cmd_git_refs", [], "bzrlib.plugins.git.commands")
328
 
plugin_cmds.register_lazy("cmd_git_apply", [], "bzrlib.plugins.git.commands")
329
251
 
330
252
def update_stanza(rev, stanza):
331
253
    mapping = getattr(rev, "mapping", None)
340
262
 
341
263
from bzrlib.transport import transport_server_registry
342
264
transport_server_registry.register_lazy('git',
343
 
    'bzrlib.plugins.git.server',
 
265
    'bzrlib.plugins.git.server', 
344
266
    'serve_git',
345
267
    'Git Smart server protocol over TCP. (default port: 9418)')
346
268
 
347
269
 
348
 
from bzrlib.repository import (
349
 
    network_format_registry as repository_network_format_registry,
350
 
    )
351
 
repository_network_format_registry.register_lazy('git',
 
270
from bzrlib.repository import network_format_registry as repository_network_format_registry
 
271
repository_network_format_registry.register_lazy('git', 
352
272
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
273
 
354
 
try:
355
 
    from bzrlib.controldir import (
356
 
        network_format_registry as controldir_network_format_registry,
357
 
        )
358
 
except ImportError:
359
 
    from bzrlib.bzrdir import (
360
 
        network_format_registry as controldir_network_format_registry,
361
 
        )
362
 
controldir_network_format_registry.register('git', GitControlDirFormat)
 
274
from bzrlib.bzrdir import network_format_registry as bzrdir_network_format_registry
 
275
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
 
276
 
 
277
 
 
278
def get_rich_root_format(stacked=False):
 
279
    if stacked:
 
280
        return bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
281
    else:
 
282
        return bzrdir.format_registry.make_bzrdir("default-rich-root")
363
283
 
364
284
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
285
                                   'send_git', 'Git am-style diff format')
366
286
 
367
 
topic_registry.register_lazy('git',
368
 
                             'bzrlib.plugins.git.help',
369
 
                             'help_git', 'Using Bazaar with Git')
370
 
 
371
 
try:
372
 
    from bzrlib.diff import format_registry as diff_format_registry
373
 
except ImportError:
374
 
    pass
375
 
else:
376
 
    diff_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
377
 
        'GitDiffTree', 'Git am-style diff format')
378
 
 
379
287
def test_suite():
380
288
    from bzrlib.plugins.git import tests
381
289
    return tests.test_suite()