[BUG] status after remove

[John A Meinel]

William Dodé wrote:

>$ bzr init; touch a; bzr add a; bzr commit -m "add a"
>* looking for changes...
>added a
>* commited r1
>$ bzr remove a
>$ bzr status
>bzr: local variable 'kind' referenced before assignment
>  at /vrac/python/bazaar-ng/bzrlib/diff.py:286 in compare_trees()
>  see ~/.bzr.log for debug information
>
>
>  
>
Confirmed. I think the attached patch does the right thing.

John
=:->


*** modified file 'bzrlib/diff.py'
--- bzrlib/diff.py
+++ bzrlib/diff.py
@@ -240,8 +240,8 @@
     # the IDs of those files up front and then considering only that.

     for file_id in old_tree:
+        kind = old_inv.get_file_kind(file_id)
         if file_id in new_tree:
-            kind = old_inv.get_file_kind(file_id)
             assert kind == new_inv.get_file_kind(file_id)

             assert kind in ('file', 'directory', 'symlink', 'root_directory'), \




-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050525/e1c754fb/attachment.pgp