← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Martin Pool
  • Date: 2010-01-15 07:00:49 UTC
  • mfrom: (4634.119.8 2.0)
  • mto: This revision was merged to the branch mainline in revision 4966.
  • Revision ID: mbp@sourcefrog.net-20100115070049-0cb4bi4lsrul2szs
Merge warning about cross-format fetch from 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
4013
4013
        #
4014
4014
        # nb this is only active for local-local fetches; other things using
4015
4015
        # streaming.
4016
 
        trace.warning("Fetching between repositories with different formats\n"
4017
 
            "from %s to %s.\n"
4018
 
            "This may take some time. Upgrade the branches to the same format \n"
4019
 
            "for better results.\n"
4020
 
            % (self.source._format, self.target._format))
 
4016
        ui.ui_factory.warn_cross_format_fetch(self.source._format,
 
4017
            self.target._format)
4021
4018
        if (not self.source.supports_rich_root()
4022
4019
            and self.target.supports_rich_root()):
4023
4020
            self._converting_to_rich_root = True
4316
4313
                    self._extract_and_insert_inventories(
4317
4314
                        substream, src_serializer)
4318
4315
            elif substream_type == 'inventory-deltas':
 
4316
                ui.ui_factory.warn_cross_format_fetch(src_format,
 
4317
                    self.target_repo._format)
4319
4318
                self._extract_and_insert_inventory_deltas(
4320
4319
                    substream, src_serializer)
4321
4320
            elif substream_type == 'chk_bytes':
4626
4625
 
4627
4626
    def _get_convertable_inventory_stream(self, revision_ids,
4628
4627
                                          delta_versus_null=False):
4629
 
        # The source is using CHKs, but the target either doesn't or it has a
4630
 
        # different serializer.  The StreamSink code expects to be able to
 
4628
        # The two formats are sufficiently different that there is no fast
 
4629
        # path, so we need to send just inventorydeltas, which any
 
4630
        # sufficiently modern client can insert into any repository.
 
4631
        # The StreamSink code expects to be able to
4631
4632
        # convert on the target, so we need to put bytes-on-the-wire that can
4632
4633
        # be converted.  That means inventory deltas (if the remote is <1.19,
4633
4634
        # RemoteStreamSink will fallback to VFS to insert the deltas).