/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: Jonathan Riddell
  • Date: 2011-09-16 15:39:47 UTC
  • mfrom: (6144 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153947-dl2qdlakcd2ximon
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
262
262
            # to prompt the user, better abort now.  See
263
263
            # https://code.launchpad.net/~bialix/bzr/shelve-no-tty/+merge/14905
264
264
            # for more context.
265
 
            raise errors.BzrError("You need a controlling terminal.")
 
265
            raise errors.BzrError(gettext("You need a controlling terminal."))
266
266
        sys.stdout.write(message)
267
267
        char = osutils.getchar()
268
268
        sys.stdout.write("\r" + ' ' * len(message) + '\r')
412
412
            else:
413
413
                shelf_id = manager.last_shelf()
414
414
                if shelf_id is None:
415
 
                    raise errors.BzrCommandError('No changes are shelved.')
 
415
                    raise errors.BzrCommandError(gettext('No changes are shelved.'))
416
416
            apply_changes = True
417
417
            delete_shelf = True
418
418
            read_shelf = True