← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2010-04-27 07:29:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5295.
  • Revision ID: mbp@sourcefrog.net-20100427072911-hagcu863rqbu4mal
Add simple test case for ObjectWithCleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
27
27
    lock,
28
28
    lockdir,
29
29
    repository,
30
 
    repository as _mod_repository,
31
30
    revision,
32
31
    revision as _mod_revision,
33
32
    static_tuple,
643
642
        return self._custom_format._serializer
644
643
 
645
644
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
645
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
646
    """Repository accessed over rpc.
649
647
 
650
648
    For the moment most operations are performed using local transport-backed
693
691
        # Additional places to query for data.
694
692
        self._fallback_repositories = []
695
693
 
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
694
    def __str__(self):
708
695
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
696
 
1240
1227
            # state, so always add a lock here. If a caller passes us a locked
1241
1228
            # repository, they are responsible for unlocking it later.
1242
1229
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1230
        self._fallback_repositories.append(repository)
1245
1231
        # If self._real_repository was parameterised already (e.g. because a
1246
1232
        # _real_branch had its get_stacked_on_url method called), then the
1247
1233
        # repository to be added may already be in the _real_repositories list.
1248
1234
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1235
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1236
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1237
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1238
                self._real_repository.add_fallback_repository(repository)
1253
1239
 
1254
 
    def _check_fallback_repository(self, repository):
1255
 
        """Check that this repository can fallback to repository safely.
1256
 
 
1257
 
        Raise an error if not.
1258
 
 
1259
 
        :param repository: A repository to fallback to.
1260
 
        """
1261
 
        return _mod_repository.InterRepository._assert_same_model(
1262
 
            self, repository)
1263
 
 
1264
1240
    def add_inventory(self, revid, inv, parents):
1265
1241
        self._ensure_real()
1266
1242
        return self._real_repository.add_inventory(revid, inv, parents)
1619
1595
        return self._real_repository.inventories
1620
1596
 
1621
1597
    @needs_write_lock
1622
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1598
    def pack(self, hint=None):
1623
1599
        """Compress the data within the repository.
1624
1600
 
1625
1601
        This is not currently implemented within the smart server.
1626
1602
        """
1627
1603
        self._ensure_real()
1628
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1604
        return self._real_repository.pack(hint=hint)
1629
1605
 
1630
1606
    @property
1631
1607
    def revisions(self):
2193
2169
            self._real_branch = None
2194
2170
        # Fill out expected attributes of branch for bzrlib API users.
2195
2171
        self._clear_cached_state()
2196
 
        # TODO: deprecate self.base in favor of user_url
2197
 
        self.base = self.bzrdir.user_url
 
2172
        self.base = self.bzrdir.root_transport.base
2198
2173
        self._name = name
2199
2174
        self._control_files = None
2200
2175
        self._lock_mode = None