/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 remote.py

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
1
 
# Copyright (C) 2007-2008 Canonical Ltd
 
1
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import bzrlib
18
 
from bzrlib import urlutils
19
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
20
 
from bzrlib.errors import NoSuchFile, NotLocalUrl
21
 
from bzrlib.lockable_files import TransportLock
22
 
from bzrlib.repository import Repository
23
 
from bzrlib.trace import info
24
 
from bzrlib.transport import Transport
 
18
from bzrlib import (
 
19
    config,
 
20
    tag,
 
21
    trace,
 
22
    ui,
 
23
    urlutils,
 
24
    )
 
25
from bzrlib.errors import (
 
26
    BzrError,
 
27
    InvalidRevisionId,
 
28
    NoSuchFile,
 
29
    NoSuchRevision,
 
30
    NotLocalUrl,
 
31
    )
 
32
from bzrlib.trace import (
 
33
    info,
 
34
    )
 
35
from bzrlib.transport import (
 
36
    Transport,
 
37
    )
25
38
 
26
 
from bzrlib.plugins.git import lazy_check_versions
 
39
from bzrlib.plugins.git import (
 
40
    lazy_check_versions,
 
41
    )
27
42
lazy_check_versions()
28
43
 
29
 
from bzrlib.plugins.git.branch import GitBranch
30
 
from bzrlib.plugins.git.errors import NoSuchRef
31
 
from bzrlib.plugins.git.dir import GitDir
32
 
from bzrlib.plugins.git.foreign import ForeignBranch
33
 
from bzrlib.plugins.git.repository import GitFormat, GitRepository
 
44
from bzrlib.plugins.git.branch import (
 
45
    GitBranch,
 
46
    extract_tags,
 
47
    )
 
48
from bzrlib.plugins.git.errors import (
 
49
    GitSmartRemoteNotSupported,
 
50
    NoSuchRef,
 
51
    )
 
52
from bzrlib.plugins.git.dir import (
 
53
    GitDir,
 
54
    )
 
55
from bzrlib.plugins.git.mapping import (
 
56
    mapping_registry,
 
57
    )
 
58
from bzrlib.plugins.git.repository import (
 
59
    GitRepository,
 
60
    )
34
61
 
 
62
import dulwich as git
 
63
from dulwich.errors import (
 
64
    GitProtocolError,
 
65
    )
 
66
from dulwich.pack import (
 
67
    Pack,
 
68
    PackData,
 
69
    )
35
70
import os
36
71
import tempfile
37
72
import urllib
38
73
import urlparse
39
74
 
40
 
import dulwich as git
41
 
from dulwich.pack import PackData, Pack, PackIndex
42
 
 
43
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
75
from dulwich.pack import load_pack_index
 
76
 
 
77
 
 
78
# Don't run any tests on GitSmartTransport as it is not intended to be
44
79
# a full implementation of Transport
45
80
def get_test_permutations():
46
81
    return []
51
86
    def __init__(self, url, _client=None):
52
87
        Transport.__init__(self, url)
53
88
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
54
 
        assert scheme == "git"
55
 
        hostport, self._path = urllib.splithost(loc)
56
 
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
 
89
        hostport, escaped_path = urllib.splithost(loc)
 
90
        self._path = urllib.unquote(escaped_path)
 
91
        (self._username, hostport) = urllib.splituser(hostport)
 
92
        (self._host, self._port) = urllib.splitnport(hostport, None)
57
93
        self._client = _client
58
94
 
59
 
    def _get_client(self):
60
 
        if self._client is not None:
61
 
            ret = self._client
62
 
            self._client = None
63
 
            return ret
64
 
        return git.client.TCPGitClient(self._host, self._port)
 
95
    def external_url(self):
 
96
        return self.base
 
97
 
 
98
    def has(self, relpath):
 
99
        return False
 
100
 
 
101
    def _get_client(self, thin_packs):
 
102
        raise NotImplementedError(self._get_client)
 
103
 
 
104
    def _get_path(self):
 
105
        return self._path
65
106
 
66
107
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
67
108
        if progress is None:
68
109
            def progress(text):
69
110
                info("git: %s" % text)
70
 
        self._get_client().fetch_pack(self._path, determine_wants, 
71
 
            graph_walker, pack_data, progress)
 
