/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,
21
22
    ui,
22
23
    urlutils,
23
24
    )
28
29
    NoSuchRevision,
29
30
    NotLocalUrl,
30
31
    )
31
 
from bzrlib.trace import (
32
 
    info,
33
 
    )
34
32
from bzrlib.transport import (
35
33
    Transport,
36
34
    )
42
40
 
43
41
from bzrlib.plugins.git.branch import (
44
42
    GitBranch,
45
 
    extract_tags,
46
43
    )
47
44
from bzrlib.plugins.git.errors import (
48
45
    GitSmartRemoteNotSupported,
55
52
    mapping_registry,
56
53
    )
57
54
from bzrlib.plugins.git.repository import (
58
 
    GitRepositoryFormat,
59
55
    GitRepository,
60
56
    )
 
57
from bzrlib.plugins.git.refs import (
 
58
    extract_tags,
 
59
    branch_name_to_ref,
 
60
    )
61
61
 
62
62
import dulwich as git
63
63
from dulwich.errors import (
65
65
    )
66
66
from dulwich.pack import (
67
67
    Pack,
68
 
    PackData,
 
68
    ThinPackData,
69
69
    )
70
70
import os
71
71
import tempfile
72
72
import urllib
73
73
import urlparse
74
 
 
75
 
try:
76
 
    from dulwich.pack import load_pack_index
77
 
except ImportError:
78
 
    from dulwich.pack import PackIndex as load_pack_index
79
 
 
80
 
 
81
 
# 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
82
80
# a full implementation of Transport
83
81
def get_test_permutations():
84
82
    return []
85
83
 
86
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
 
87
100
class GitSmartTransport(Transport):
88
101
 
89
102
    def __init__(self, url, _client=None):
90
103
        Transport.__init__(self, url)
91
 
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
92
 
        hostport, self._path = urllib.splithost(loc)
93
 
        (self._username, hostport) = urllib.splituser(hostport)
94
 
        (self._host, self._port) = urllib.splitnport(hostport, None)
 
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)
95
109
        self._client = _client
96
110
 
 
111
    def external_url(self):
 
112
        return self.base
 
113
 
97
114
    def has(self, relpath):
98
115
        return False
99
116
 
100
 
    def _get_client(self):
 
117
    def _get_client(self, thin_packs):
101
118
        raise NotImplementedError(self._get_client)
102
119
 
103
120
    def _get_path(self):
106
123
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
107
124
        if progress is None:
108
125
            def progress(text):
109
 
                info("git: %s" % text)
110
 
        client = self._get_client()
 
126
                trace.info("git: %s" % text)
 
127
        client = self._get_client(thin_packs=False)
111
128
        try:
112
 
            return client.fetch_pack(self._get_path(), determine_wants, 
 
129
            return client.fetch_pack(self._get_path(), determine_wants,
113
130
                graph_walker, pack_data, progress)
114
131
        except GitProtocolError, e:
115
132
            raise BzrError(e)
116
133
 
117
134
    def send_pack(self, get_changed_refs, generate_pack_contents):
118
 
        client = self._get_client()
 
135
        client = self._get_client(thin_packs=False)
119
136
        try:
120
 
            return client.send_pack(self._get_path(), get_changed_refs, 
 
137
            return client.send_pack(self._get_path(), get_changed_refs,
121
138
                generate_pack_contents)
122
139
        except GitProtocolError, e:
123
140
            raise BzrError(e)
142
159
 
143
160
    _scheme = 'git'
144
161
 
145
 
    def _get_client(self):
 
162
    def _get_client(self, thin_packs):
146
163
        if self._client is not None:
147
164
            ret = self._client
148
165
            self._client = None
149
166
            return ret
150
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False,
151
 
            report_activity=self._report_activity)
 
167
        return git.client.TCPGitClient(self._host, self._port,
 
168
            thin_packs=thin_packs, report_activity=self._report_activity)
152
169
 
153
170
 
154
171
class SSHGitSmartTransport(GitSmartTransport):
160
177
            return self._path[3:]
161
178
        return self._path
162
179
 
163
 
    def _get_client(self):
 
180
    def _get_client(self, thin_packs):
164
181
        if self._client is not None:
165
182
            ret = self._client
166
183
            self._client = None
167
184
            return ret
168
 
        return git.client.SSHGitClient(self._host, self._port, self._username,
169
 
            thin_packs=False, report_activity=self._report_activity)
 
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
170
196
 
171
197
 
172
198
class RemoteGitDir(GitDir):
178
204
        self._lockfiles = lockfiles
179
205
        self._mode_check_done = None
180
206
 
 
207
    def _branch_name_to_ref(self, name, default=None):
 
208
        return branch_name_to_ref(name, default=default)
 
209
 
181
210
    def open_repository(self):
182
211
        return RemoteGitRepository(self, self._lockfiles)
183
212
 
184
 
    def open_branch(self, ignore_fallbacks=False):
 
213
    def _open_branch(self, name=None, ignore_fallbacks=False, 
 
214
                    unsupported=False):
185
215
        repo = self.open_repository()
186
 
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
187
 
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
 
216
        refname = self._branch_name_to_ref(name)
 
217
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
188
218
 
189
 
    def open_workingtree(self):
 
219
    def open_workingtree(self, recommend_upgrade=False):
190
220
        raise NotLocalUrl(self.transport.base)
191
221
 
192
222
 
203
233
        self.resolve_ext_ref = resolve_ext_ref
204
234
 
205
235
    @property
 
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
206
242
    def index(self):
207
243
        if self._idx is None:
208
 
            pb = ui.ui_factory.nested_progress_bar()
209
 
            try:
210
 
                def report_progress(cur, total):
211
 
                    pb.update("generating index", cur, total)
212
 
                self.data.create_index(self._idx_path, self.resolve_ext_ref,
213
 
                    progress=report_progress)
214
 
            finally:
215
 
                pb.finished()
 
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()
216
253
            self._idx = load_pack_index(self._idx_path)
217
254
        return self._idx
218
255
 
219
256
    def __del__(self):
220
 
        os.remove(self._data_path)
221
 
        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)
