← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
1180
1180
                'sha1 mismatch: %s has sha1 %s expected %s referenced by %s' %
1181
1181
                (record.key, sha1, item_data[1], item_data[2]))
1182
1182
 
 
1183
    @needs_read_lock
 
1184
    def _eliminate_revisions_not_present(self, revision_ids):
 
1185
        """Check every revision id in revision_ids to see if we have it.
 
1186
 
 
1187
        Returns a set of the present revisions.
 
1188
        """
 
1189
        result = []
 
1190
        graph = self.get_graph()
 
1191
        parent_map = graph.get_parent_map(revision_ids)
 
1192
        # The old API returned a list, should this actually be a set?
 
1193
        return parent_map.keys()
 
1194
 
1183
1195
    def __init__(self, _format, a_bzrdir, control_files):
1184
1196
        """Instantiate a VersionedFileRepository.
1185
1197
 
2483
2495
                            content is copied.
2484
2496
        :return: None.
2485
2497
        """
2486
 
        ui.ui_factory.warn_experimental_format_fetch(self)
 
2498
        if self.target._format.experimental:
 
2499
            ui.ui_factory.show_user_warning('experimental_format_fetch',
 
2500
                from_format=self.source._format,
 
2501
                to_format=self.target._format)
2487
2502
        from bzrlib.fetch import RepoFetcher
2488
2503
        # See <https://launchpad.net/bugs/456077> asking for a warning here
2489
2504
        if self.source._format.network_name() != self.target._format.network_name():
2928
2943
            revision_ids = fetch_spec.get_keys()
2929
2944
        else:
2930
2945
            revision_ids = None
2931
 
        ui.ui_factory.warn_experimental_format_fetch(self)
 
2946
        if self.source._format.experimental:
 
2947
            ui.ui_factory.show_user_warning('experimental_format_fetch',
 
2948
                from_format=self.source._format,
 
2949
                to_format=self.target._format)
2932
2950
        if (not self.source.supports_rich_root()
2933
2951
            and self.target.supports_rich_root()):
2934
2952
            self._converting_to_rich_root = True