111
        client = self._get_client(thin_packs=False)
 
112
        try:
 
113
            return client.fetch_pack(self._get_path(), determine_wants,
 
114
                graph_walker, pack_data, progress)
 
115
        except GitProtocolError, e:
 
116
            raise BzrError(e)
 
117
 
 
118
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
119
        client = self._get_client(thin_packs=False)
 
120
        try:
 
121
            return client.send_pack(self._get_path(), get_changed_refs,
 
122
                generate_pack_contents)
 
123
        except GitProtocolError, e:
 
124
            raise BzrError(e)
72
125
 
73
126
    def get(self, path):
74
127
        raise NoSuchFile(path)
83
136
        else:
84
137
            newurl = urlutils.join(self.base, offset)
85
138
 
86
 
        return GitSmartTransport(newurl, self._client)
 
139
        return self.__class__(newurl, self._client)
 
140
 
 
141
 
 
142
class TCPGitSmartTransport(GitSmartTransport):
 
143
 
 
144
    _scheme = 'git'
 
145
 
 
146
    def _get_client(self, thin_packs):
 
147
        if self._client is not None:
 
148
            ret = self._client
 
149
            self._client = None
 
150
            return ret
 
151
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
 
152
            report_activity=self._report_activity)
 
153
 
 
154
 
 
155
class SSHGitSmartTransport(GitSmartTransport):
 
156
 
 
157
    _scheme = 'git+ssh'
 
158
 
 
159
    def _get_path(self):
 
160
        if self._path.startswith("/~/"):
 
161
            return self._path[3:]
 
162
        return self._path
 
163
 
 
164
    def _get_client(self, thin_packs):
 
165
        if self._client is not None:
 
166
            ret = self._client
 
167
            self._client = None
 
168
            return ret
 
169
        return git.client.SSHGitClient(self._host, self._port, self._username,
 
170
            thin_packs=thin_packs, report_activity=self._report_activity)
87
171
 
88
172
 
89
173
class RemoteGitDir(GitDir):
93
177
        self.root_transport = transport
94
178
        self.transport = transport
95
179
        self._lockfiles = lockfiles
 
180
        self._mode_check_done = None
96
181
 
97
182
    def open_repository(self):
98
183
        return RemoteGitRepository(self, self._lockfiles)
99
184
 
100
 
    def open_branch(self, _unsupported=False):
 
185
    def open_branch(self, ignore_fallbacks=False):
101
186
        repo = self.open_repository()
102
187
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
103
188
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
104
189
 
105
 
    def open_workingtree(self):
 
190
    def open_workingtree(self, recommend_upgrade=False):
106
191
        raise NotLocalUrl(self.transport.base)
107
192
 
108
193
 
 
194
class EmptyObjectStoreIterator(dict):
 
195
 
 
196
    def iterobjects(self):
 
197
        return []
 
198
 
 
199
 
109
200
class TemporaryPackIterator(Pack):
110
201
 
111
 
    @property
112
 
    def idx(self):
 
202
    def __init__(self, path, resolve_ext_ref):
 
203
        super(TemporaryPackIterator, self).__init__(path)
 
204
        self.resolve_ext_ref = resolve_ext_ref
 
205
 
 
206
    @property
 
207
    def data(self):
 
208
        if self._data is None:
 
209
            self._data = PackData(self._data_path)
 
210
        return self._data
 
211
 
 
212
    @property
 
213
    def index(self):
113
214
        if self._idx is None:
114
 
            self._data.create_index_v2(self._idx_path)
115
 
            self._idx = PackIndex(self._idx_path)
 
215
            if not os.path.exists(self._idx_path):
 
216
                pb = ui.ui_factory.nested_progress_bar()
 
217
                try:
 
218
                    def report_progress(cur, total):
 
219
                        pb.update("generating index", cur, total)
 
220
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
221
                        progress=report_progress)
 
222
                finally:
 
223
                    pb.finished()
 
224
            self._idx = load_pack_index(self._idx_path)
116
225
        return self._idx
117
226
 
118
227
    def __del__(self):
119
 
        os.remove(self._data_path)
120
 
        os.remove(self._idx_path)
 
228
        if self._idx is not None:
 
229
            self._idx.close()
 
230
            os.remove(self._idx_path)
 
231
        if self._data is not None:
 
