← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-24 01:08:12 UTC
  • mfrom: (3948.3.9 deprecation)
  • Revision ID: pqm@pqm.ubuntu.com-20090324010812-lrfx6zoeu7q0fftv
(mbp) remove code deprecated up to 1.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
690
690
        self._ensure_real()
691
691
        return self._real_repository._generate_text_key_index()
692
692
 
693
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_four)
694
 
    def get_revision_graph(self, revision_id=None):
695
 
        """See Repository.get_revision_graph()."""
696
 
        return self._get_revision_graph(revision_id)
697
 
 
698
693
    def _get_revision_graph(self, revision_id):
699
694
        """Private method for using with old (< 1.2) servers to fallback."""
700
695
        if revision_id is None:
1193
1188
            # We already found out that the server can't understand
1194
1189
            # Repository.get_parent_map requests, so just fetch the whole
1195
1190
            # graph.
1196
 
            # XXX: Note that this will issue a deprecation warning. This is ok
1197
 
            # :- its because we're working with a deprecated server anyway, and
1198
 
            # the user will almost certainly have seen a warning about the
1199
 
            # server version already.
1200
 
            rg = self.get_revision_graph()
 
1191
            #
 
1192
            # Note that this reads the whole graph, when only some keys are
 
1193
            # wanted.  On this old server there's no way (?) to get them all
 
1194
            # in one go, and the user probably will have seen a warning about
 
1195
            # the server being old anyhow.
 
1196
            rg = self._get_revision_graph(None)
1201
1197
            # There is an api discrepency between get_parent_map and
1202
1198
            # get_revision_graph. Specifically, a "key:()" pair in
1203
1199
            # get_revision_graph just means a node has no parents. For
1269
1265
            # To avoid having to disconnect repeatedly, we keep track of the
1270
1266
            # fact the server doesn't understand remote methods added in 1.2.
1271
1267
            medium._remember_remote_is_before((1, 2))
1272
 
            return self.get_revision_graph(None)
 
1268
            # Recurse just once and we should use the fallback code.
 
1269
            return self._get_parent_map_rpc(keys)
1273
1270
        response_tuple, response_handler = response
1274
1271
        if response_tuple[0] not in ['ok']:
1275
1272
            response_handler.cancel_read_body()
1296
1293
        return self._real_repository.get_signature_text(revision_id)
1297
1294
 
1298
1295
    @needs_read_lock
1299
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
1300
 
    def get_revision_graph_with_ghosts(self, revision_ids=None):
1301
 
        self._ensure_real()
1302
 
        return self._real_repository.get_revision_graph_with_ghosts(
1303
 
            revision_ids=revision_ids)
1304
 
 
1305
 
    @needs_read_lock
1306
1296
    def get_inventory_xml(self, revision_id):
1307
1297
        self._ensure_real()
1308
1298
        return self._real_repository.get_inventory_xml(revision_id)