/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

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:36:23 UTC
  • mfrom: (4953 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112223623-836x5mou0gm5vsep
merge bzr.dev 4953 to clean up the ui factory issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
408
408
                shelf_id = manager.last_shelf()
409
409
                if shelf_id is None:
410
410
                    raise errors.BzrCommandError('No changes are shelved.')
411
 
                trace.note('Unshelving changes with id "%d".' % shelf_id)
412
411
            apply_changes = True
413
412
            delete_shelf = True
414
413
            read_shelf = True
468
467
        cleanups = [self.tree.unlock]
469
468
        try:
470
469
            if self.read_shelf:
 
470
                trace.note('Using changes with id "%d".' % self.shelf_id)
471
471
                unshelver = self.manager.get_unshelver(self.shelf_id)
472
472
                cleanups.append(unshelver.finalize)
473
473
                if unshelver.message is not None:
487
487
                    task.finished()
488
488
            if self.delete_shelf:
489
489
                self.manager.delete_shelf(self.shelf_id)
 
490
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
490
491
        finally:
491
492
            for cleanup in reversed(cleanups):
492
493
                cleanup()