/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
1
 
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2007-2010 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import bzrlib
18
17
from bzrlib import (
19
 
    branch,
 
18
    config,
 
19
    debug,
20
20
    tag,
 
21
    trace,
 
22
    ui,
21
23
    urlutils,
22
24
    )
23
 
from bzrlib.bzrdir import (
24
 
    BzrDir,
25
 
    BzrDirFormat,
26
 
    )
27
25
from bzrlib.errors import (
28
26
    BzrError,
 
27
    InvalidRevisionId,
29
28
    NoSuchFile,
 
29
    NoSuchRevision,
30
30
    NotLocalUrl,
31
31
    )
32
 
from bzrlib.lockable_files import (
33
 
    TransportLock,
34
 
    )
35
 
from bzrlib.repository import (
36
 
    Repository,
37
 
    )
38
 
from bzrlib.trace import (
39
 
    info,
40
 
    )
41
32
from bzrlib.transport import (
42
33
    Transport,
43
34
    )
57
48
from bzrlib.plugins.git.dir import (
58
49
    GitDir,
59
50
    )
60
 
from bzrlib.plugins.git.foreign import (
61
 
    ForeignBranch,
 
51
from bzrlib.plugins.git.mapping import (
 
52
    mapping_registry,
62
53
    )
63
54
from bzrlib.plugins.git.repository import (
64
 
    GitRepositoryFormat,
65
55
    GitRepository,
66
56
    )
 
57
from bzrlib.plugins.git.refs import (
 
58
    extract_tags,
 
59
    branch_name_to_ref,
 
60
    )
67
61
 
68
62
import dulwich as git
69
63
from dulwich.errors import (
71
65
    )
72
66
from dulwich.pack import (
73
67
    Pack,
74
 
    PackData,
 
68
    ThinPackData,
75
69
    )
76
70
import os
77
71
import tempfile
78
72
import urllib
79
73
import urlparse
80
 
 
81
 
try:
82
 
    from dulwich.pack import load_pack_index
83
 
except ImportError:
84
 
    from dulwich.pack import PackIndex as load_pack_index
85
 
 
86
 
 
87
 
# Don't run any tests on GitSmartTransport as it is not intended to be 
 
74
urlparse.uses_netloc.extend(['git', 'git+ssh'])
 
75
 
 
76
from dulwich.pack import load_pack_index
 
77
 
 
78
 
 
79
# Don't run any tests on GitSmartTransport as it is not intended to be
88
80
# a full implementation of Transport
89
81
def get_test_permutations():
90
82
    return []
91
83
 
92
84
 
 
85
def split_git_url(url):
 
86
    """Split a Git URL.
 
87
 
 
88
    :param url: Git URL
 
89
    :return: Tuple with host, port, username, path.
 
90
    """
 
91
    (scheme, netloc, loc, _, _) = urlparse.urlsplit(url)
 
92
    path = urllib.unquote(loc)
 
93
    if path.startswith("/~"):
 
94
        path = path[1:]
 
95
    (username, hostport) = urllib.splituser(netloc)
 
96
    (host, port) = urllib.splitnport(hostport, None)
 
97
    return (host, port, username, path)
 
98
 
 
99
 
93
100
class GitSmartTransport(Transport):
94
101
 
95
102
    def __init__(self, url, _client=None):
96
103
        Transport.__init__(self, url)
97
 
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
98
 
        hostport, self._path = urllib.splithost(loc)
99
 
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
 
104
        (self._host, self._port, self._username, self._path) = \
 
105
            split_git_url(url)
 
106
        if 'transport' in debug.debug_flags:
 
107
            trace.mutter('host: %r, user: %r, port: %r, path: %r',
 
108
                         self._host, self._username, self._port, self._path)
100
109
        self._client = _client
101
110
 
 
111
    def external_url(self):
 
112
        return self.base
 
113
 
102
114
    def has(self, relpath):
103
115
        return False
104
116
 
105
 
    def _get_client(self):
 
117
    def _get_client(self, thin_packs):
106
118
        raise NotImplementedError(self._get_client)
107
119
 
 
120
    def _get_path(self):
 
121
        return self._path
 
122
 
108
123
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
109
124
        if progress is None:
110
125
            def progress(text):
111
 
                info("git: %s" % text)
112
 
        client = self._get_client()
 
126
                trace.info("git: %s" % text)
 
127
        client = self._get_client(thin_packs=False)
113
128
        try:
114
 
            client.fetch_pack(self._path, determine_wants, 
 
129
            return client.fetch_pack(self._get_path(), determine_wants,
115
130
                graph_walker, pack_data, progress)
116
131
        except GitProtocolError, e:
117
132
            raise BzrError(e)
118
133
 
 
134
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
135
        client = self._get_client(thin_packs=False)
 
136
        try:
 
137
            return client.send_pack(self._get_path(), get_changed_refs,
 
138
                generate_pack_contents)
 
139
        except GitProtocolError, e:
 
140
            raise BzrError(e)
 
141
 
119
142
    def get(self, path):
120
143
        raise NoSuchFile(path)
121
144
 
134
157
 
135
158
class TCPGitSmartTransport(GitSmartTransport):
136
159
 
137
 
    def _get_client(self):
 
160
    _scheme = 'git'
 
161
 
 
162
    def _get_client(self, thin_packs):
138
163
        if self._client is not None:
139
164
            ret = self._client
140
165
            self._client = None
141
166
            return ret
142
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
 
167
        return git.client.TCPGitClient(self._host, self._port,
 
168
            thin_packs=thin_packs, report_activity=self._report_activity)
143
169
 
144
170
 
145
171
class SSHGitSmartTransport(GitSmartTransport):
146
172
 
147
 
    def _get_client(self):
 
173
    _scheme = 'git+ssh'
 
174
 
 
175
    def _get_path(self):
 
176
        if self._path.startswith("/~/"):
 
177
            return self._path[3:]
 
178
        return self._path
 
179
 
 
180
    def _get_client(self, thin_packs):
148
181
        if self._client is not None:
149
182
            ret = self._client
150
183
            self._client = None
151
184
            return ret
152
 
        return git.client.SSHGitClient(self._host, self._port, thin_packs=False)
 
185
        location_config = config.LocationConfig(self.base)
 
186
        client = git.client.SSHGitClient(self._host, self._port, self._username,
 
187
            thin_packs=thin_packs, report_activity=self._report_activity)
 
188
        # Set up alternate pack program paths
 
189
        upload_pack = location_config.get_user_option('git_upload_pack')
 
190
        if upload_pack:
 
191
            client.alternative_paths["upload-pack"] = upload_pack
 
192
        receive_pack = location_config.get_user_option('git_receive_pack')
 
193
        if receive_pack:
 
194
            client.alternative_paths["receive-pack"] = receive_pack
 
195
        return client
153
196
 
154
197
 
155
198
class RemoteGitDir(GitDir):
159
202
        self.root_transport = transport
160
203
        self.transport = transport
161
204
        self._lockfiles = lockfiles
 
205
        self._mode_check_done = None
 
206
 
 
207
    def _branch_name_to_ref(self, name, default=None):
 
208
        return branch_name_to_ref(name, default=default)
162
209
 
163
210
    def open_repository(self):
164
211
        return RemoteGitRepository(self, self._lockfiles)
165
212
 
166
 
    def open_branch(self, ignore_fallbacks=False):
 
213
    def _open_branch(self, name=None, ignore_fallbacks=False, 
 
214
                    unsupported=False):
167
215
        repo = self.open_repository()
168
 
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
169
 
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
 
216
        refname = self._branch_name_to_ref(name)
 
217
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
170
218
 
171
 
    def open_workingtree(self):
 
219
    def open_workingtree(self, recommend_upgrade=False):
172
220
        raise NotLocalUrl(self.transport.base)
173
221
 
174
222
 
185
233
        self.resolve_ext_ref = resolve_ext_ref
186
234
 
187
235
    @property
188
 
    def idx(self):
 
236
    def data(self):
 
237
        if self._data is None:
 
238
            self._data = ThinPackData(self.resolve_ext_ref, self._data_path)
 
239
        return self._data
 
240
 
 
241
    @property
 
242
    def index(self):
189
243
        if self._idx is None:
190
 
            if self._data is None:
191
 
                self._data = PackData(self._data_path)
192
 
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
244
            if not os.path.exists(self._idx_path):
 
245
                pb = ui.ui_factory.nested_progress_bar()
 
246
                try:
 
247
                    def report_progress(cur, total):
 
248
                        pb.update("generating index", cur, total)
 
249
                    self.data.create_index(self._idx_path, 
 
250
                        progress=report_progress)
 
251
                finally:
 
252
                    pb.finished()
193
253
            self._idx = load_pack_index(self._idx_path)
194
254
        return self._idx
195
255
 
196
256
    def __del__(self):
197
 
        os.remove(self._data_path)
198
 
        os.remove(self._idx_path)
 
257
        if self._idx is not None:
 
258
            self._idx.close()
 
259
            os.remove(self._idx_path)
 
260
        if self._data is not None:
 
261
            self._data.close()
 
262
            os.remove(self._data_path)
199
263
 
200
264
 
201
265
class RemoteGitRepository(GitRepository):
219
283
    def get_refs(self):
220
284
        if self._refs is not None:
221
285
            return self._refs
222
 
        def determine_wants(heads):
223
 
            self._refs = heads
224
 
            return []
225
 
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
226
 
            lambda x: None, lambda x: mutter("git: %s" % x))
 
286
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
 
287
            lambda x: None, lambda x: trace.mutter("git: %s" % x))
