/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 some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
remote.py
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):
192
195
        self._lockfiles = lockfiles
193
196
        self._mode_check_done = None
194
197
 
 
198
    def _branch_name_to_ref(self, name, default=None):
 
199
        return branch_name_to_ref(name, default=default)
 
200
 
195
201
    def open_repository(self):
196
202
        return RemoteGitRepository(self, self._lockfiles)
197
203
 
220
226
    @property
221
227
    def data(self):
222
228
        if self._data is None:
223
 
            self._data = PackData(self._data_path)
 
229
            self._data = ThinPackData(self.resolve_ext_ref, self._data_path)
224
230
        return self._data
225
231
 
226
232
    @property
231
237
                try:
232
238
                    def report_progress(cur, total):
233
239
                        pb.update("generating index", cur, total)
234
 
                    self.data.create_index(self._idx_path, self.resolve_ext_ref,
 
240
                    self.data.create_index(self._idx_path, 
235
241
                        progress=report_progress)
236
242
                finally:
237
243
                    pb.finished()
297
303
        except InvalidRevisionId:
298
304
            raise NoSuchRevision(self, bzr_revid)
299
305
 
 
306
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
 
307
        """Lookup a revision id.
 
308
 
 
309
        """
 
310
        if mapping is None:
 
311
            mapping = self.get_mapping()
 
312
        # Not really an easy way to parse foreign revids here..
 
313
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
 
314
 
300
315
 
301
316
class RemoteGitTagDict(tag.BasicTags):
302
317
 
318
333
class RemoteGitBranch(GitBranch):
319
334
 
320
335
    def __init__(self, bzrdir, repository, name, lockfiles):
321
 
        self._ref = None
 
336
        self._sha = None
322
337
        super(RemoteGitBranch, self).__init__(bzrdir, repository, name,
323
338
                lockfiles)
324
339
 
326
341
        raise GitSmartRemoteNotSupported()
327
342
 
328
343
    def last_revision(self):
329
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
344
        return self.lookup_foreign_revision_id(self.head)
330
345
 
331
346
    def _get_config(self):
332
347
        class EmptyConfig(object):
338
353
 
339
354
    @property
340
355
    def head(self):
341
 
        if self._ref is not None:
342
 
            return self._ref
 
356
        if self._sha is not None:
 
357
            return self._sha
343
358
        heads = self.repository.get_refs()
344
 
        if self.name in heads:
345
 
            self._ref = heads[self.name]
346
 
        elif ("refs/heads/" + self.name) in heads:
347
 
            self._ref = heads["refs/heads/" + self.name]
 
359
        name = self.bzrdir._branch_name_to_ref(self.name, "HEAD")
 
360
        if name in heads:
 
361
            self._sha = heads[name]
348
362
        else:
349
363
            raise NoSuchRef(self.name)
350
 
        return self._ref
 
364
        return self._sha
351
365
 
352
366
    def _synchronize_history(self, destination, revision_id):
353
367
        """See Branch._synchronize_history()."""