1
=== modified file 'index.py'
2
--- index.py	2011-02-01 04:20:25 +0000
3
+++ index.py	2011-03-15 10:18:32 +0000
4
@@ -46,32 +46,40 @@
5
46
from bzrlib.plugins.search.transport import FileView
46
from bzrlib.plugins.search.transport import FileView
6
47
from bzrlib.multiparent import NewText
47
from bzrlib.multiparent import NewText
7
48
from bzrlib.revision import NULL_REVISION
48
from bzrlib.revision import NULL_REVISION
34
49
xml_serializers = []
49
35
50
try:
50
_xml_serializers = None
36
51
    from bzrlib.xml4 import _Serializer_v4
51
def xml_serializers():
37
52
    xml_serializers.append(_Serializer_v4)
52
    global _xml_serializers
38
53
except ImportError:
53
    if _xml_serializers is not None:
39
54
    pass
54
        return _xml_serializers
40
55
try:
55
    _xml_serializers = []
41
56
    from bzrlib.xml5 import Serializer_v5
56
    try:
42
57
    xml_serializers.append(Serializer_v5)
57
        from bzrlib.xml4 import _Serializer_v4
43
58
except ImportError:
58
        _xml_serializers.append(_Serializer_v4)
44
59
    pass
59
    except ImportError:
45
60
try:
60
        pass
46
61
    from bzrlib.xml6 import Serializer_v6
61
    try:
47
62
    xml_serializers.append(Serializer_v6)
62
        from bzrlib.xml5 import Serializer_v5
48
63
except ImportError:
63
        _xml_serializers.append(Serializer_v5)
49
64
    pass
64
    except ImportError:
50
65
try:
65
        pass
51
66
    from bzrlib.xml7 import Serializer_v7
66
    try:
52
67
    xml_serializers.append(Serializer_v7)
67
        from bzrlib.xml6 import Serializer_v6
53
68
except ImportError:
68
        _xml_serializers.append(Serializer_v6)
54
69
    pass
69
    except ImportError:
55
70
try:
70
        pass
56
71
    from bzrlib.xml8 import Serializer_v8
71
    try:
57
72
    xml_serializers.append(Serializer_v8)
72
        from bzrlib.xml7 import Serializer_v7
58
73
except ImportError:
73
        _xml_serializers.append(Serializer_v7)
59
74
    pass
74
    except ImportError:
60
75
        pass
61
76
    try:
62
77
        from bzrlib.xml8 import Serializer_v8
63
78
        _xml_serializers.append(Serializer_v8)
64
79
    except ImportError:
65
80
        pass
66
81
    return _xml_serializers
67
82
68
75
from bzrlib.transport import get_transport
83
from bzrlib.transport import get_transport
69
76
from bzrlib.tsort import topo_sort
84
from bzrlib.tsort import topo_sort
70
77
85
71
@@ -717,7 +725,7 @@
72
717
                bar.update("Extract revision paths", offset, groups)
725
                bar.update("Extract revision paths", offset, groups)
73
718
                inventory_group = order[offset * group_size:(offset + 1) * group_size]
726
                inventory_group = order[offset * group_size:(offset + 1) * group_size]
74
719
                serializer = repository._serializer
727
                serializer = repository._serializer
76
720
                if type(serializer) in xml_serializers:
728
                if type(serializer) in xml_serializers():
77
721
                    # Fast path for flat-file serializers.
729
                    # Fast path for flat-file serializers.
78
722
                    group_keys = [(revid,) for revid in inventory_group]
730
                    group_keys = [(revid,) for revid in inventory_group]
79
723
                    stream = repository.inventories.get_record_stream(
731
                    stream = repository.inventories.get_record_stream(
Status:	Merged
Approved by:	Robert Collins on 2011-03-24
Approved revision:	86
Merged at revision:	86
Proposed branch:	lp:~jelmer/bzr-search/lazy-xml
Merge into:	lp:bzr-search
Diff against target:	79 lines (+35/-27) 1 file modified index.py (+35/-27)
To merge this branch:	bzr merge lp:~jelmer/bzr-search/lazy-xml
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Collins (community)		2011-03-15	Approve on 2011-03-24
Review via email: mp+53394@code.launchpad.net