← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2007-07-25 00:52:21 UTC
  • mfrom: (2650 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070725005221-0ysm6il5mqnme3wz
Merge bzr.dev.

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._medium = transport.get_smart_client()
56
 
            self._client = client._SmartClient(self._medium)
 
55
            self._shared_medium = transport.get_shared_medium()
 
56
            self._client = client._SmartClient(self._shared_medium)
57
57
        else:
58
58
            self._client = _client
59
 
            self._medium = None
 
59
            self._shared_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._medium)
 
243
            self._client = client._SmartClient(self.bzrdir._shared_medium)
244
244
        else:
245
245
            self._client = _client
246
246
        self._format = format
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
 
473
477
    def get_commit_builder(self, branch, parents, config, timestamp=None,
474
478
                           timezone=None, committer=None, revprops=None,
475
479
                           revision_id=None):
527
531
        return self._real_repository.fetch(
528
532
            source, revision_id=revision_id, pb=pb)
529
533
 
 
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
 
530
538
    @property
531
539
    def control_weaves(self):
532
540
        self._ensure_real()
759
767
        if _client is not None:
760
768
            self._client = _client
761
769
        else:
762
 
            self._client = client._SmartClient(self.bzrdir._medium)
 
770
            self._client = client._SmartClient(self.bzrdir._shared_medium)
763
771
        self.repository = remote_repository
764
772
        if real_branch is not None:
765
773
            self._real_branch = real_branch