/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

Merge fixes for SHA1s of symlinks.

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
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
17
18
from bzrlib import (
18
19
    config,
19
 
    debug,
20
20
    tag,
21
21
    trace,
22
22
    ui,
29
29
    NoSuchRevision,
30
30
    NotLocalUrl,
31
31
    )
 
32
from bzrlib.trace import (
 
33
    info,
 
34
    )
32
35
from bzrlib.transport import (
33
36
    Transport,
34
37
    )
40
43
 
41
44
from bzrlib.plugins.git.branch import (
42
45
    GitBranch,
 
46
    extract_tags,
43
47
    )
44
48
from bzrlib.plugins.git.errors import (
45
49
    GitSmartRemoteNotSupported,
54
58
from bzrlib.plugins.git.repository import (
55
59
    GitRepository,
56
60
    )
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
 
    ThinPackData,
 
68
    PackData,
69
69
    )
70
70
import os
71
71
import tempfile
72
72
import urllib
73
73
import urlparse
74
 
urlparse.uses_netloc.extend(['git', 'git+ssh'])
75
74
 
76
75
from dulwich.pack import load_pack_index
77
76
 
82
81
    return []
83
82
 
84
83
 
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
 
 
100
84
class GitSmartTransport(Transport):
101
85
 
102
86
    def __init__(self, url, _client=None):
103
87
        Transport.__init__(self, url)
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)
 
88
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
 
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)
109
93
        self._client = _client
110
94
 
111
95
    def external_url(self):
123
107
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
124
108
        if progress is None:
125
109
            def progress(text):
126
 
                trace.info("git: %s" % text)
 
110
                info("git: %s" % text)
127
111
        client = self._get_client(thin_packs=False)
128
112
        try:
129
113
            return client.fetch_pack(self._get_path(), determine_wants,
164
148
            ret = self._client
165
149
            self._client = None
166
150
            return ret
167
 
        return git.client.TCPGitClient(self._host, self._port,
168
 
            thin_packs=thin_packs, report_activity=self._report_activity)
 
151
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
 
152
            report_activity=self._report_activity)
169
153
 
170
154
 
171
155
class SSHGitSmartTransport(GitSmartTransport):
182
166
            ret = self._client
183
167
            self._client = None
184
168
            return ret
185
 
        location_config = config.LocationConfig(self.base)
186
 
        client = git.client.SSHGitClient(self._host, self._port, self._username,
 
169
        return git.client.SSHGitClient(self._host, self._port, self._username,
187
170
            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
171
 
197
172
 
198
173
class RemoteGitDir(GitDir):
204
179
        self._lockfiles = lockfiles
205
180
        self._mode_check_done = None
206
181
 
207
 
    def _branch_name_to_ref(self, name, default=None):
208
 
        return branch_name_to_ref(name, default=default)
209
 
 
210
182
    def open_repository(self):
211
183
        return RemoteGitRepository(self, self._lockfiles)
212
184
 
213
 
    def _open_branch(self, name=None, ignore_fallbacks=False, 
214
 
                    unsupported=False):
 
185
    def open_branch(self, ignore_fallbacks=False):
215
186
        repo = self.open_repository()
216
 
        refname = self._branch_name_to_ref(name)
217
 
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
 
187
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
 
188
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
218
189
 
219
190
    def open_workingtree(self, recommend_upgrade=False):
220
191
        raise NotLocalUrl(self.transport.base)
235
206
    @property
236
207
    def data(self):
237
208
        if self._data is None:
238
 
            self._data = ThinPackData(self.resolve_ext_ref, self._data_path)
 
209
            self._data = PackData(self._data_path)
239
210
        return self._data
240
211
 
241
212
    @property
246
217
                try:
247
218
                    def report_progress(cur, total):
248
219
                        pb.update("generating index", cur, total)
249
 
                    self.data.create_index(self._idx_path, 
 
220
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
250
221
                        progress=report_progress)
251
222
                finally:
252
223
                    pb.finished()
312
283
        except InvalidRevisionId:
313
284
            raise NoSuchRevision(self, bzr_revid)
314
285
 
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
286
 
325
287
class RemoteGitTagDict(tag.BasicTags):
326
288
 
342
304
class RemoteGitBranch(GitBranch):
343
305
 
344
306
    def __init__(self, bzrdir, repository, name, lockfiles):
345
 
        self._sha = None
 
307
        self._ref = None
346
308
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
347
309
                lockfiles)
348
310
 
350
312
        raise GitSmartRemoteNotSupported()
351
313
 
352
314
    def last_revision(self):
353
 
        return self.lookup_foreign_revision_id(self.head)
 
315
        return self.mapping.revision_id_foreign_to_bzr(self.head)
354
316
 
355
317
    def _get_config(self):
356
318
        class EmptyConfig(object):
362
324
 
363
325
    @property
364
326
    def head(self):
365
 
        if self._sha is not None:
366
 
            return self._sha
 
327
        if self._ref is not None:
 
328
            return self._ref
367
329
        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:
 
330
        if not self.name in heads:
372
331
            raise NoSuchRef(self.name)
373
 
        return self._sha
 
332
        self._ref = heads[self.name]
 
333
        return self._ref
374
334
 
375
335
    def _synchronize_history(self, destination, revision_id):
376
336
        """See Branch._synchronize_history()."""