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

merge bzr.dev rev 4098

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
281
281
                if unshelver.message is not None:
282
282
                    trace.note('Message: %s' % unshelver.message)
283
283
                change_reporter = delta._ChangeReporter()
284
 
                merger = unshelver.make_merger()
285
 
                merger.change_reporter = change_reporter
286
 
                if self.apply_changes:
287
 
                    pb = ui.ui_factory.nested_progress_bar()
288
 
                    try:
 
284
                task = ui.ui_factory.nested_progress_bar()
 
285
                try:
 
286
                    merger = unshelver.make_merger(task)
 
287
                    merger.change_reporter = change_reporter
 
288
                    if self.apply_changes:
289
289
                        merger.do_merge()
290
 
                    finally:
291
 
                        pb.finished()
292
 
                else:
293
 
                    self.show_changes(merger)
 
290
                    else:
 
291
                        self.show_changes(merger)
 
292
                finally:
 
293
                    task.finished()
294
294
            if self.delete_shelf:
295
295
                self.manager.delete_shelf(self.shelf_id)
296
296
        finally: