← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Martin Pool
  • Date: 2009-09-24 04:54:19 UTC
  • mfrom: (4471.2.2 deprecation)
  • mto: This revision was merged to the branch mainline in revision 4715.
  • Revision ID: mbp@sourcefrog.net-20090924045419-a9c162cyftiiggju
merge old deprecation of ProgressTask.note

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
584
584
            # permissions as the .bzr directory (probably a bug in copy_tree)
585
585
            old_path = self.root_transport.abspath('.bzr')
586
586
            new_path = self.root_transport.abspath('backup.bzr')
587
 
            pb.note('making backup of %s' % (old_path,))
588
 
            pb.note('  to %s' % (new_path,))
 
587
            ui.ui_factory.note('making backup of %s\n  to %s' % (old_path, new_path,))
589
588
            self.root_transport.copy_tree('.bzr', 'backup.bzr')
590
589
            return (old_path, new_path)
591
590
        finally:
2587
2586
        """See Converter.convert()."""
2588
2587
        self.bzrdir = to_convert
2589
2588
        self.pb = pb
2590
 
        self.pb.note('starting upgrade from format 4 to 5')
 
2589
        ui.ui_factory.note('starting upgrade from format 4 to 5')
2591
2590
        if isinstance(self.bzrdir.transport, local.LocalTransport):
2592
2591
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2593
2592
        self._convert_to_weaves()
2594
2593
        return BzrDir.open(self.bzrdir.root_transport.base)
2595
2594
 
2596
2595
    def _convert_to_weaves(self):
2597
 
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
 
2596
        ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
2598
2597
        try:
2599
2598
            # TODO permissions
2600
2599
            stat = self.bzrdir.transport.stat('weaves')
2628
2627
        self.pb.clear()
2629
2628
        self._write_all_weaves()
2630
2629
        self._write_all_revs()
2631
 
        self.pb.note('upgraded to weaves:')
2632
 
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
2633
 
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
2634
 
        self.pb.note('  %6d texts', self.text_count)
 
2630
        ui.ui_factory.note('upgraded to weaves:')
 
2631
        ui.ui_factory.note('  %6d revisions and inventories' % len(self.revisions))
 
2632
        ui.ui_factory.note('  %6d revisions not present' % len(self.absent_revisions))
 
2633
        ui.ui_factory.note('  %6d texts' % self.text_count)
2635
2634
        self._cleanup_spare_files_after_format4()
2636
2635
        self.branch._transport.put_bytes(
2637
2636
            'branch-format',
2705
2704
                       len(self.known_revisions))
2706
2705
        if not self.branch.repository.has_revision(rev_id):
2707
2706
            self.pb.clear()
2708
 
            self.pb.note('revision {%s} not present in branch; '
2709
 
                         'will be converted as a ghost',
 
2707
            ui.ui_factory.note('revision {%s} not present in branch; '
 
2708
                         'will be converted as a ghost' %
2710
2709
                         rev_id)
2711
2710
            self.absent_revisions.add(rev_id)
2712
2711
        else:
2839
2838
        """See Converter.convert()."""
2840
2839
        self.bzrdir = to_convert
2841
2840
        self.pb = pb
2842
 
        self.pb.note('starting upgrade from format 5 to 6')
 
2841
        ui.ui_factory.note('starting upgrade from format 5 to 6')
2843
2842
        self._convert_to_prefixed()
2844
2843
        return BzrDir.open(self.bzrdir.root_transport.base)
2845
2844
 
2847
2846
        from bzrlib.store import TransportStore
2848
2847
        self.bzrdir.transport.delete('branch-format')
2849
2848
        for store_name in ["weaves", "revision-store"]:
2850
 
            self.pb.note("adding prefixes to %s" % store_name)
 
2849
            ui.ui_factory.note("adding prefixes to %s" % store_name)
2851
2850
            store_transport = self.bzrdir.transport.clone(store_name)
2852
2851
            store = TransportStore(store_transport, prefixed=True)
2853
2852
            for urlfilename in store_transport.list_dir('.'):
2887
2886
        self.dir_mode = self.bzrdir._get_dir_mode()
2888
2887
        self.file_mode = self.bzrdir._get_file_mode()
2889
2888
 
2890
 
        self.pb.note('starting upgrade from format 6 to metadir')
 
2889
        ui.ui_factory.note('starting upgrade from format 6 to metadir')
2891
2890
        self.bzrdir.transport.put_bytes(
2892
2891
                'branch-format',
2893
2892
                "Converting to format 6",
2943
2942
        else:
2944
2943
            has_checkout = True
2945
2944
        if not has_checkout:
2946
 
            self.pb.note('No working tree.')
 
2945
            ui.ui_factory.note('No working tree.')
2947
2946
            # If some checkout files are there, we may as well get rid of them.
2948
2947
            for name, mandatory in checkout_files:
2949
2948
                if name in bzrcontents:
3018
3017
        else:
3019
3018
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
3020
3019
                from bzrlib.repository import CopyConverter
3021
 
                self.pb.note('starting repository conversion')
 
3020
                ui.ui_factory.note('starting repository conversion')
3022
3021
                converter = CopyConverter(self.target_format.repository_format)
3023
3022
                converter.convert(repo, pb)
3024
3023
        try: