/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 breezy/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 00:39:16 UTC
  • mfrom: (6926 work)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180325003916-mqa5uj4uq55hrjq9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/bzrdir.py
241
241
        self.controldir = to_convert
242
242
        if pb is not None:
243
243
            warnings.warn(gettext("pb parameter to convert() is deprecated"))
244
 
        self.pb = ui.ui_factory.nested_progress_bar()
245
 
        try:
 
244
        with ui.ui_factory.nested_progress_bar() as self.pb:
246
245
            ui.ui_factory.note(gettext('starting upgrade from format 4 to 5'))
247
246
            if isinstance(self.controldir.transport, local.LocalTransport):
248
247
                self.controldir.get_workingtree_transport(None).delete('stat-cache')
249
248
            self._convert_to_weaves()
250
249
            return ControlDir.open(self.controldir.user_url)
251
 
        finally:
252
 
            self.pb.finished()
253
250
 
254
251
    def _convert_to_weaves(self):
255
252
        ui.ui_factory.note(gettext(
508
505
    def convert(self, to_convert, pb):
509
506
        """See Converter.convert()."""
510
507
        self.controldir = to_convert
511
 
        pb = ui.ui_factory.nested_progress_bar()
512
 
        try:
 
508
        with ui.ui_factory.nested_progress_bar() as pb:
513
509
            ui.ui_factory.note(gettext('starting upgrade from format 5 to 6'))
514
510
            self._convert_to_prefixed()
515
511
            return ControlDir.open(self.controldir.user_url)
516
 
        finally:
517
 
            pb.finished()
518
512
 
519
513
    def _convert_to_prefixed(self):
520
514
        from .store import TransportStore