222
263
 
223
264
 
224
265
class RemoteGitRepository(GitRepository):
242
283
    def get_refs(self):
243
284
        if self._refs is not None:
244
285
            return self._refs
245
 
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None, 
246
 
            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))
247
288
        return self._refs
248
289
 
249
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
 
290
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
250
291
                   progress=None):
251
292
        return self._transport.fetch_pack(determine_wants, graph_walker,
252
293
                                          pack_data, progress)
254
295
    def send_pack(self, get_changed_refs, generate_pack_contents):
255
296
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
256
297
 
257
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
298
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
299
                      progress=None):
258
300
        fd, path = tempfile.mkstemp(suffix=".pack")
259
 
        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)
260
303
        os.close(fd)
261
304
        if os.path.getsize(path) == 0:
262
305
            return EmptyObjectStoreIterator()
263
306
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
264
307
 
265
 
    def lookup_git_revid(self, bzr_revid):
 
308
    def lookup_bzr_revision_id(self, bzr_revid):
266
309
        # This won't work for any round-tripped bzr revisions, but it's a start..
267
310
        try:
268
311
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
269
312
        except InvalidRevisionId:
270
313
            raise NoSuchRevision(self, bzr_revid)
271
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
 
272
324
 
273
325
class RemoteGitTagDict(tag.BasicTags):
274
326
 
277
329
        self.repository = branch.repository
278
330
 
279
331
    def get_tag_dict(self):
280
 
        return extract_tags(self.repository.get_refs(), self.branch.mapping)
 
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
281
336
 
282
337
    def set_tag(self, name, revid):
283
338
        # FIXME: Not supported yet, should do a push of a new ref
287
342
class RemoteGitBranch(GitBranch):
288
343
 
289
344
    def __init__(self, bzrdir, repository, name, lockfiles):
290
 
        self._ref = None
291
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, 
 
345
        self._sha = None
 
346
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
292
347
                lockfiles)
293
348
 
294
349
    def revision_history(self):
295
350
        raise GitSmartRemoteNotSupported()
296
351
 
297
352
    def last_revision(self):
298
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
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()
299
362
 
300
363
    @property
301
364
    def head(self):
302
 
        if self._ref is not None:
303
 
            return self._ref
 
365
        if self._sha is not None:
 
366
            return self._sha
304
367
        heads = self.repository.get_refs()
305
 
        if not self.name in heads:
306
 
            raise NoSuchRef(name)
307
 
        self._ref = heads[self.name]
308
 
        return self._ref
 
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
309
374
 
310
375
    def _synchronize_history(self, destination, revision_id):
311
376
        """See Branch._synchronize_history()."""
312
377
        destination.generate_revision_history(self.last_revision())
313
 
 
 
378
 
314
379
    def get_push_location(self):
315
380
        return None
316
381