Rev 2366: Just check if the entry is absent before calling _make_absent. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/dirstate_93681

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/dirstate_93681

------------------------------------------------------------
revno: 2366
revision-id: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
parent: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:55:43 -0500
message:
  Just check if the entry is absent before calling _make_absent.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-16 19:13:40 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-20 00:55:43 +0000
@@ -1163,8 +1163,10 @@
                 entry_index = 0
                 while entry_index < len(block[1]):
                     # Mark this file id as having been removed
-                    ids_to_unversion.discard(block[1][entry_index][0][2])
-                    if not state._make_absent(block[1][entry_index]):
+                    entry = block[1][entry_index]
+                    ids_to_unversion.discard(entry[0][2])
+                    if (entry[1][0][0] == 'a'
+                        or not state._make_absent(entry)):
                         entry_index += 1
                 # go to the next block. (At the moment we dont delete empty
                 # dirblocks)