/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

  • Committer: Jelmer Vernooij
  • Date: 2009-03-28 22:27:07 UTC
  • mto: (0.200.305 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090328222707-n0y980ntev40xqd2
Fix blob lookup.

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
 
    config,
19
 
    debug,
 
19
    branch,
20
20
    tag,
21
 
    trace,
22
 
    ui,
23
21
    urlutils,
24
22
    )
 
23
from bzrlib.bzrdir import (
 
24
    BzrDir,
 
25
    BzrDirFormat,
 
26
    )
25
27
from bzrlib.errors import (
26
28
    BzrError,
27
 
    InvalidRevisionId,
28
29
    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
    )
32
41
from bzrlib.transport import (
33
42
    Transport,
34
43
    )
42
51
    GitBranch,
43
52
    )
44
53
from bzrlib.plugins.git.errors import (
45
 
    GitSmartRemoteNotSupported,
46
54
    NoSuchRef,
47
55
    )
48
56
from bzrlib.plugins.git.dir import (
49
57
    GitDir,
50
58
    )
51
 
from bzrlib.plugins.git.mapping import (
52
 
    mapping_registry,
 
59
from bzrlib.plugins.git.foreign import (
 
60
    ForeignBranch,
53
61
    )
54
62
from bzrlib.plugins.git.repository import (
 
63
    GitRepositoryFormat,
55
64
    GitRepository,
56
65
    )
57
 
from bzrlib.plugins.git.refs import (
58
 
    extract_tags,
59
 
    branch_name_to_ref,
60
 
    )
61
66
 
62
67
import dulwich as git
63
68
from dulwich.errors import (
65
70
    )
66
71
from dulwich.pack import (
67
72
    Pack,
68
 
    ThinPackData,
 
73
    PackData,
 
74
    PackIndex,
69
75
    )
70
76
import os
71
77
import tempfile
72
78
import urllib
73
79
import urlparse
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
 
80
 
 
81
 
 
82
# Don't run any tests on GitSmartTransport as it is not intended to be 
80
83
# a full implementation of Transport
81
84
def get_test_permutations():
82
85
    return []
83
86
 
84
87
 
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
88
class GitSmartTransport(Transport):
101
89
 
102
90
    def __init__(self, url, _client=None):
103
91
        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)
 
92
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
 
93
        assert scheme == "git"
 
94
        hostport, self._path = urllib.splithost(loc)
 
95
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
109
96
        self._client = _client
110
97
 
111
 
    def external_url(self):
112
 
        return self.base
113
 
 
114
98
    def has(self, relpath):
115
99
        return False
116
100
 
117
 
    def _get_client(self, thin_packs):
118
 
        raise NotImplementedError(self._get_client)
119
 
 
120
 
    def _get_path(self):
121
 
        return self._path
 
101
    def _get_client(self):
 
102
        if self._client is not None:
 
103
            ret = self._client
 
104
            self._client = None
 
105
            return ret
 
106
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
122
107
 
123
108
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
124
109
        if progress is None:
125
110
            def progress(text):
126
 
                trace.info("git: %s" % text)
127
 
        client = self._get_client(thin_packs=False)
 
111
                info("git: %s" % text)
 
112
        client = self._get_client()
128
113
        try:
129
 
            return client.fetch_pack(self._get_path(), determine_wants,
 
114
            client.fetch_pack(self._path, determine_wants, 
130
115
                graph_walker, pack_data, progress)
131
116
        except GitProtocolError, e:
132
117
            raise BzrError(e)
133
118
 
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
 
 
142
119
    def get(self, path):
143
120
        raise NoSuchFile(path)
144
121
 
152
129
        else:
153
130
            newurl = urlutils.join(self.base, offset)
154
131
 
155
 
        return self.__class__(newurl, self._client)
156
 
 
157
 
 
158
 
class TCPGitSmartTransport(GitSmartTransport):
159
 
 
160
 
    _scheme = 'git'
161
 
 
162
 
    def _get_client(self, thin_packs):
163
 
        if self._client is not None:
164
 
            ret = self._client
165
 
            self._client = None
166
 
            return ret
167
 
        return git.client.TCPGitClient(self._host, self._port,
168
 
            thin_packs=thin_packs, report_activity=self._report_activity)
169
 
 
170
 
 
171
 
class SSHGitSmartTransport(GitSmartTransport):
172
 
 
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):
181
 
        if self._client is not None:
182
 
            ret = self._client
183
 
            self._client = None
184
 
            return ret
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
 
132
        return GitSmartTransport(newurl, self._client)
196
133
 
197
134
 
198
135
class RemoteGitDir(GitDir):
202
139
        self.root_transport = transport
