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