/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 number of arguments.

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
21
    ui,
23
22
    urlutils,
24
23
    )
29
28
    NoSuchRevision,
30
29
    NotLocalUrl,
31
30
    )
 
31
from bzrlib.trace import (
 
32
    info,
 
33
    )
32
34
from bzrlib.transport import (
33
35
    Transport,
34
36
    )
40
42
 
41
43
from bzrlib.plugins.git.branch import (
42
44
    GitBranch,
 
45
    extract_tags,
43
46
    )
44
47
from bzrlib.plugins.git.errors import (
45
48
    GitSmartRemoteNotSupported,
52
55
    mapping_registry,
53
56
    )
54
57
from bzrlib.plugins.git.repository import (
 
58
    GitRepositoryFormat,
55
59
    GitRepository,
56
60
    )
57
 
from bzrlib.plugins.git.refs import (
58
 
    extract_tags,
59
 
    branch_name_to_ref,
60
 
    )
61
61
 
62
62
import dulwich as git
63
63
from dulwich.errors import (
65
65
    )
66
66
from dulwich.pack import (
67
67
    Pack,
68
 
    ThinPackData,
 
68
    PackData,
69
69
    )
70
70
import os
71
71
import tempfile
72
72
import urllib
73
73
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
 
74
 
 
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 
80
82
# a full implementation of Transport
81
83
def get_test_permutations():
82
84
    return []
83
85
 
84
86
 
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
87
class GitSmartTransport(Transport):
101
88
 
102
89
    def __init__(self, url, _client=None):
103
90
        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)
 
91
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
 
92
        hostport, self._path = urllib.splithost(loc)
 
93
        (self._username, hostport) = urllib.splituser(hostport)
 
94
        (self._host, self._port) = urllib.splitnport(hostport, None)
109
95
        self._client = _client
110
96
 
111
97
    def external_url(self):
123
109
    def fetch_pack(self, determine_wants, graph_walker, pack_data, progress=None):
124
110
        if progress is None:
125
111
            def progress(text):
126
 
                trace.info("git: %s" % text)
 
112
                info("git: %s" % text)
127
113
        client = self._get_client(thin_packs=False)
128
114
        try:
129
 
            return client.fetch_pack(self._get_path(), determine_wants,
 
115
            return client.fetch_pack(self._get_path(), determine_wants, 
130
116
                graph_walker, pack_data, progress)
131
117
        except GitProtocolError, e:
132
118
            raise BzrError(e)
134
120
    def send_pack(self, get_changed_refs, generate_pack_contents):
135
121
        client = self._get_client(thin_packs=False)
136
122
        try:
137
 
            return client.send_pack(self._get_path(), get_changed_refs,
 
123
            return client.send_pack(self._get_path(), get_changed_refs, 
138
124
                generate_pack_contents)
139
125
        except GitProtocolError, e:
140
126
            raise BzrError(e)
164
150
            ret = self._client
165
151
            self._client = None
166
152
            return ret
167
 
        return git.client.TCPGitClient(self._host, self._port,
168
 
            thin_packs=thin_packs, report_activity=self._report_activity)
 
153
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
 
154
            report_activity=self._report_activity)
169
155
 
170
156
 
171
157
class SSHGitSmartTransport(GitSmartTransport):
182
168
            ret = self._client
183
169
            self._client = None
184
170
            return ret
185
 
        location_config = config.LocationConfig(self.base)
186
 
        client = git.client.SSHGitClient(self._host, self._port, self._username,
 
171
        return git.client.SSHGitClient(self._host, self._port, self._username,
187
172
            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
196
173
 
197
174
 
198
175
class RemoteGitDir(GitDir):
204
181
        self._lockfiles = lockfiles
205
182
        self._mode_check_done = None
206
183
 
207
 
    def _branch_name_to_ref(self, name, default=None):
208
 
        return branch_name_to_ref(name, default=default)
209
 
 
210
184
    def open_repository(self):
211
185
        return RemoteGitRepository(self, self._lockfiles)
212
186
 
213
 
    def _open_branch(self, name=None, ignore_fallbacks=False, 
214
 
                    unsupported=False):
 
187
    def open_branch(self, ignore_fallbacks=False):
215
188
        repo = self.open_repository()
216
 
        refname = self._branch_name_to_ref(name)
217
 
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
 
189
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
 
190
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
218
191
 
219
 
    def open_workingtree(self, recommend_upgrade=False):
 
192
    def open_workingtree(self):
220
193
        raise NotLocalUrl(self.transport.base)
221
194
 
222
195
 
233
206
        self.resolve_ext_ref = resolve_ext_ref
234
207
 
235
208
    @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
209
    def index(self):
243
210
        if self._idx is None:
244
211
            if not os.path.exists(self._idx_path):
246
213
                try:
247
214
                    def report_progress(cur, total):
248
215
                        pb.update("generating index", cur, total)
249
 
                    self.data.create_index(self._idx_path, 
 
216
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
250
217
                        progress=report_progress)
251
218
                finally:
252
219
                    pb.finished()
254
221
        return self._idx
255
222
 
256
223
    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)
 
224
        os.remove(self._data_path)
 
225
        os.remove(self._idx_path)
263
226
 
264
227
 
265
228
class RemoteGitRepository(GitRepository):
283
246
    def get_refs(self):
284
247
        if self._refs is not None:
285
248
            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))
 
249
        self._refs = self.bzrdir.root_transport.fetch_pack(lambda x: [], None, 
 
250
            lambda x: None, lambda x: mutter("git: %s" % x))
288
251
        return self._refs
289
252
 
290
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
 
253
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
291
254
                   progress=None):
292
255
        return self._transport.fetch_pack(determine_wants, graph_walker,
293
256
                                          pack_data, progress)
295
258
    def send_pack(self, get_changed_refs, generate_pack_contents):
296
259
        return self._transport.send_pack(get_changed_refs, generate_pack_contents)
297
260
 
298
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
299
 
                      progress=None):
 
261
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
300
262
        fd, path = tempfile.mkstemp(suffix=".pack")
301
 
        self.fetch_pack(determine_wants, graph_walker,
302
 
            lambda x: os.write(fd, x), progress)
 
263
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
303
264
        os.close(fd)
304
265
        if os.path.getsize(path) == 0:
305
266
            return EmptyObjectStoreIterator()
306
267
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
307
268
 
308
 
    def lookup_bzr_revision_id(self, bzr_revid):
 
269
    def lookup_git_revid(self, bzr_revid):
309
270
        # This won't work for any round-tripped bzr revisions, but it's a start..
310
271
        try:
311
272
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
312
273
        except InvalidRevisionId:
313
274
            raise NoSuchRevision(self, bzr_revid)
314
275
 
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
276
 
325
277
class RemoteGitTagDict(tag.BasicTags):
326
278
 
329
281
        self.repository = branch.repository
330
282
 
331
283
    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
 
284
        return extract_tags(self.repository.get_refs(), self.branch.mapping)
336
285
 
337
286
    def set_tag(self, name, revid):
338
287
        # FIXME: Not supported yet, should do a push of a new ref
342
291
class RemoteGitBranch(GitBranch):
343
292
 
344
293
    def __init__(self, bzrdir, repository, name, lockfiles):
345
 
        self._sha = None
346
 
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
 
294
        self._ref = None
 
295
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, 
347
296
                lockfiles)
348
297
 
349
298
    def revision_history(self):
350
299
        raise GitSmartRemoteNotSupported()
351
300
 
352
301
    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()
 
302
        return self.mapping.revision_id_foreign_to_bzr(self.head)
362
303
 
363
304
    @property
364
305
    def head(self):
365
 
        if self._sha is not None:
366
 
            return self._sha
 
306
        if self._ref is not None:
 
307
            return self._ref
367
308
        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
 
309
        if not self.name in heads:
 
310
            raise NoSuchRef(name)
 
311
        self._ref = heads[self.name]
 
312
        return self._ref
374
313
 
375
314
    def _synchronize_history(self, destination, revision_id):
376
315
        """See Branch._synchronize_history()."""
377
316
        destination.generate_revision_history(self.last_revision())
378
 
 
 
317
 
379
318
    def get_push_location(self):
380
319
        return None
381
320