Rev 5070: Remove debug asserts. in file:///home/vila/src/bzr/reviews/2.2-dirstate-update-minimal-bug/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Aug 19 10:54:37 BST 2010


At file:///home/vila/src/bzr/reviews/2.2-dirstate-update-minimal-bug/

------------------------------------------------------------
revno: 5070
revision-id: v.ladeuil+lp at free.fr-20100819095436-pk1h2lceig94pcvu
parent: john at arbash-meinel.com-20100802213115-a2x1bdjcze9iwwdb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.2-dirstate-update-minimal-bug
timestamp: Thu 2010-08-19 11:54:36 +0200
message:
  Remove debug asserts.
-------------- next part --------------
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2010-08-02 21:31:15 +0000
+++ b/bzrlib/dirstate.py	2010-08-19 09:54:36 +0000
@@ -2836,7 +2836,6 @@
             # converted to relocated.
             if path_utf8 is None:
                 raise AssertionError('no path')
-            assert key in id_index[key[2]]
             for entry_key in id_index.get(key[2], ()):
                 # TODO:PROFILING: It might be faster to just update
                 # rather than checking if we need to, and then overwrite
@@ -2854,7 +2853,6 @@
                         raise AssertionError('not present: %r', entry_key)
                     self._dirblocks[block_index][1][entry_index][1][0] = \
                         ('r', path_utf8, 0, False, '')
-            assert key in id_index[key[2]]
         # add a containing dirblock if needed.
         if new_details[0] == 'd':
             subdir_key = (osutils.pathjoin(*key[0:2]), '', '')



More information about the bazaar-commits mailing list