← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to shelf_ui.py

  • Committer: Aaron Bentley
  • Date: 2008-10-11 16:18:00 UTC
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081011161800-rpczta04rx8pwpk1
Inform user about shelf ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf_ui.py
29
29
    errors,
30
30
    osutils,
31
31
    patches,
 
32
    trace,
32
33
    workingtree)
33
34
from bzrlib.plugins.bzrtools import colordiff, hunk_selector
34
35
from bzrlib.plugins.bzrtools.patch import run_patch
91
92
                delta.report_changes(changes, reporter)
92
93
                if (self.prompt_bool('Shelve %d change(s)?' %
93
94
                    changes_shelved, auto=self.auto_apply)):
94
 
                    self.manager.shelve_changes(creator)
 
95
                    shelf_id = self.manager.shelve_changes(creator)
 
96
                    trace.note('Changes shelved with id "%d".' % shelf_id)
95
97
            else:
96
98
                print 'No changes to shelve.'
97
99
        finally:
158
160
            shelf_id = manager.last_shelf()
159
161
            if shelf_id is None:
160
162
                raise errors.BzrCommandError('No changes are shelved.')
 
163
            trace.note('Unshelving changes with id "%d".' % shelf_id)
161
164
        return klass(tree, manager, shelf_id)
162
165
 
163
166
    def __init__(self, tree, manager, shelf_id):