/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

Fix tests.

Show diffs side-by-side

added added

removed removed

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