/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/fetch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-27 02:44:10 UTC
  • mfrom: (4053.1.5 RemoteRepository._format)
  • Revision ID: pqm@pqm.ubuntu.com-20090227024410-cvgq2458iyz9a2nl
(robertc) Further reduce round trips on pushing new branches by
        moving fetch parameterisation selection to RepositoryFormat,
        and using a new verb to get the RepositoryFormat.network_name during
        repository discovery. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
192
192
                # Now copy the file texts.
193
193
                from_texts = self.from_repository.texts
194
194
                yield ('texts', from_texts.get_record_stream(
195
 
                    text_keys, self.to_repository._fetch_order,
196
 
                    not self.to_repository._fetch_uses_deltas))
 
195
                    text_keys, self.to_repository._format._fetch_order,
 
196
                    not self.to_repository._format._fetch_uses_deltas))
197
197
                # Cause an error if a text occurs after we have done the
198
198
                # copy.
199
199
                text_keys = None
248
248
            # Ask for full texts always so that we don't need more round trips
249
249
            # after this stream.
250
250
            stream = vf.get_record_stream(keys,
251
 
                self.to_repository._fetch_order, True)
 
251
                self.to_repository._format._fetch_order, True)
252
252
            yield substream_kind, stream
253
253
 
254
254
    def _revids_to_fetch(self):
279
279
        keys = [(rev_id,) for rev_id in revs]
280
280
        signatures = filter_absent(from_sf.get_record_stream(
281
281
            keys,
282
 
            self.to_repository._fetch_order,
283
 
            not self.to_repository._fetch_uses_deltas))
 
282
            self.to_repository._format._fetch_order,
 
283
            not self.to_repository._format._fetch_uses_deltas))
284
284
        # If a revision has a delta, this is actually expanded inside the
285
285
        # insert_record_stream code now, which is an alternate fix for
286
286
        # bug #261339
287
287
        from_rf = self.from_repository.revisions
288
288
        revisions = from_rf.get_record_stream(
289
289
            keys,
290
 
            self.to_repository._fetch_order,
 
290
            self.to_repository._format._fetch_order,
291
291
            not self.delta_on_metadata())
292
292
        return [('signatures', signatures), ('revisions', revisions)]
293
293
 
301
301
        return []
302
302
 
303
303
    def inventory_fetch_order(self):
304
 
        return self.to_repository._fetch_order
 
304
        return self.to_repository._format._fetch_order
305
305
 
306
306
    def delta_on_metadata(self):
307
307
        src_serializer = self.from_repository._format._serializer
308
308
        target_serializer = self.to_repository._format._serializer
309
 
        return (self.to_repository._fetch_uses_deltas and
 
309
        return (self.to_repository._format._fetch_uses_deltas and
310
310
            src_serializer == target_serializer)
311
311
 
312
312