Merge lp:~weyrick/bzr-search/bzr-search-720853 into lp:bzr-search

[Shannon Weyrick]

Skip bad index keys when BadIndexKey fires from btree_index

[Jelmer Vernooij (jelmer)]

Since there is a bug looming here somewhere, I think the error message should be a warning or at least a note rather than mutter, which isn't visible to th user.

The error message shouldn't say that it's skipping a particular key - it's aborting the indexing entirely. It would also be useful to include the key that was problematic, for debugging purposes.

[Jelmer Vernooij (jelmer)]

and thanks for working on this. I'm voting Needs Fixing for the moment, let me know when I should have another look.

review: Needs Fixing

[lp:~weyrick/bzr-search/bzr-search-720853]

94. By Shannon Weyrick on 2012-01-02

Switch to warning, include bad key in message, clarify message

[Shannon Weyrick (weyrick)]

Jelmer, I've made changes based on your comments. I changed the message to "indexing incomplete" because although it does abort it in some sense, it does end up with a usable (i.e. searchable) index.

[Jelmer Vernooij (jelmer)]

thanks!

review: Approve

=== modified file 'index.py'
--- index.py	2011-11-23 18:20:01 +0000
+++ index.py	2012-01-02 20:58:25 +0000
@@ -23,7 +23,7 @@
 import re
 
 from bzrlib import branch as _mod_branch
-from bzrlib import ui
+from bzrlib import (ui, trace)
 from bzrlib.btree_index import BTreeGraphIndex, BTreeBuilder
 from bzrlib.bzrdir import BzrDirMeta1
 import bzrlib.config
@@ -32,6 +32,7 @@
     NoSuchFile,
     UnknownFormatError,
     UnknownSmartMethod,
+    BadIndexKey,
     )
 from bzrlib.index import CombinedGraphIndex, GraphIndex, InMemoryGraphIndex
 from bzrlib.lockdir import LockDir
@@ -404,6 +405,8 @@
                     builder.add_revision(rev_id)
                 steps.update("Saving group", 3, 4)
                 self._add_index(builder)
+            except BadIndexKey as bKey:
+                trace.warning("%s, indexing incomplete" % str(bKey))
             finally:
                 steps.finished()