203
140
        self.transport = transport
204
141
        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)
209
142
 
210
143
    def open_repository(self):
211
144
        return RemoteGitRepository(self, self._lockfiles)
212
145
 
213
 
    def _open_branch(self, name=None, ignore_fallbacks=False, 
214
 
                    unsupported=False):
 
146
    def open_branch(self, _unsupported=False):
215
147
        repo = self.open_repository()
216
 
        refname = self._branch_name_to_ref(name)
217
 
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
 
148
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
 
149
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
218
150
 
219
 
    def open_workingtree(self, recommend_upgrade=False):
 
151
    def open_workingtree(self):
220
152
        raise NotLocalUrl(self.transport.base)
221
153
 
222
154
 
229
161
class TemporaryPackIterator(Pack):
230
162
 
231
163
    def __init__(self, path, resolve_ext_ref):
 
164
        self.resolve_ext_ref = resolve_ext_ref
232
165
        super(TemporaryPackIterator, self).__init__(path)
233
 
        self.resolve_ext_ref = resolve_ext_ref
234
 
 
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
242
 
    def index(self):
 
166
 
 
167
    @property
 
168
    def idx(self):
243
169
        if self._idx is None:
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()
253
 
            self._idx = load_pack_index(self._idx_path)
 
170
            if self._data is None:
 
171
                self._data = PackData(self._data_path)
 
172
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
173
            self._idx = PackIndex(self._idx_path)
254
174
        return self._idx
255
175
 
256
176
    def __del__(self):
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)
 
177
        os.remove(self._data_path)
 
178
        os.remove(self._idx_path)
263
179
 
264
180
 
265
181
class RemoteGitRepository(GitRepository):
268
184
        GitRepository.__init__(self, gitdir, lockfiles)
269
185
        self._refs = None
270
186
 
271
 
    @property
272
 
    def inventories(self):
273
 
        raise GitSmartRemoteNotSupported()
274
 
 
275
 
    @property
276
 
    def revisions(self):
277
 
        raise GitSmartRemoteNotSupported()
278
 
 
279
 
    @property
280
 
    def texts(self):
281
 
        raise GitSmartRemoteNotSupported()
282
 
 
283
187
    def get_refs(self):
284
188
        if self._refs is not None:
285
189
            return self._refs
286
 
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None,
287
 
            lambda x: None, lambda x: trace.mutter("git: %s" % x))
 
190
        def determine_wants(heads):
 
191
            self._refs = heads
 
192
            return []
 
193
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
 
194
            lambda x: None, lambda x: mutter("git: %s" % x))
288
195
        return self._refs
289
196
 
290
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
 
197
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
291
198
                   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):
 
199
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
 
200
            progress)
 
201
 
 
202
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
300
203
        fd, path = tempfile.mkstemp(suffix=".pack")
301
 
        self.fetch_pack(determine_wants, graph_walker,
302
 
            lambda x: os.write(fd, x), progress)
 
204
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
303
205
        os.close(fd)
304
206
        if os.path.getsize(path) == 0:
305
207
            return EmptyObjectStoreIterator()
306
208
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
307
209
 
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
 
 
324
210
 
325
211
class RemoteGitTagDict(tag.BasicTags):
326
212
 
329
215
        self.repository = branch.repository
330
216
 
331
217
    def get_tag_dict(self):
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
 
218
        ret = {}
 
219
        refs = self.repository.get_refs()
 
220
        for k,v in refs.iteritems():
 
221
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
222
                v = refs.get(k+"^{}", v)
 
223
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
224
        return ret
336
225
 
337
226
    def set_tag(self, name, revid):
338
227
        # FIXME: Not supported yet, should do a push of a new ref
342
231
class RemoteGitBranch(GitBranch):
343
232
 
344
233
    def __init__(self, bzrdir, repository, name, lockfiles):
345
 
        self._sha = None
346
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
347
 
                lockfiles)
348
 
 
349
 
    def revision_history(self):
350
 
        raise GitSmartRemoteNotSupported()
 
234
        heads = repository.get_refs()
 
235
        if not name in heads:
 
236
            raise NoSuchRef(name)
 
237
        self._ref = heads[name]
 
238
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
351
239
 
352
240
    def last_revision(self):
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
 
241
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
374
242
 
375
243
    def _synchronize_history(self, destination, revision_id):
376
244
        """See Branch._synchronize_history()."""
377
245
        destination.generate_revision_history(self.last_revision())
378
 
 
379
 
    def get_push_location(self):
380
 
        return None
381
 
 
382
 
    def set_push_location(self, url):
383
 
        pass
 
246