← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
471
471
                if unshelver.message is not None:
472
472
                    trace.note('Message: %s' % unshelver.message)
473
473
                change_reporter = delta._ChangeReporter()
474
 
                task = ui.ui_factory.nested_progress_bar()
475
 
                try:
476
 
                    merger = unshelver.make_merger(task)
477
 
                    merger.change_reporter = change_reporter
478
 
                    if self.apply_changes:
479
 
                        merger.do_merge()
480
 
                    elif self.show_diff:
481
 
                        self.write_diff(merger)
482
 
                    else:
483
 
                        self.show_changes(merger)
484
 
                finally:
485
 
                    task.finished()
 
474
                merger = unshelver.make_merger(None)
 
475
                merger.change_reporter = change_reporter
 
476
                if self.apply_changes:
 
477
                    merger.do_merge()
 
478
                elif self.show_diff:
 
479
                    self.write_diff(merger)
 
480
                else:
 
481
                    self.show_changes(merger)
486
482
            if self.delete_shelf:
487
483
                self.manager.delete_shelf(self.shelf_id)
488
484
                trace.note('Deleted changes with id "%d".' % self.shelf_id)