handle delete of missing files for chk formats

1 files changed, 14 insertions, 11 deletions

diff --git a/bzr_commit_handler.py b/bzr_commit_handler.py
index 093bc98..1207a29 100644
--- a/bzr_commit_handler.py
+++ b/bzr_commit_handler.py
@@ -257,9 +257,12 @@ class GenericCommitHandler(processor.CommitHandler):
 
     def _delete_item(self, path, inv):
         file_id = inv.path2id(path)
-        #print "**** deleting %s with file-id %s" % (path, file_id)
-        ie = inv[file_id]
-        self.record_delete(path, ie)
+        try:
+            ie = inv[file_id]
+        except errors.NoSuchId:
+            self.warning("ignoring delete of %s as not in inventory", path)
+        else:
+            self.record_delete(path, ie)
 
     def _copy_item(self, src_path, dest_path, inv):
         if not self.parents:
@@ -302,6 +305,14 @@ class GenericCommitHandler(processor.CommitHandler):
         for name, root_item in inv.root.children.iteritems():
             inv.remove_recursive_id(root_item.file_id)
 
+    def _warn_unless_in_merges(self, fileid, path):
+        if len(self.parents) <= 1:
+            return
+        for parent in self.parents[1:]:
+            if fileid in self.get_inventory(parent):
+                return
+        self.warning("ignoring delete of %s as not in parent inventories", path)
+
 
 class InventoryCommitHandler(GenericCommitHandler):
     """A CommitHandler that builds and saves Inventory objects."""
@@ -396,14 +407,6 @@ class InventoryCommitHandler(GenericCommitHandler):
         except KeyError:
             pass
 
-    def _warn_unless_in_merges(self, fileid, path):
-        if len(self.parents) <= 1:
-            return
-        for parent in self.parents[1:]:
-            if fileid in self.get_inventory(parent):
-                return
-        self.warning("ignoring delete of %s as not in parent inventories", path)
-
     def modify_handler(self, filecmd):
         if filecmd.dataref is not None:
             data = self.cache_mgr.fetch_blob(filecmd.dataref)