/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

Keep inventory entry children around once we've fetched them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
1
 
# Copyright (C) 2007-2008 Canonical Ltd
 
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
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import bzrlib
18
 
from bzrlib import urlutils
19
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
20
 
from bzrlib.errors import NoSuchFile, NotLocalUrl
21
 
from bzrlib.lockable_files import TransportLock
22
 
from bzrlib.repository import Repository
23
 
from bzrlib.trace import info
24
 
from bzrlib.transport import Transport
25
 
 
26
 
from bzrlib.plugins.git import git
27
 
from bzrlib.plugins.git.branch import GitBranch
28
 
from bzrlib.plugins.git.dir import GitDir
29
 
from bzrlib.plugins.git.foreign import ForeignBranch
30
 
from bzrlib.plugins.git.repository import GitFormat, GitRepository
31
 
 
 
18
from bzrlib import (
 
19
    branch,
 
20
    tag,
 
21
    ui,
 
22
    urlutils,
 
23
    )
 
24
from bzrlib.errors import (
 
25
    BzrError,
 
26
    InvalidRevisionId,
 
27
    NoSuchFile,
 
28
    NoSuchRevision,
 
29
    NotLocalUrl,
 
30
    )
 
31
from bzrlib.trace import (
 
32
    info,
 
33
    )
 
34
from bzrlib.transport import (
 
35
    Transport,
 
36
    )
 
37
 
 
38
from bzrlib.plugins.git import (
 
39
    lazy_check_versions,
 
40
    )
 
41
lazy_check_versions()
 
42
 
 
43
from bzrlib.plugins.git.branch import (
 
44
    GitBranch,
 
45
    extract_tags,
 
46
    )
 
47
from bzrlib.plugins.git.errors import (
 
48
    GitSmartRemoteNotSupported,
 
49
    NoSuchRef,
 
50
    )
 
51
from bzrlib.plugins.git.dir import (
 
52
    GitDir,
 
53
    )
 
54
from bzrlib.plugins.git.mapping import (
 
55
    mapping_registry,
 
56
    )
 
57
from bzrlib.plugins.git.repository import (
 
58
    GitRepositoryFormat,
 
59
    GitRepository,
 
60
    )
 
61
 
 
62
import dulwich as git
 
63
from dulwich.errors import (
 
64
    GitProtocolError,
 
65
    )
 
66
from dulwich.pack import (
 
67
    Pack,
 
68
    PackData,
 
69
    )
 
70
import os
 
71
import tempfile
32
72
import urllib
33
73
import urlparse
34
74
 
35
 
from dulwich.pack import PackData
 
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 
 
82
# a full implementation of Transport
 
83
def get_test_permutations():
 
84
    return []
36
85
 
37
86
 
38
87
class GitSmartTransport(Transport):
40
89
    def __init__(self, url, _client=None):
41
90
        Transport.__init__(self, url)
42
91
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
43
 
        assert scheme == "git"
44
92
        hostport, self._path = urllib.splithost(loc)
45
 
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
46
 
        if _client is not None:
47
 
            self._client = _client
48
 
        else:
49
 
            self._client = git.client.TCPGitClient(self._host, self._port)
 
93
        (self._username, hostport) = urllib.splituser(hostport)
 
94
        (self._host, self._port) = urllib.splitnport(hostport, None)
 
95
        self._client = _client
 
96
 
 
97
    def external_url(self):
 
98
        return self.base
 
99
 
 
100
    def has(self, relpath):
 
101
        return False
 
102
 
 
103
    def _get_client(self, thin_packs):
 
104
        raise NotImplementedError(self._get_client)
 
105
 
 
106
    def _get_path(self):
 
107
        return self._path
50
108
 
51
109
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
52
110
        if progress is None:
53
111
            def progress(text):
54
112
                info("git: %s" % text)
55
 
        self._client.fetch_pack(self._path, determine_wants, graph_walker, 
56
 
                pack_data, progress)
 
