← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-22 10:20:40 UTC
  • mfrom: (5050.3.4 2.2)
  • mto: This revision was merged to the branch mainline in revision 5173.
  • Revision ID: v.ladeuil+lp@free.fr-20100422102040-3nv01vm15i8qjip0
Merge 2.2 into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
643
643
        return self._custom_format._serializer
644
644
 
645
645
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
647
    """Repository accessed over rpc.
649
648
 
650
649
    For the moment most operations are performed using local transport-backed
693
692
        # Additional places to query for data.
694
693
        self._fallback_repositories = []
695
694
 
696
 
    @property
697
 
    def user_transport(self):
698
 
        return self.bzrdir.user_transport
699
 
 
700
 
    @property
701
 
    def control_transport(self):
702
 
        # XXX: Normally you shouldn't directly get at the remote repository
703
 
        # transport, but I'm not sure it's worth making this method
704
 
        # optional -- mbp 2010-04-21
705
 
        return self.bzrdir.get_repository_transport(None)
706
 
        
707
695
    def __str__(self):
708
696
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
697
 
1246
1234
        # _real_branch had its get_stacked_on_url method called), then the
1247
1235
        # repository to be added may already be in the _real_repositories list.
1248
1236
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1237
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1238
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1239
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1240
                self._real_repository.add_fallback_repository(repository)
1253
1241
 
1254
1242
    def _check_fallback_repository(self, repository):
2193
2181
            self._real_branch = None
2194
2182
        # Fill out expected attributes of branch for bzrlib API users.
2195
2183
        self._clear_cached_state()
2196
 
        # TODO: deprecate self.base in favor of user_url
2197
 
        self.base = self.bzrdir.user_url
 
2184
        self.base = self.bzrdir.root_transport.base
2198
2185
        self._name = name
2199
2186
        self._control_files = None
2200
2187
        self._lock_mode = None