← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-12-15 17:57:26 UTC
  • mto: This revision was merged to the branch mainline in revision 4904.
  • Revision ID: nmb@wartburg.edu-20091215175726-mwitbfvey1c25tz2
https://launchpad.net/bugs/496917
add beter feedback from the unshelve command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
407
407
                shelf_id = manager.last_shelf()
408
408
                if shelf_id is None:
409
409
                    raise errors.BzrCommandError('No changes are shelved.')
410
 
                trace.note('Unshelving changes with id "%d".' % shelf_id)
411
410
            apply_changes = True
412
411
            delete_shelf = True
413
412
            read_shelf = True
452
451
        cleanups = [self.tree.unlock]
453
452
        try:
454
453
            if self.read_shelf:
 
454
                trace.note('Using changes with id "%d".' % self.shelf_id)
455
455
                unshelver = self.manager.get_unshelver(self.shelf_id)
456
456
                cleanups.append(unshelver.finalize)
457
457
                if unshelver.message is not None:
469
469
                    task.finished()
470
470
            if self.delete_shelf:
471
471
                self.manager.delete_shelf(self.shelf_id)
 
472
                trace.note('Deleted changes with id "%d".' % self.shelf_id)
472
473
        finally:
473
474
            for cleanup in reversed(cleanups):
474
475
                cleanup()