← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

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
 
    static_tuple,
34
32
    symbol_versioning,
35
33
)
36
34
from bzrlib.branch import BranchReferenceFormat
643
641
        return self._custom_format._serializer
644
642
 
645
643
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
644
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
648
645
    """Repository accessed over rpc.
649
646
 
650
647
    For the moment most operations are performed using local transport-backed
693
690
        # Additional places to query for data.
694
691
        self._fallback_repositories = []
695
692
 
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
693
    def __str__(self):
708
694
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
695
 
917
903
        parents_provider = self._make_parents_provider(other_repository)
918
904
        return graph.Graph(parents_provider)
919
905
 
920
 
    @needs_read_lock
921
 
    def get_known_graph_ancestry(self, revision_ids):
922
 
        """Return the known graph for a set of revision ids and their ancestors.
923
 
        """
924
 
        st = static_tuple.StaticTuple
925
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
926
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
927
 
        return graph.GraphThunkIdsToKeys(known_graph)
928
 
 
929
906
    def gather_stats(self, revid=None, committers=None):
930
907
        """See Repository.gather_stats()."""
931
908
        path = self.bzrdir._path_for_remote_call(self._client)
1240
1217
            # state, so always add a lock here. If a caller passes us a locked
1241
1218
            # repository, they are responsible for unlocking it later.
1242
1219
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1220
        self._fallback_repositories.append(repository)
1245
1221
        # If self._real_repository was parameterised already (e.g. because a
1246
1222
        # _real_branch had its get_stacked_on_url method called), then the
1247
1223
        # repository to be added may already be in the _real_repositories list.
1248
1224
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1225
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1226
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1227
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1228
                self._real_repository.add_fallback_repository(repository)
1253
1229
 
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
1230
    def add_inventory(self, revid, inv, parents):
1265
1231
        self._ensure_real()
1266
1232
        return self._real_repository.add_inventory(revid, inv, parents)
1619
1585
        return self._real_repository.inventories
1620
1586
 
1621
1587
    @needs_write_lock
1622
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1588
    def pack(self, hint=None):
1623
1589
        """Compress the data within the repository.
1624
1590
 
1625
1591
        This is not currently implemented within the smart server.
1626
1592
        """
1627
1593
        self._ensure_real()
1628
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1594
        return self._real_repository.pack(hint=hint)
1629
1595
 
1630
1596
    @property
1631
1597
    def revisions(self):
2193
2159
            self._real_branch = None
2194
2160
        # Fill out expected attributes of branch for bzrlib API users.
2195
2161
        self._clear_cached_state()
2196
 
        # TODO: deprecate self.base in favor of user_url
2197
 
        self.base = self.bzrdir.user_url
 
2162
        self.base = self.bzrdir.root_transport.base
2198
2163
        self._name = name
2199
2164
        self._control_files = None
2200
2165
        self._lock_mode = None