Merge lp:~jelmer/bzr-search/lazy-xml into lp:bzr-search

[Jelmer Vernooij]

Add lazy function for determining XML serializers.

This prevents them from being imported every time bzr-search is loaded.

[Robert Collins (lifeless)]

This seems to be much more than that - have you included your rejected
other branch perhaps?

[Jelmer Vernooij (jelmer)]

Argh. Cherrypicked the right changes now. I should not call things I've modified "trunk".

[Jelmer Vernooij (jelmer)]

ping?

[Robert Collins (lifeless)]

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks! Can you merge?

[Robert Collins (lifeless)]

Future request, can you please include NEWS entries? Thanks.

=== modified file 'index.py'
--- index.py	2011-02-01 04:20:25 +0000
+++ index.py	2011-03-15 10:18:32 +0000
@@ -46,32 +46,40 @@
 from bzrlib.plugins.search.transport import FileView
 from bzrlib.multiparent import NewText
 from bzrlib.revision import NULL_REVISION
-xml_serializers = []
-try:
-    from bzrlib.xml4 import _Serializer_v4
-    xml_serializers.append(_Serializer_v4)
-except ImportError:
-    pass
-try:
-    from bzrlib.xml5 import Serializer_v5
-    xml_serializers.append(Serializer_v5)
-except ImportError:
-    pass
-try:
-    from bzrlib.xml6 import Serializer_v6
-    xml_serializers.append(Serializer_v6)
-except ImportError:
-    pass
-try:
-    from bzrlib.xml7 import Serializer_v7
-    xml_serializers.append(Serializer_v7)
-except ImportError:
-    pass
-try:
-    from bzrlib.xml8 import Serializer_v8
-    xml_serializers.append(Serializer_v8)
-except ImportError:
-    pass
+
+_xml_serializers = None
+def xml_serializers():
+    global _xml_serializers
+    if _xml_serializers is not None:
+        return _xml_serializers
+    _xml_serializers = []
+    try:
+        from bzrlib.xml4 import _Serializer_v4
+        _xml_serializers.append(_Serializer_v4)
+    except ImportError:
+        pass
+    try:
+        from bzrlib.xml5 import Serializer_v5
+        _xml_serializers.append(Serializer_v5)
+    except ImportError:
+        pass
+    try:
+        from bzrlib.xml6 import Serializer_v6
+        _xml_serializers.append(Serializer_v6)
+    except ImportError:
+        pass
+    try:
+        from bzrlib.xml7 import Serializer_v7
+        _xml_serializers.append(Serializer_v7)
+    except ImportError:
+        pass
+    try:
+        from bzrlib.xml8 import Serializer_v8
+        _xml_serializers.append(Serializer_v8)
+    except ImportError:
+        pass
+    return _xml_serializers
+
 from bzrlib.transport import get_transport
 from bzrlib.tsort import topo_sort
 
@@ -717,7 +725,7 @@
                 bar.update("Extract revision paths", offset, groups)
                 inventory_group = order[offset * group_size:(offset + 1) * group_size]
                 serializer = repository._serializer
-                if type(serializer) in xml_serializers:
+                if type(serializer) in xml_serializers():
                     # Fast path for flat-file serializers.
                     group_keys = [(revid,) for revid in inventory_group]
                     stream = repository.inventories.get_record_stream(