/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
40
40
 
41
41
from bzrlib.plugins.git.branch import (
42
42
    GitBranch,
43
 
    extract_tags,
44
43
    )
45
44
from bzrlib.plugins.git.errors import (
46
45
    GitSmartRemoteNotSupported,
55
54
from bzrlib.plugins.git.repository import (
56
55
    GitRepository,
57
56
    )
 
57
from bzrlib.plugins.git.refs import (
 
58
    extract_tags,
 
59
    branch_name_to_ref,
 
60
    )
58
61
 
59
62
import dulwich as git
60
63
from dulwich.errors import (
62
65
    )
63
66
from dulwich.pack import (
64
67
    Pack,
65
 
    PackData,
 
68
    ThinPackData,
66
69
    )
67
70
import os
68
71
import tempfile
69
72
import urllib
70
73
import urlparse
 
74
urlparse.uses_netloc.extend(['git', 'git+ssh'])
71
75
 
72
76
from dulwich.pack import load_pack_index
73
77
 
84
88
    :param url: Git URL
85
89
    :return: Tuple with host, port, username, path.
86
90
    """
87
 
    (scheme, _, loc, _, _) = urlparse.urlsplit(url)
88
 
    hostport, escaped_path = urllib.splithost(loc)
89
 
    path = urllib.unquote(escaped_path)
 
91
    (scheme, netloc, loc, _, _) = urlparse.urlsplit(url)
 
92
    path = urllib.unquote(loc)
90
93
    if path.startswith("/~"):
91
94
        path = path[1:]
92
 
    (username, hostport) = urllib.splituser(hostport)
 
95
    (username, hostport) = urllib.splituser(netloc)
93
96
    (host, port) = urllib.splitnport(hostport, None)
94
97
    return (host, port, username, path)
95
98
 
161
164
            ret = self._client
162
165
            self._client = None
163
166
            return ret
164
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
165
 
            report_activity=self._report_activity)
 
167
        return git.client.TCPGitClient(self._host, self._port,
 
168
            thin_packs=thin_packs, report_activity=self._report_activity)
166
169
 
167
170
 
168
171
class SSHGitSmartTransport(GitSmartTransport):
179
182
            ret = self._client
180
183
            self._client = None
181
184
            return ret
182
 
        return git.client.SSHGitClient(self._host, self._port, self._username,
 
185
        location_config = config.LocationConfig(self.base)
 
186
        client = git.client.SSHGitClient(self._host, self._port, self._username,
183
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
184
196
 
185
197
 
186
198
class RemoteGitDir(GitDir):
192
204
        self._lockfiles = lockfiles
193
205
        self._mode_check_done = None
194
206
 
 
207
    def _branch_name_to_ref(self, name, default=None):
 
208
        return branch_name_to_ref(name, default=default)
 
209
 
195
210
    def open_repository(self):
196
211
        return RemoteGitRepository(self, self._lockfiles)
197
212
 
198
 
    def open_branch(self, name=None, ignore_fallbacks=False):
 
213
    def _open_branch(self, name=None, ignore_fallbacks=False, 
 
214
                    unsupported=False):
199
215
        repo = self.open_repository()
200
 
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
201
 
        if name is None:
202
 
            name = "HEAD"
203
 
        return RemoteGitBranch(self, repo, name, self._lockfiles)
 
216
        refname = self._branch_name_to_ref(name)
 
217
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
204
218
 
205
219
    def open_workingtree(self, recommend_upgrade=False):
206
220
        raise NotLocalUrl(self.transport.base)
221
235
    @property
222
236
    def data(self):
223
237
        if self._data is None:
224
 
            self._data = PackData(self._data_path)
 
238
            self._data = ThinPackData(self.resolve_ext_ref, self._data_path)
225
239
        return self._data
226
240
 
227
241
    @property
232
246
                try:
233
247
                    def report_progress(cur, total):
234
248
                        pb.update("generating index", cur, total)
235
 
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
249
                    self.data.create_index(self._idx_path, 
236
250
                        progress=report_progress)
237
251
                finally:
238
252
                    pb.finished()
298
312
        except InvalidRevisionId:
299
313
            raise NoSuchRevision(self, bzr_revid)
300
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
 
301
324
 
302
325
class RemoteGitTagDict(tag.BasicTags):
303
326
 
319
342
class RemoteGitBranch(GitBranch):
320
343
 
321
344
    def __init__(self, bzrdir, repository, name, lockfiles):
322
 
        self._ref = None
 
345
        self._sha = None
323
346
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
324
347
                lockfiles)
325
348
 
327
350
        raise GitSmartRemoteNotSupported()
328
351
 
329
352
    def last_revision(self):
330
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
353
        return self.lookup_foreign_revision_id(self.head)
331
354
 
332
355
    def _get_config(self):
333
356
        class EmptyConfig(object):
339
362
 
340
363
    @property
341
364
    def head(self):
342
 
        if self._ref is not None:
343
 
            return self._ref
 
365
        if self._sha is not None:
 
366
            return self._sha
344
367
        heads = self.repository.get_refs()
345
 
        if not self.name in heads:
 
368
        name = self.bzrdir._branch_name_to_ref(self.name, "HEAD")
 
369
        if name in heads:
 
370
            self._sha = heads[name]
 
371
        else:
346
372
            raise NoSuchRef(self.name)
347
 
        self._ref = heads[self.name]
348
 
        return self._ref
 
373
        return self._sha
349
374
 
350
375
    def _synchronize_history(self, destination, revision_id):
351
376
        """See Branch._synchronize_history()."""