← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge bzr.dev, resolving conflicts and updating test_merge_directive.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
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()