227
288
        return self._refs
228
289
 
229
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
290
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
230
291
                   progress=None):
231
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
232
 
            progress)
233
 
 
234
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
292
        return self._transport.fetch_pack(determine_wants, graph_walker,
 
293
                                          pack_data, progress)
 
294
 
 
295
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
296
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
 
297
 
 
298
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
299
                      progress=None):
235
300
        fd, path = tempfile.mkstemp(suffix=".pack")
236
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
301
        self.fetch_pack(determine_wants, graph_walker,
 
302
            lambda x: os.write(fd, x), progress)
237
303
        os.close(fd)
238
304
        if os.path.getsize(path) == 0:
239
305
            return EmptyObjectStoreIterator()
240
306
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
241
307
 
 
308
    def lookup_bzr_revision_id(self, bzr_revid):
 
309
        # This won't work for any round-tripped bzr revisions, but it's a start..
 
310
        try:
 
311
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
312
        except InvalidRevisionId:
 
313
            raise NoSuchRevision(self, bzr_revid)
 
314
 
 
315
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
 
316
        """Lookup a revision id.
 
317
 
 
318
        """
 
319
        if mapping is None:
 
320
            mapping = self.get_mapping()
 
321
        # Not really an easy way to parse foreign revids here..
 
322
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
323
 