113
        client = self._get_client(thin_packs=False)
 
114
        try:
 
115
            return client.fetch_pack(self._get_path(), determine_wants, 
 
116
                graph_walker, pack_data, progress)
 
117
        except GitProtocolError, e:
 
118
            raise BzrError(e)
57
119
 
58
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
59
 
        fd, path = tempfile.mkstemp(dir=self.pack_dir(), suffix=".pack")
60
 
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
61
 
        os.close(fd)
 
120
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
121
        client = self._get_client(thin_packs=False)
62
122
        try:
63
 
            p = PackData(path)
64
 
            for o in p.iterobjects():
65
 
                yield o
66
 
        finally:
67
 
            os.remove(path)
 
123
            return client.send_pack(self._get_path(), get_changed_refs, 
 
124
                generate_pack_contents)
 
125
        except GitProtocolError, e:
 
126
            raise BzrError(e)
68
127
 
69
128
    def get(self, path):
70
129
        raise NoSuchFile(path)
71
130
 
 
131
    def abspath(self, relpath):
 
132
        return urlutils.join(self.base, relpath)
 
133
 
72
134
    def clone(self, offset=None):
73
135
        """See Transport.clone()."""
74
136
        if offset is None:
76
138
        else:
77
139
            newurl = urlutils.join(self.base, offset)
78
140
 
79
 
        return GitSmartTransport(newurl, self._client)
 
141
        return self.__class__(newurl, self._client)
 
142
 
 
143
 
 
144
class TCPGitSmartTransport(GitSmartTransport):
 
145
 
 
146
    _scheme = 'git'
 
147
 
 
148
    def _get_client(self, thin_packs):
 
149
        if self._client is not None:
 
150
            ret = self._client
 
151
            self._client = None
 
152
            return ret
 
153
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
 
154
            report_activity=self._report_activity)
 
155
 
 
156
 
 
157
class SSHGitSmartTransport(GitSmartTransport):
 
158
 
 
159
    _scheme = 'git+ssh'
 
160
 
 
161
    def _get_path(self):
 
162
        if self._path.startswith("/~/"):
 
163
            return self._path[3:]
 
164
        return self._path
 
165
 
 
166
    def _get_client(self, thin_packs):
 
167
        if self._client is not None:
 
168
            ret = self._client
 
169
            self._client = None
 
170
            return ret
 
171
        return git.client.SSHGitClient(self._host, self._port, self._username,
 
172
            thin_packs=thin_packs, report_activity=self._report_activity)
80
173
 
81
174
 
82
175
class RemoteGitDir(GitDir):
86
179
        self.root_transport = transport
87
180
        self.transport = transport
88
181
        self._lockfiles = lockfiles
 
182
        self._mode_check_done = None
89
183
 
90
184
    def open_repository(self):
91
185
        return RemoteGitRepository(self, self._lockfiles)
92
186
 
93
 
    def open_branch(self):
 
187
    def open_branch(self, ignore_fallbacks=False):
94
188
        repo = self.open_repository()
95
189
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
96
190
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
99
193
        raise NotLocalUrl(self.transport.base)
100
194
 
101
195
 
 
196
class EmptyObjectStoreIterator(dict):
 
197
 
 
198
    def iterobjects(self):
 
199
        return []
 
200
 
 
201
 
 
202
class TemporaryPackIterator(Pack):
 
203
 
 
204
    def __init__(self, path, resolve_ext_ref):
 
205
        super(TemporaryPackIterator, self).__init__(path)
 
206
        self.resolve_ext_ref = resolve_ext_ref
 
207
 
 
208
    @property
 
209
    def index(self):
 
210
        if self._idx is None:
 
211
            if not os.path.exists(self._idx_path):
 
212
                pb = ui.ui_factory.nested_progress_bar()
 
213
                try:
 
214
                    def report_progress(cur, total):
 
215
                        pb.update("generating index", cur, total)
 
