/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

Simplify checks against base hex sha a bit.

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
    )
 
24
from bzrlib.bzrdir import (
 
25
    BzrDir,
 
26
    BzrDirFormat,
 
27
    )
25
28
from bzrlib.errors import (
26
29
    BzrError,
27
 
    InvalidRevisionId,
28
30
    NoSuchFile,
29
 
    NoSuchRevision,
30
31
    NotLocalUrl,
31
32
    )
 
33
from bzrlib.foreign import (
 
34
    ForeignBranch,
 
35
    )
 
36
from bzrlib.lockable_files import (
 
37
    TransportLock,
 
38
    )
 
39
from bzrlib.repository import (
 
40
    Repository,
 
41
    )
 
42
from bzrlib.trace import (
 
43
    info,
 
44
    )
32
45
from bzrlib.transport import (
33
46
    Transport,
34
47
    )
48
61
from bzrlib.plugins.git.dir import (
49
62
    GitDir,
50
63
    )
51
 
from bzrlib.plugins.git.mapping import (
52
 
    mapping_registry,
53
 
    )
54
64
from bzrlib.plugins.git.repository import (
 
65
    GitRepositoryFormat,
55
66
    GitRepository,
56
67
    )
57
 
from bzrlib.plugins.git.refs import (
58
 
    extract_tags,
59
 
    branch_name_to_ref,
60
 
    )
61
68
 
62
69
import dulwich as git
63
70
from dulwich.errors import (
65
72
    )
66
73
from dulwich.pack import (
67
74
    Pack,
68
 
    ThinPackData,
 
75
    PackData,
69
76
    )
70
77
import os
71
78
import tempfile
72
79
import urllib
73
80
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
 
81
 
 
82
try:
 
83
    from dulwich.pack import load_pack_index
 
84
except ImportError:
 
85
    from dulwich.pack import PackIndex as load_pack_index
 
86
 
 
87
 
 
88
# Don't run any tests on GitSmartTransport as it is not intended to be 
80
89
# a full implementation of Transport
81
90
def get_test_permutations():
82
91
    return []
83
92
 
84
93
 
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
94
class GitSmartTransport(Transport):
101
95
 
102
96
    def __init__(self, url, _client=None):
103
97
        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)
 
98
        (scheme, _, loc, _, _) = urlparse.urlsplit(url)
 
99
        hostport, self._path = urllib.splithost(loc)
 
100
        (self._host, self._port) = urllib.splitnport(hostport, None)
109
101
        self._client = _client
110
102
 
111
 
    def external_url(self):
112
 
        return self.base
113
 
 
114
103
    def has(self, relpath):
115
104
        return False
116
105
 
117
 
    def _get_client(self, thin_packs):
 
106
    def _get_client(self):
118
107
        raise NotImplementedError(self._get_client)
119
108
 
120
 
    def _get_path(self):
121
 
        return self._path
122
 
 
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)
127
 
        client = self._get_client(thin_packs=False)
 
112
                info("git: %s" % text)
 
113
        client = self._get_client()
128
114
        try:
129
 
            return client.fetch_pack(self._get_path(), determine_wants,
 
115
            client.fetch_pack(self._path, determine_wants, 
130
116
                graph_walker, pack_data, progress)
131
117
        except GitProtocolError, e:
132
118
            raise BzrError(e)
133
119
 
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
120
    def get(self, path):
143
121
        raise NoSuchFile(path)
144
122
 
159
137
 
160
138
    _scheme = 'git'
161
139
 
162
 
    def _get_client(self, thin_packs):
 
140
    def _get_client(self):
163
141
        if self._client is not None:
164
142
            ret = self._client
165
143
            self._client = None
166
144
            return ret
167
 
        return git.client.TCPGitClient(self._host, self._port,
168
 
            thin_packs=thin_packs, report_activity=self._report_activity)
 
145
        return git.client.TCPGitClient(self._host, self._port, thin_packs=False,
 
146
            report_activity=self._report_activity)
169
147
 
170
148
 
171
149
class SSHGitSmartTransport(GitSmartTransport):
172
150
 
173
151
    _scheme = 'git+ssh'
174
152
 
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):
 
153
    def _get_client(self):
181
154
        if self._client is not None:
182
155
            ret = self._client
183
156
            self._client = None
184
157
            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
 
158
        return git.client.SSHGitClient(self._host, self._port, thin_packs=False,
 
159
            report_activity=self._report_activity)
