/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: Martin Pool
  • Date: 2008-09-15 11:20:15 UTC
  • mto: (3697.2.6 261315-into-1.7)
  • mto: This revision was merged to the branch mainline in revision 3710.
  • Revision ID: mbp@sourcefrog.net-20080915112015-taqk86xpt7vhj71r
FakeClient can know what calls to expect

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1291
1291
        self._repo_lock_token = None
1292
1292
        self._lock_count = 0
1293
1293
        self._leave_lock = False
1294
 
        ## self._setup_stacking()
 
1294
        self._setup_stacking()
1295
1295
 
1296
1296
    def _setup_stacking(self):
1297
1297
        # configure stacking into the remote repository, by reading it from
1298
1298
        # the vfs branch.
1299
1299
        try:
1300
1300
            fallback_url = self.get_stacked_on_url()
1301
 
            if fallback_url is None:
1302
 
                return
1303
 
            # it's relative to this branch...
1304
 
            fallback_url = urlutils.join(self.base, fallback_url)
1305
 
            transports = [self.bzrdir.root_transport]
1306
 
            if self._real_branch is not None:
1307
 
                transports.append(self._real_branch._transport)
1308
 
            fallback_bzrdir = BzrDir.open(fallback_url, transports)
1309
 
            fallback_repo = fallback_bzrdir.open_repository()
1310
 
            self.repository.add_fallback_repository(fallback_repo)
1311
1301
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1312
1302
            errors.UnstackableRepositoryFormat), e:
1313
 
            pass
 
1303
            return
 
1304
        # it's relative to this branch...
 
1305
        fallback_url = urlutils.join(self.base, fallback_url)
 
1306
        transports = [self.bzrdir.root_transport]
 
1307
        if self._real_branch is not None:
 
1308
            transports.append(self._real_branch._transport)
 
1309
        fallback_bzrdir = BzrDir.open(fallback_url, transports)
 
1310
        fallback_repo = fallback_bzrdir.open_repository()
 
1311
        self.repository.add_fallback_repository(fallback_repo)
1314
1312
 
1315
1313
    def _get_real_transport(self):
1316
1314
        # if we try vfs access, return the real branch's vfs transport