← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/chk_serializer.py

It turns out CHKSerializer was inheriting from xml5

However, xml5 does *not* support rich roots. So it was inherently a bad
xml format for trasmitting rich-root information.
I don't believe the XML format was used elsewhere (there was some code
in StreamSource that used it for a while, but that is currently replaced
by the InterDifferingSerializer code path, and in the future we will
be switching to inventory deltas anyway.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_serializer.py
21
21
    cache_utf8,
22
22
    inventory,
23
23
    revision as _mod_revision,
24
 
    xml5,
25
24
    xml6,
 
25
    xml7,
26
26
    )
27
27
 
28
28
 
131
131
        return self.read_revision_from_string(f.read())
132
132
 
133
133
 
134
 
class CHKSerializerSubtree(BEncodeRevisionSerializer1, xml6.Serializer_v6):
 
134
class CHKSerializerSubtree(BEncodeRevisionSerializer1, xml7.Serializer_v7):
135
135
    """A CHKInventory based serializer that supports tree references"""
136
136
 
137
137
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
152
152
            return inventory.TreeReference(file_id, name, parent_id, revision,
153
153
                                           reference_revision)
154
154
        else:
155
 
            return xml6.Serializer_v6._unpack_entry(self, elt)
 
155
            return xml7.Serializer_v7._unpack_entry(self, elt)
156
156
 
157
157
    def __init__(self, node_size, search_key_name):
158
158
        self.maximum_size = node_size
159
159
        self.search_key_name = search_key_name
160
160
 
161
161
 
162
 
class CHKSerializer(xml5.Serializer_v5):
 
162
class CHKSerializer(xml6.Serializer_v6):
163
163
    """A CHKInventory based serializer with 'plain' behaviour."""
164
164
 
165
165
    format_num = '9'