/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 14:27:19 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-20080915142719-60n7juikbylf89qx
Add test for coping without Branch.get_stacked_on_url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
600
600
        if isinstance(repository, RemoteRepository):
601
601
            raise AssertionError()
602
602
        self._real_repository = repository
603
 
#        for fb in self._fallback_repositories:
604
 
#            self._real_repository.add_fallback_repository(fb)
 
603
        for fb in self._fallback_repositories:
 
604
            self._real_repository.add_fallback_repository(fb)
605
605
        if self._lock_mode == 'w':
606
606
            # if we are already locked, the real repository must be able to
607
607
            # acquire the lock with our token.
733
733
        # on various RPC's.
734
734
        self._fallback_repositories.append(repository)
735
735
        # They are also seen by the fallback repository.  If it doesn't exist
736
 
        # yet they'll be added then.
 
736
        # yet they'll be added then.  This implicitly copies them.
737
737
        self._ensure_real()
738
 
        self._real_repository.add_fallback_repository(repository)
739
738
 
740
739
    def add_inventory(self, revid, inv, parents):
741
740
        self._ensure_real()
1397
1396
        :raises UnstackableRepositoryFormat: If the repository does not support
1398
1397
            stacking.
1399
1398
        """
1400
 
        if False:
1401
 
            self._ensure_real()
1402
 
            return self._real_branch.get_stacked_on_url()
1403
 
        else:
1404
 
            try:
1405
 
                response = self._client.call('Branch.get_stacked_on_url',
1406
 
                    self._remote_path())
1407
 
            except errors.ErrorFromSmartServer, err:
1408
 
                # there may not be a repository yet, so we can't call through
1409
 
                # its _translate_error
1410
 
                _translate_error(err, branch=self)
 
1399
        try:
 
1400
            response = self._client.call('Branch.get_stacked_on_url',
 
1401
                self._remote_path())
1411
1402
            if response[0] != 'ok':
1412
1403
                raise errors.UnexpectedSmartServerResponse(response)
1413
1404
            return response[1]
 
1405
        except errors.ErrorFromSmartServer, err:
 
1406
            # there may not be a repository yet, so we can't call through
 
1407
            # its _translate_error
 
1408
            _translate_error(err, branch=self)
 
1409
        except errors.UnknownSmartMethod, err:
 
1410
            self._ensure_real()
 
1411
            return self._real_branch.get_stacked_on_url()
1414
1412
 
1415
1413
    def lock_read(self):
1416
1414
        if not self._lock_mode: