← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-28 07:08:27 UTC
  • mfrom: (2553.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
(robertc) Show the names of commit hooks during commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
52
52
        self._real_bzrdir = None
53
53
 
54
54
        if _client is None:
55
 
            self._shared_medium = transport.get_shared_medium()
56
 
            self._client = client._SmartClient(self._shared_medium)
 
55
            self._medium = transport.get_smart_client()
 
56
            self._client = client._SmartClient(self._medium)
57
57
        else:
58
58
            self._client = _client
59
 
            self._shared_medium = None
 
59
            self._medium = None
60
60
            return
61
61
 
62
62
        path = self._path_for_remote_call(self._client)
240
240
            self._real_repository = None
241
241
        self.bzrdir = remote_bzrdir
242
242
        if _client is None:
243
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
243
            self._client = client._SmartClient(self.bzrdir._medium)
244
244
        else:
245
245
            self._client = _client
246
246
        self._format = format
280
280
            lines = coded.split('\n')
281
281
            revision_graph = {}
282
282
            for line in lines:
283
 
                d = tuple(line.split())
 
283
                d = list(line.split())
284
284
                revision_graph[d[0]] = d[1:]
285
285
                
286
286
            return revision_graph
470
470
        self._ensure_real()
471
471
        return self._real_repository.revision_tree(revision_id)
472
472
 
473
 
    def get_serializer_format(self):
474
 
        self._ensure_real()
475
 
        return self._real_repository.get_serializer_format()
476
 
 
477
473
    def get_commit_builder(self, branch, parents, config, timestamp=None,
478
474
                           timezone=None, committer=None, revprops=None,
479
475
                           revision_id=None):
531
527
        return self._real_repository.fetch(
532
528
            source, revision_id=revision_id, pb=pb)
533
529
 
534
 
    def create_bundle(self, target, base, fileobj, format=None):
535
 
        self._ensure_real()
536
 
        self._real_repository.create_bundle(target, base, fileobj, format)
537
 
 
538
530
    @property
539
531
    def control_weaves(self):
540
532
        self._ensure_real()
641
633
        # TODO: Suggestion from john: using external tar is much faster than
642
634
        # python's tarfile library, but it may not work on windows.
643
635
 
644
 
    @needs_write_lock
645
 
    def pack(self):
646
 
        """Compress the data within the repository.
647
 
 
648
 
        This is not currently implemented within the smart server.
649
 
        """
650
 
        self._ensure_real()
651
 
        return self._real_repository.pack()
652
 
 
653
636
    def set_make_working_trees(self, new_value):
654
637
        raise NotImplementedError(self.set_make_working_trees)
655
638
 
767
750
        if _client is not None:
768
751
            self._client = _client
769
752
        else:
770
 
            self._client = client._SmartClient(self.bzrdir._shared_medium)
 
753
            self._client = client._SmartClient(self.bzrdir._medium)
771
754
        self.repository = remote_repository
772
755
        if real_branch is not None:
773
756
            self._real_branch = real_branch