/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

Add more tests for fetch code.

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
 
18
from bzrlib import branch, tag, urlutils
19
19
from bzrlib.bzrdir import BzrDir, BzrDirFormat
20
 
from bzrlib.errors import NoSuchFile, NotLocalUrl
 
20
from bzrlib.errors import BzrError, NoSuchFile, NotLocalUrl
21
21
from bzrlib.lockable_files import TransportLock
22
22
from bzrlib.repository import Repository
23
23
from bzrlib.trace import info
38
38
import urlparse
39
39
 
40
40
import dulwich as git
41
 
from dulwich.pack import PackData, Pack
 
41
from dulwich.errors import GitProtocolError
 
42
from dulwich.pack import PackData, Pack, PackIndex
42
43
 
43
44
# Don't run any tests on GitSmartTransport as it is not intended to be 
44
45
# a full implementation of Transport
56
57
        (self._host, self._port) = urllib.splitnport(hostport, git.protocol.TCP_GIT_PORT)
57
58
        self._client = _client
58
59
 
 
60
    def has(self, relpath):
 
61
        return False
 
62
 
59
63
    def _get_client(self):
60
64
        if self._client is not None:
61
65
            ret = self._client
62
66
            self._client = None
63
67
            return ret
64
 
        return git.client.TCPGitClient(self._host, self._port)
 
68
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False)
65
69
 
66
70
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
67
71
        if progress is None:
68
72
            def progress(text):
69
73
                info("git: %s" % text)
70
 
        self._get_client().fetch_pack(self._path, determine_wants, 
71
 
            graph_walker, pack_data, progress)
 
74
        client = self._get_client()
 
75
        try:
 
76
            client.fetch_pack(self._path, determine_wants, 
 
77
                graph_walker, pack_data, progress)
 
78
        except GitProtocolError, e:
 
79
            raise BzrError(e)
72
80
 
73
81
    def get(self, path):
74
82
        raise NoSuchFile(path)
106
114
        raise NotLocalUrl(self.transport.base)
107
115
 
108
116
 
 
117
class EmptyObjectStoreIterator(dict):
 
118
 
 
119
    def iterobjects(self):
 
120
        return []
 
121
 
 
122
 
 
123
class TemporaryPackIterator(Pack):
 
124
 
 
125
    def __init__(self, path, resolve_ext_ref):
 
126
        self.resolve_ext_ref = resolve_ext_ref
 
127
        super(TemporaryPackIterator, self).__init__(path)
 
128
 
 
129
    @property
 
130
    def idx(self):
 
131
        if self._idx is None:
 
132
            self._data.create_index_v2(self._idx_path, self.resolve_ext_ref)
 
133
            self._idx = PackIndex(self._idx_path)
 
134
        return self._idx
 
135
 
 
136
    def __del__(self):
 
137
        os.remove(self._data_path)
 
138
        os.remove(self._idx_path)
 
139
 
 
140
 
109
141
class RemoteGitRepository(GitRepository):
110
142
 
111
143
    def __init__(self, gitdir, lockfiles):
112
144
        GitRepository.__init__(self, gitdir, lockfiles)
 
145
        self._refs = None
 
146
 
 
147
    def get_refs(self):
 
148
        if self._refs is not None:
 
149
            return self._refs
 
150
        def determine_wants(heads):
 
151
            self._refs = heads
 
152
            return []
 
153
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
 
154
            lambda x: None, lambda x: mutter("git: %s" % x))
 
155
        return self._refs
113
156
 
114
157
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
115
158
                   progress=None):
116
159
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
117
160
            progress)
118
161
 
119
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
162
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
120
163
        fd, path = tempfile.mkstemp(suffix=".pack")
121
164
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
122
165
        os.close(fd)
123
 
        basename = path[:-len(".pack")]
124
 
        p = PackData(path)
125
 
        p.create_index_v2(basename+".idx")
126
 
        pack = Pack(basename)
127
 
        os.remove(path)
128
 
        return (len(p), pack.iterobjects())
 
166
        if os.path.getsize(path) == 0:
 
167
            return EmptyObjectStoreIterator()
 
168
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
 
169
 
 
170
 
 
171
class RemoteGitTagDict(tag.BasicTags):
 
172
 
 
173
    def __init__(self, branch):
 
174
        self.branch = branch
 
175
        self.repository = branch.repository
 
176
 
 
177
    def get_tag_dict(self):
 
178
        ret = {}
 
179
        refs = self.repository.get_refs()
 
180
        for k,v in refs.iteritems():
 
181
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
182
                v = refs.get(k+"^{}", v)
 
183
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
184
        return ret
 
185
 
 
186
    def set_tag(self, name, revid):
 
187
        # FIXME: Not supported yet, should do a push of a new ref
 
188
        raise NotImplementedError(self.set_tag)
129
189
 
130
190
 
131
191
class RemoteGitBranch(GitBranch):
132
192
 
133
193
    def __init__(self, bzrdir, repository, name, lockfiles):
134
 
        def determine_wants(heads):
135
 
            if not name in heads:
136
 
                raise NoSuchRef(name)
137
 
            self._ref = heads[name]
138
 
        bzrdir.root_transport.fetch_pack(determine_wants, None, lambda x: None, 
139
 
                             lambda x: mutter("git: %s" % x))
 
194
        heads = repository.get_refs()
 
195
        if not name in heads:
 
196
            raise NoSuchRef(name)
 
197
        self._ref = heads[name]
140
198
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
141
199
 
142
200
    def last_revision(self):