196
160
 
197
161
 
198
162
class RemoteGitDir(GitDir):
202
166
        self.root_transport = transport
203
167
        self.transport = transport
204
168
        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
169
 
210
170
    def open_repository(self):
211
171
        return RemoteGitRepository(self, self._lockfiles)
212
172
 
213
 
    def _open_branch(self, name=None, ignore_fallbacks=False, 
214
 
                    unsupported=False):
 
173
    def open_branch(self, ignore_fallbacks=False):
215
174
        repo = self.open_repository()
216
 
        refname = self._branch_name_to_ref(name)
217
 
        return RemoteGitBranch(self, repo, refname, self._lockfiles)
 
175
        # TODO: Support for multiple branches in one bzrdir in bzrlib!
 
176
        return RemoteGitBranch(self, repo, "HEAD", self._lockfiles)
218
177
 
219
 
    def open_workingtree(self, recommend_upgrade=False):
 
178
    def open_workingtree(self):
220
179
        raise NotLocalUrl(self.transport.base)
221
180
 
222
181
 
233
192
        self.resolve_ext_ref = resolve_ext_ref
234
193
 
235
194
    @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):
 
195
    def idx(self):
243
196
        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()
 
197
            if self._data is None:
 
198
                self._data = PackData(self._data_path)
 
199
            pb = ui.ui_factory.nested_progress_bar()
 
200
            try:
 
201
                def report_progress(cur, total):
 
202
                    pb.update("generating index", cur, total)
 
203
                self._data.create_index_v2(self._idx_path, self.resolve_ext_ref,
 
204
                    progress=report_progress)
 
205
            finally:
 
206
                pb.finished()
253
207
            self._idx = load_pack_index(self._idx_path)
254
208
        return self._idx
255
209
 
256
210
    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)
 
211
        os.remove(self._data_path)
 
212
        os.remove(self._idx_path)
263
213
 
264
214
 
265
215
class RemoteGitRepository(GitRepository):
283
233
    def get_refs(self):
284
234
        if self._refs is not None:
285
235
            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))
 
236
        def determine_wants(heads):
 
237
            self._refs = heads
 
238
            return []
 
239
        self.bzrdir.root_transport.fetch_pack(determine_wants, None, 
 
240
            lambda x: None, lambda x: mutter("git: %s" % x))
288
241
        return self._refs
289
242
 
290
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data,
 
243
    def fetch_pack(self, determine_wants, graph_walker, pack_data, 
291
244
                   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):
 
245
        self._transport.fetch_pack(determine_wants, graph_walker, pack_data, 
 
246
            progress)
 
247
 
 
248
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
300
249
        fd, path = tempfile.mkstemp(suffix=".pack")
301
 
        self.fetch_pack(determine_wants, graph_walker,
302
 
            lambda x: os.write(fd, x), progress)
 
250
        self.fetch_pack(determine_wants, graph_walker, lambda x: os.write(fd, x), progress)
303
251
        os.close(fd)
304
252
        if os.path.getsize(path) == 0:
305
253
            return EmptyObjectStoreIterator()
306
254
        return TemporaryPackIterator(path[:-len(".pack")], resolve_ext_ref)
307
255
 
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
256
 
325
257
class RemoteGitTagDict(tag.BasicTags):
326
258
 
329
261
        self.repository = branch.repository
330
262
 
331
263
    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
 
264
        ret = {}
 
265
        refs = self.repository.get_refs()
 
266
        for k,v in refs.iteritems():
 
267
            if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
268
                v = refs.get(k+"^{}", v)
 
269
                ret[k[len("refs/tags/"):]] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
270
        return ret
336
271
 
337
272
    def set_tag(self, name, revid):
338
273
        # FIXME: Not supported yet, should do a push of a new ref
342
277
class RemoteGitBranch(GitBranch):
343
278
 
344
279
    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()
 
280
        heads = repository.get_refs()
 
281
        if not name in heads:
 
282
            raise NoSuchRef(name)
 
283
        self._ref = heads[name]
 
284
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name, self._ref, lockfiles)
351
285
 
352
286
    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
 
287
        return self.mapping.revision_id_foreign_to_bzr(self._ref)
374
288
 
375
289
    def _synchronize_history(self, destination, revision_id):
376
290
        """See Branch._synchronize_history()."""
377
291
        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
 
292