232
            self._data.close()
 
233
            os.remove(self._data_path)
121
234
 
122
235
 
123
236
class RemoteGitRepository(GitRepository):
124
237
 
125
238
    def __init__(self, gitdir, lockfiles):
126
239
        GitRepository.__init__(self, gitdir, lockfiles)
127
 
 
128
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
240
        self._refs = None
 
241
 
 
242
    @property
 
243
    def inventories(self):
 
244
        raise GitSmartRemoteNotSupported()
 
245
 
 
246
    @property
 
247
    def revisions(self):
 
248
        raise GitSmartRemoteNotSupported()
 
249
 
 
250
    @property
 
251
    def texts(self):
 
252
        raise GitSmartRemoteNotSupported()
 
253
 
 
254
    def get_refs(self):
 
255
        if self._refs is not None:
 
256
            return self._refs
 
257
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
 
258
            lambda x: None, lambda x: trace.mutter("git: %s" % x))
 
259
        return self._refs
 
260
 
 
261
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
129
262
                   progress=None):
130
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
131
 
            progress)
132
 
 
133
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
263
        return self._transport.fetch_pack(determine_wants, graph_walker,
 
264
                                          pack_data, progress)
 
265
 
 
266
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
267
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
 
268
 
 
269
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
270
                      progress=None):
134
271
        fd, path = tempfile.mkstemp(suffix=".pack")
135
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
272
        self.fetch_pack(determine_wants, graph_walker,
 
273
            lambda x: os.write(fd, x), progress)
136
274
        os.close(fd)
137
 
        return TemporaryPackIterator(path[:-len(".pack")])
 
275
        if os.path.getsize(path) == 0:
 
276
            return EmptyObjectStoreIterator()
 
277
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
278
 
 
279
    def lookup_bzr_revision_id(self, bzr_revid):
 
280
        # This won't work for any round-tripped bzr revisions, but it's a start..
 
281
        try:
 
282
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
283
        except InvalidRevisionId:
 
284
            raise NoSuchRevision(self, bzr_revid)
 
285
 
 
286
 
 
287
class RemoteGitTagDict(tag.BasicTags):
 
288
 
 
289
    def __init__(self, branch):
 
290
        self.branch = branch
 
291
        self.repository = branch.repository
 
292
 
 
293
    def get_tag_dict(self):
 
294
        tags = {}
 
295
        for k, v in extract_tags(self.repository.get_refs()).iteritems():
 
296
            tags[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
297
        return tags
 
298
 
 
299
    def set_tag(self, name, revid):
 
300
        # FIXME: Not supported yet, should do a push of a new ref
 
301
        raise NotImplementedError(self.set_tag)
138
302
 
139
303
 
140
304
class RemoteGitBranch(GitBranch):
141
305
 
142
306
    def __init__(self, bzrdir, repository, name, lockfiles):
143
 
        def determine_wants(heads):
144
 
            if not name in heads:
145
 
                raise NoSuchRef(name)
146
 
            self._ref = heads[name]
147
 
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
148
 
                             lambda x: mutter("git: %s" % x))
149
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
 
307
        self._ref = None
 
308
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
 
309
                lockfiles)
 
310
 
 
311
    def revision_history(self):
 
312
        raise GitSmartRemoteNotSupported()
150
313
 
151
314
    def last_revision(self):
152
 
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
 
315
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
316
 
 
317
    def _get_config(self):
 
318
        class EmptyConfig(object):
 
319
 
 
320
            def _get_configobj(self):
 
321
                return config.ConfigObj()
 
322
 
 
323
        return EmptyConfig()
 
324
 
 
325
    @property
 
326
    def head(self):
 
327
        if self._ref is not None:
 
328
            return self._ref
 
329
        heads = self.repository.get_refs()
 
330
        if not self.name in heads:
 
331
            raise NoSuchRef(self.name)
 
332
        self._ref = heads[self.name]
 
333
        return self._ref
153
334
 
154
335
    def _synchronize_history(self, destination, revision_id):
155
336
        """See Branch._synchronize_history()."""
156
337
        destination.generate_revision_history(self.last_revision())
157
 
 
 
338
 
 
339
    def get_push_location(self):
 
340
        return None
 
341
 
 
342
    def set_push_location(self, url):
 
343
        pass