242
324
 
243
325
class RemoteGitTagDict(tag.BasicTags):
244
326
 
247
329
        self.repository = branch.repository
248
330
 
249
331
    def get_tag_dict(self):
250
 
        ret = {}
251
 
        refs = self.repository.get_refs()
252
 
        for k,v in refs.iteritems():
253
 
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
254
 
                v = refs.get(k+"^{}", v)
255
 
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
256
 
        return ret
 
332
        tags = {}
 
333
        for k, v in extract_tags(self.repository.get_refs()).iteritems():
 
334
            tags[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
335
        return tags
257
336
 
258
337
    def set_tag(self, name, revid):
259
338
        # FIXME: Not supported yet, should do a push of a new ref
263
342
class RemoteGitBranch(GitBranch):
264
343
 
265
344
    def __init__(self, bzrdir, repository, name, lockfiles):
266
 
        heads = repository.get_refs()
267
 
        if not name in heads:
268
 
            raise NoSuchRef(name)
269
 
        self._ref = heads[name]
270
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
 
345
        self._sha = None
 
346
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
 
347
                lockfiles)
 
348
 
 
349
    def revision_history(self):
 
350
        raise GitSmartRemoteNotSupported()
271
351
 
272
352
    def last_revision(self):
273
 
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
 
353
        return self.lookup_foreign_revision_id(self.head)
 
354
 
 
355
    def _get_config(self):
 
356
        class EmptyConfig(object):
 
357
 
 
358
            def _get_configobj(self):
 
359
                return config.ConfigObj()
 
360
 
 
361
        return EmptyConfig()
 
362
 
 
363
    @property
 
364
    def head(self):
 
365
        if self._sha is not None:
 
366
            return self._sha
 
367
        heads = self.repository.get_refs()
 
368
        name = self.bzrdir._branch_name_to_ref(self.name, "HEAD")
 
369
        if name in heads:
 
370
            self._sha = heads[name]
 
371
        else:
 
372
            raise NoSuchRef(self.name)
 
373
        return self._sha
274
374
 
275
375
    def _synchronize_history(self, destination, revision_id):
276
376
        """See Branch._synchronize_history()."""
277
377
        destination.generate_revision_history(self.last_revision())
278
 
 
 
378
 
 
379
    def get_push_location(self):
 
380
        return None
 
381
 
 
382
    def set_push_location(self, url):
 
383
        pass