Running checkin after manually removing a folder causes crash

[Dan Cecile]

I moved a folder from inside my Bazaar working directory to a folder outside the working directory, using my system's "mv" command.

When I tried to run "bzr ci", it crashed instead of giving me a nice error message like "The folder 'test' was not found. Did you mean to delete it?". (Note that the 'javascript_methods.js" file was in the 'test' folder that I moved out of the Bazaar working directory.)

Here's the stack trace:

bzr: ERROR: exceptions.KeyError: 'javascript_methods.p-20100420043705-ei137srn37j2shhx-3'

Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/builtins.py", line 3138, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/usr/lib/python2.6/site-packages/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/workingtree_4.py", line 197, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/mutabletree.py", line 225, in commit
    *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/commit.py", line 257, in commit
    possible_master_transports=possible_master_transports)
  File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/commit.py", line 428, in _commit
    self.work_tree.unversion(self.deleted_ids)
  File "/usr/lib/python2.6/site-packages/bzrlib/mutabletree.py", line 49, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/bzrlib/workingtree_4.py", line 1239, in unversion
    self._inventory.remove_recursive_id(file_id)
  File "/usr/lib/python2.6/site-packages/bzrlib/inventory.py", line 1425, in remove_recursive_id
    to_find_delete = [self._byid[file_id]]
KeyError: 'javascript_methods.p-20100420043705-ei137srn37j2shhx-3'

bzr 2.1.0 on python 2.6.5 (Linux-2.6.33-ARCH-i686-Intel-R-_Pentium-R-_M_processor_1500MHz-with-glibc2.0)
arguments: ['/usr/bin/bzr', 'ci', '-m', 'Forked Snowshoe into a separate project']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  launchpad /usr/lib/python2.6/site-packages/bzrlib/plugins/launchpad [2.1.0]
  netrc_credential_store /usr/lib/python2.6/site-packages/bzrlib/plugins/netrc_credential_store [2.1.0]
  news_merge /usr/lib/python2.6/site-packages/bzrlib/plugins/news_merge [2.1.0]