[MERGE] bzr rm should delete the working file (Bug #82602)

[Martin Pool]

Martin Pool has voted +0.
Status is now: Waiting
Comment:
+        Option('new', help='remove newly-added files'),

(in passing) I'm not sure how useful this will be without --force, but 
we can worry about that later.

More seriously this seems to have trouble with deleting directories:

mbp at limpid% ~-/bzr st
mbp at limpid% ls
a/
mbp at limpid% ~-/bzr rm a
bzr: ERROR: exceptions.IndexError: list index out of range

Traceback (most recent call last):
   File "/home/mbp/bzr/rm/bzrlib/commands.py", line 638, in 
run_bzr_catch_errors
     return run_bzr(argv)
   File "/home/mbp/bzr/rm/bzrlib/commands.py", line 600, in run_bzr
     ret = run(*run_argv)
   File "/home/mbp/bzr/rm/bzrlib/commands.py", line 296, in 
run_argv_aliases
     return self.run(**all_cmd_args)
   File "/home/mbp/bzr/rm/bzrlib/builtins.py", line 1108, in run
     force=file_deletion_strategy=='force')
   File "/home/mbp/bzr/rm/bzrlib/mutabletree.py", line 38, in 
tree_write_locked
     return unbound(self, *args, **kwargs)
   File "/home/mbp/bzr/rm/bzrlib/workingtree.py", line 1807, in remove
     recurse_directory_to_add_files(filename)
   File "/home/mbp/bzr/rm/bzrlib/workingtree.py", line 1791, in 
recurse_directory_to_add_files
     for contained_dir_info in self.walkdirs(directory):
   File "/home/mbp/bzr/rm/bzrlib/workingtree.py", line 2199, in walkdirs
     if current_disk[1][bzrdir_loc][0] == '.bzr':
IndexError: list index out of range

bzr 0.16.0dev0 on python 2.5.1.candidate.1 (linux2)
arguments: ['/home/mbp/bzr/rm/bzr', 'rm', 'a']

** please send this report to bazaar at lists.ubuntu.com
zsh: exit 3     ~-/bzr rm a


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C418c22640704161142xd0d0099q5ab3e8dfaeadf2a6%40mail.gmail.com%3E