/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
1
 
# Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2007-2010 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
40
40
 
41
41
from bzrlib.plugins.git.branch import (
42
42
    GitBranch,
43
 
    extract_tags,
44
43
    )
45
44
from bzrlib.plugins.git.errors import (
46
45
    GitSmartRemoteNotSupported,
55
54
from bzrlib.plugins.git.repository import (
56
55
    GitRepository,
57
56
    )
 
57
from bzrlib.plugins.git.refs import (
 
58
    extract_tags,
 
59
    branch_name_to_ref,
 
60
    )
58
61
 
59
62
import dulwich as git
60
63
from dulwich.errors import (
62
65
    )
63
66
from dulwich.pack import (
64
67
    Pack,
65
 
    PackData,
 
68
    ThinPackData,
66
69
    )
67
70
import os
68
71
import tempfile
161
164
            ret = self._client
162
165
            self._client = None
163
166
            return ret
164
 
        return git.client.TCPGitClient(self._host, self._port, thin_packs=thin_packs,
165
 
            report_activity=self._report_activity)
 
167
        return git.client.TCPGitClient(self._host, self._port,
 
168
            thin_packs=thin_packs, report_activity=self._report_activity)
166
169
 
167
170
 
168
171
class SSHGitSmartTransport(GitSmartTransport):
179
182
            ret = self._client
180
183
            self._client = None
181
184
            return ret
182
 
        return git.client.SSHGitClient(self._host, self._port, self._username,
 
185
        location_config = config.LocationConfig(self.base)
 
186
        client = git.client.SSHGitClient(self._host, self._port, self._username,
183
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
184
196
 
185
197
 
186
198
class RemoteGitDir(GitDir):
192
204
        self._lockfiles = lockfiles
193
205
        self._mode_check_done = None
194
206
 
195
 
    def _branch_name_to_ref(self, name):
196
 
        from bzrlib.plugins.git.branch import branch_name_to_ref
197
 
        return branch_name_to_ref(name, default="refs/heads/master")
 
207
    def _branch_name_to_ref(self, name, default=None):
 
208
        return branch_name_to_ref(name, default=default)
198
209
 
199
210
    def open_repository(self):
200
211
        return RemoteGitRepository(self, self._lockfiles)
224
235
    @property
225
236
    def data(self):
226
237
        if self._data is None:
227
 
            self._data = PackData(self._data_path)
 
238
            self._data = ThinPackData(self.resolve_ext_ref, self._data_path)
228
239
        return self._data
229
240
 
230
241
    @property
235
246
                try:
236
247
                    def report_progress(cur, total):
237
248
                        pb.update("generating index", cur, total)
238
 
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
249
                    self.data.create_index(self._idx_path, 
239
250
                        progress=report_progress)
240
251
                finally:
241
252
                    pb.finished()
301
312
        except InvalidRevisionId:
302
313
            raise NoSuchRevision(self, bzr_revid)
303
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
 
304
324
 
305
325
class RemoteGitTagDict(tag.BasicTags):
306
326
 
322
342
class RemoteGitBranch(GitBranch):
323
343
 
324
344
    def __init__(self, bzrdir, repository, name, lockfiles):
325
 
        self._ref = None
 
345
        self._sha = None
326
346
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
327
347
                lockfiles)
328
348
 
330
350
        raise GitSmartRemoteNotSupported()
331
351
 
332
352
    def last_revision(self):
333
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
353
        return self.lookup_foreign_revision_id(self.head)
334
354
 
335
355
    def _get_config(self):
336
356
        class EmptyConfig(object):
342
362
 
343
363
    @property
344
364
    def head(self):
345
 
        if self._ref is not None:
346
 
            return self._ref
 
365
        if self._sha is not None:
 
366
            return self._sha
347
367
        heads = self.repository.get_refs()
348
 
        if self.name in heads:
349
 
            self._ref = heads[self.name]
350
 
        elif ("refs/heads/" + self.name) in heads:
351
 
            self._ref = heads["refs/heads/" + self.name]
 
368
        name = self.bzrdir._branch_name_to_ref(self.name, "HEAD")
 
369
        if name in heads:
 
370
            self._sha = heads[name]
352
371
        else:
353
372
            raise NoSuchRef(self.name)
354
 
        return self._ref
 
373
        return self._sha
355
374
 
356
375
    def _synchronize_history(self, destination, revision_id):
357
376
        """See Branch._synchronize_history()."""