/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

Fix handling of ZERO_SHA in lookup_git_sha.

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
    )
96
73
    sys.path.append(os.path.normpath(
97
74
        os.path.join(os.path.dirname(__file__), '_lib')))
98
75
 
99
 
 
100
 
def import_dulwich():
 
76
_versions_checked = False
 
77
def lazy_check_versions():
 
78
    global _versions_checked
 
79
    if _versions_checked:
 
80
        return
 
81
    _versions_checked = True
101
82
    try:
102
83
        from dulwich import __version__ as dulwich_version
103
84
    except ImportError:
109
90
                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
110
91
                    dulwich_minimum_version)
111
92
 
112
 
 
113
 
_versions_checked = False
114
 
def lazy_check_versions():
115
 
    global _versions_checked
116
 
    if _versions_checked:
117
 
        return
118
 
    import_dulwich()
119
 
    _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,
 
93
bzrdir.format_registry.register_lazy('git',
 
94
    "bzrlib.plugins.git.dir", "LocalGitBzrDirFormat",
 
95
    help='GIT repository.', native=False, experimental=True,
130
96
    )
131
97
 
132
98
from bzrlib.revisionspec import revspec_registry
142
108
    dwim_revspecs.append(RevisionSpec_git)
143
109
 
144
110
 
145
 
class GitControlDirFormat(ControlDirFormat):
 
111
class GitBzrDirFormat(bzrdir.BzrDirFormat):
146
112
 
147
113
    _lock_class = TransportLock
148
114
 
158
124
        return "git"
159
125
 
160
126
 
161
 
class LocalGitProber(Prober):
162
 
 
163
 
    def probe_transport(self, transport):
 
127
class LocalGitBzrDirFormat(GitBzrDirFormat):
 
128
    """The .git directory control format."""
 
129
 
 
130
    @classmethod
 
131
    def _known_formats(self):
 
132
        return set([LocalGitBzrDirFormat()])
 
133
 
 
134
    def open(self, transport, _found=None):
 
135
        """Open this directory.
 
136
 
 
137
        """
 
138
        lazy_check_versions()
 
139
        from bzrlib.plugins.git.transportgit import TransportRepo
 
140
        gitrepo = TransportRepo(transport)
 
141
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
 
142
        lockfiles = GitLockableFiles(transport, GitLock())
 
143
        return LocalGitDir(transport, lockfiles, gitrepo, self)
 
144
 
 
145
    @classmethod
 
146
    def probe_transport(klass, transport):
164
147
        try:
165
148
            if not transport.has_any(['info/refs', '.git/branches',
166
149
                                      'branches']):
172
155
            raise bzr_errors.NotBranchError(path=transport.base)
173
156
        lazy_check_versions()
174
157
        import dulwich
175
 
        from bzrlib.plugins.git.transportgit import TransportRepo
 
158
        format = klass()
176
159
        try:
177
 
            gitrepo = TransportRepo(transport)
 
160
            format.open(transport)
 
161
            return format
178
162
        except dulwich.errors.NotGitRepository, e:
179
163
            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):
188
 
    """The .git directory control format."""
189
 
 
190
 
    bare = False
191
 
 
192
 
    @classmethod
193
 
    def _known_formats(self):
194
 
        return set([LocalGitControlDirFormat()])
195
 
 
196
 
    def open(self, transport, _found=None):
197
 
        """Open this directory.
198
 
 
199
 
        """
200
 
        lazy_check_versions()
201
 
        from bzrlib.plugins.git.transportgit import TransportRepo
202
 
        gitrepo = TransportRepo(transport)
203
 
        from bzrlib.plugins.git.dir import LocalGitDir, GitLockableFiles, GitLock
204
 
        lockfiles = GitLockableFiles(transport, GitLock())
205
 
        return LocalGitDir(transport, lockfiles, gitrepo, self)
206
 
 
207
 
    @classmethod
208
 
    def probe_transport(klass, transport):
209
 
        prober = LocalGitProber()
210
 
        return prober.probe_transport(transport)
 
164
        raise bzr_errors.NotBranchError(path=transport.base)
211
165
 
212
166
    def get_format_description(self):
213
167
        return "Local Git Repository"
214
168
 
 
169
    def get_format_string(self):
 
170
        return "Local Git Repository"
 
171
 
215
172
    def initialize_on_transport(self, transport):
216
173
        from bzrlib.transport.local import LocalTransport
217
174
 
221
178
                "non-local transports")
222
179
        lazy_check_versions()
223
180
        from dulwich.repo import Repo
224
 
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc),
225
 
            bare=self.bare)
 
181
        Repo.init(transport.local_abspath(".").encode(osutils._fs_enc))
226
182
        return self.open(transport)
227
183
 
228
184
    def is_supported(self):
229
185
        return True
230
186
 
231
187
 
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):
 
188
class RemoteGitBzrDirFormat(GitBzrDirFormat):
262
189
    """The .git directory control format."""
263
190
 
264
 
    supports_workingtrees = False
265
 
 
266
191
    @classmethod
267
192
    def _known_formats(self):
268
 
        return set([RemoteGitControlDirFormat()])
 
193
        return set([RemoteGitBzrDirFormat()])
269
194
 
270
195
    def open(self, transport, _found=None):
271
196
        """Open this directory.
287
212
    @classmethod
288
213
    def probe_transport(klass, transport):
289
214
        """Our format is present if the transport ends in '.not/'."""
290
 
        prober = RemoteGitProber()
291
 
        return prober.probe_transport(transport)
 
215
        url = transport.base
 
216
        if url.startswith('readonly+'):
 
217
            url = url[len('readonly+'):]
 
218
        if (not url.startswith("git://") and not url.startswith("git+")):
 
219
            raise bzr_errors.NotBranchError(transport.base)
 
220
        # little ugly, but works
 
221
        format = klass()
 
222
        from bzrlib.plugins.git.remote import GitSmartTransport
 
223
        if not isinstance(transport, GitSmartTransport):
 
224
            raise bzr_errors.NotBranchError(transport.base)
 
225
        return format
292
226
 
293
227
    def get_format_description(self):
294
228
        return "Remote Git Repository"
295
229
 
 
230
    def get_format_string(self):
 
231
        return "Remote Git Repository"
 
232
 
296
233
    def initialize_on_transport(self, transport):
297
234
        raise bzr_errors.UninitializableFormat(self)
298
235
 
299
236
 
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)
 
237
bzrdir.BzrDirFormat.register_control_format(LocalGitBzrDirFormat)
 
238
bzrdir.BzrDirFormat.register_control_format(RemoteGitBzrDirFormat)
310
239
 
311
240
register_transport_proto('git://',
312
241
        help="Access using the Git smart server protocol.")
351
280
repository_network_format_registry.register_lazy('git',
352
281
    'bzrlib.plugins.git.repository', 'GitRepositoryFormat')
353
282
 
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)
 
283
from bzrlib.bzrdir import (
 
284
    network_format_registry as bzrdir_network_format_registry,
 
285
    )
 
286
bzrdir_network_format_registry.register('git', GitBzrDirFormat)
363
287
 
364
288
send_format_registry.register_lazy('git', 'bzrlib.plugins.git.send',
365
289
                                   'send_git', 'Git am-style diff format')
366
290
 
367
 
topic_registry.register_lazy('git',
368
 
                             'bzrlib.plugins.git.help',
369
 
                             'help_git', 'Using Bazaar with Git')
370
 
 
371
291
try:
372
292
    from bzrlib.diff import format_registry as diff_format_registry
373
293
except ImportError: