/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 issues pointed out by pyflakes.

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