/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 bzrlib/remote.py

  • Committer: John Arbash Meinel
  • Date: 2007-12-04 18:11:51 UTC
  • mfrom: (3074 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3075.
  • Revision ID: john@arbash-meinel.com-20071204181151-br85qwsgshso16q5
[merge] bzr.dev 3074

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
85
85
        self._real_bzrdir.create_repository(shared=shared)
86
86
        return self.open_repository()
87
87
 
 
88
    def destroy_repository(self):
 
89
        """See BzrDir.destroy_repository"""
 
90
        self._ensure_real()
 
91
        self._real_bzrdir.destroy_repository()
 
92
 
88
93
    def create_branch(self):
89
94
        self._ensure_real()
90
95
        real_branch = self._real_bzrdir.create_branch()
590
595
 
591
596
    def sprout(self, to_bzrdir, revision_id=None):
592
597
        # TODO: Option to control what format is created?
593
 
        dest_repo = to_bzrdir.create_repository()
 
598
        self._ensure_real()
 
599
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
 
600
                                                             shared=False)
594
601
        dest_repo.fetch(self, revision_id=revision_id)
595
602
        return dest_repo
596
603
 
689
696
        self._ensure_real()
690
697
        return self._real_repository.fileids_altered_by_revision_ids(revision_ids)
691
698
 
692
 
    def get_versioned_file_checker(self, revisions, revision_versions_cache):
 
699
    def _get_versioned_file_checker(self, revisions, revision_versions_cache):
693
700
        self._ensure_real()
694
 
        return self._real_repository.get_versioned_file_checker(
 
701
        return self._real_repository._get_versioned_file_checker(
695
702
            revisions, revision_versions_cache)
696
703
        
697
704
    def iter_files_bytes(self, desired_files):
1227
1234
        # format, because RemoteBranches can't be created at arbitrary URLs.
1228
1235
        # XXX: if to_bzrdir is a RemoteBranch, this should perhaps do
1229
1236
        # to_bzrdir.create_branch...
1230
 
        result = branch.BranchFormat.get_default_format().initialize(to_bzrdir)
 
1237
        self._ensure_real()
 
1238
        result = self._real_branch._format.initialize(to_bzrdir)
1231
1239
        self.copy_content_into(result, revision_id=revision_id)
1232
1240
        result.set_parent(self.bzrdir.root_transport.base)
1233
1241
        return result
1275
1283
        self._ensure_real()
1276
1284
        return self._real_branch.set_push_location(location)
1277
1285
 
1278
 
    def update_revisions(self, other, stop_revision=None):
 
1286
    def update_revisions(self, other, stop_revision=None, overwrite=False):
1279
1287
        self._ensure_real()
1280
1288
        return self._real_branch.update_revisions(
1281
 
            other, stop_revision=stop_revision)
 
1289
            other, stop_revision=stop_revision, overwrite=overwrite)
1282
1290
 
1283
1291
 
1284
1292
class RemoteBranchConfig(BranchConfig):