← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Patch Queue Manager
  • Date: 2012-07-31 08:46:40 UTC
  • mfrom: (6543.1.4 kill_remove_force)
  • Revision ID: pqm@pqm.ubuntu.com-20120731084640-jvn3gs7ldyoc3rc3
(gz) Remove deprecated --force option from remove (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1871
1871
            title='Deletion Strategy', value_switches=True, enum_switch=False,
1872
1872
            safe='Backup changed files (default).',
1873
1873
            keep='Delete from bzr but leave the working copy.',
1874
 
            no_backup='Don\'t backup changed files.',
1875
 
            force='Delete all the specified files, even if they can not be '
1876
 
                'recovered and even if they are non-empty directories. '
1877
 
                '(deprecated, use no-backup)')]
 
1874
            no_backup='Don\'t backup changed files.'),
 
1875
        ]
1878
1876
    aliases = ['rm', 'del']
1879
1877
    encoding_type = 'replace'
1880
1878
 
1881
1879
    def run(self, file_list, verbose=False, new=False,
1882
1880
        file_deletion_strategy='safe'):
1883
 
        if file_deletion_strategy == 'force':
1884
 
            note(gettext("(The --force option is deprecated, rather use --no-backup "
1885
 
                "in future.)"))
1886
 
            file_deletion_strategy = 'no-backup'
1887
1881
 
1888
1882
        tree, file_list = WorkingTree.open_containing_paths(file_list)
1889
1883