/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

cope with branch argument to _warn_if_deprecated

Show diffs side-by-side

added added

removed removed

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