216
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
217
                        progress=report_progress)
 
218
                finally:
 
219
                    pb.finished()
 
220
            self._idx = load_pack_index(self._idx_path)
 
221
        return self._idx
 
222
 
 
223
    def __del__(self):
 
224
        os.remove(self._data_path)
 
225
        os.remove(self._idx_path)
 
226
 
 
227
 
102
228
class RemoteGitRepository(GitRepository):
103
229
 
104
230
    def __init__(self, gitdir, lockfiles):
105
231
        GitRepository.__init__(self, gitdir, lockfiles)
 
232
        self._refs = None
 
233
 
 
234
    @property
 
235
    def inventories(self):
 
236
        raise GitSmartRemoteNotSupported()
 
237
 
 
238
    @property
 
239
    def revisions(self):
 
240
        raise GitSmartRemoteNotSupported()
 
241
 
 
242
    @property
 
243
    def texts(self):
 
244
        raise GitSmartRemoteNotSupported()
 
245
 
 
246
    def get_refs(self):
 
247
        if self._refs is not None:
 
248
            return self._refs
 
249
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None, 
 
250
            lambda x: None, lambda x: mutter("git: %s" % x))
 
251
        return self._refs
106
252
 
107
253
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
108
254
                   progress=None):
109
 
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
110
 
            progress)
 
255
        return self._transport.fetch_pack(determine_wants, graph_walker,
 
256
                                          pack_data, progress)
 
257
 
 
258
    def send_pack(self, get_changed_refs, generate_pack_contents):
 
259
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
 
260
 
 
261
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
262
        fd, path = tempfile.mkstemp(suffix=".pack")
 
263
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
 
264
        os.close(fd)
 
265
        if os.path.getsize(path) == 0:
 
266
            return EmptyObjectStoreIterator()
 
267
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
268
 
 
269
    def lookup_git_revid(self, bzr_revid):
 
270
        # This won't work for any round-tripped bzr revisions, but it's a start..
 
271
        try:
 
272
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
273
        except InvalidRevisionId:
 
274
            raise NoSuchRevision(self, bzr_revid)
 
275
 
 
276
 
 
277
class RemoteGitTagDict(tag.BasicTags):
 
278
 
 
279
    def __init__(self, branch):
 
280
        self.branch = branch
 
281
        self.repository = branch.repository
 
282
 
 
283
    def get_tag_dict(self):
 
284
        return extract_tags(self.repository.get_refs(), self.branch.mapping)
 
285
 
 
286
    def set_tag(self, name, revid):
 
287
        # FIXME: Not supported yet, should do a push of a new ref
 
288
        raise NotImplementedError(self.set_tag)
111
289
 
112
290
 
113
291
class RemoteGitBranch(GitBranch):
114
292
 
115
293
    def __init__(self, bzrdir, repository, name, lockfiles):
116
 
        def determine_wants(heads):
117
 
            self._ref = heads[name]
118
 
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
119
 
                             lambda x: mutter("git: %s" % x))
120
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
 
294
        self._ref = None
 
295
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, 
 
296
                lockfiles)
 
297
 
 
298
    def revision_history(self):
 
299
        raise GitSmartRemoteNotSupported()
121
300
 
122
301
    def last_revision(self):
123
 
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
124
 
 
 
302
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
303
 
 
304
    @property
 
305
    def head(self):
 
306
        if self._ref is not None:
 
307
            return self._ref
 
308
        heads = self.repository.get_refs()
 
309
        if not self.name in heads:
 
310
            raise NoSuchRef(name)
 
311
        self._ref = heads[self.name]
 
312
        return self._ref
 
313
 
 
314
    def _synchronize_history(self, destination, revision_id):
 
315
        """See Branch._synchronize_history()."""
 
316
        destination.generate_revision_history(self.last_revision())
 
317
 
 
318
    def get_push_location(self):
 
319
        return None
 
320
 
 
321
    def set_push_location(self, url):
 
322
        pass