← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.py

merge from dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml7.py
26
26
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
27
27
    format_num = '7'
28
28
 
29
 
    def _unpack_entry(self, elt, none_parents):
30
 
        assert none_parents is True
 
29
    def _unpack_entry(self, elt):
31
30
        kind = elt.tag
32
31
        if not kind in self.supported_kinds:
33
32
            raise AssertionError('unsupported entry kind %s' % kind)
40
39
            return inventory.TreeReference(file_id, name, parent_id, revision,
41
40
                                           reference_revision)
42
41
        else:
43
 
            return xml6.Serializer_v6._unpack_entry(self, elt, none_parents)
 
42
            return xml6.Serializer_v6._unpack_entry(self, elt)
44
43
 
45
44
serializer_v7 = Serializer_v7()