~bzr-pqm/bzr/bzr.dev

Committer: Benoît Pierre
Date: 2011-10-21 23:05:39 UTC
mto: This revision was merged to the branch mainline in revision 6230.
Revision ID: benoit.pierre@gmail.com-20111021230539-kimx0vnbbtywqz2z

Fix clean_tree messages and prompt handling.

- use ui.ui_factory.note for output messages, instead of using 'print' directly
- use ui.ui_factory.get_boolean for prompting the user for confirmation

files modified:
bzrlib/clean_tree.py

Show diffs side-by-side

added added

removed removed

bzrlib/clean_tree.py

return 0

if not no_prompt:

for path, subp in deletables:

# FIXME using print is very bad idea

# clean_tree should accept to_file argument to write the output

print subp

val = raw_input('Are you sure you wish to delete these [y/N]?')

if val.lower() not in ('y', 'yes'):

print 'Canceled'

ui.ui_factory.note(subp)

prompt = 'Are you sure you wish to delete these'

if not ui.ui_factory.get_boolean(prompt):

ui.ui_factory.note('Canceled')

return 0

delete_items(deletables, dry_run=dry_run)

finally:

Older »