← Back to branch summary

~lifeless/ubuntu/lucid/bzr/2.1.2-sru

« back to all changes in this revision

Viewing changes to bzrlib/xml7.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-02-17 17:47:40 UTC
  • mfrom: (1.5.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20100217174740-p1x5dd5uwvxtg9y6
Tags: upstream-2.1.0
Import upstream version 2.1.0

Show diffs side-by-side

added added

removed removed

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