← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml7.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from bzrlib import (
18
20
    inventory,
19
21
    xml6,
28
30
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
29
31
    format_num = '7'
30
32
 
31
 
    def _unpack_entry(self, elt, entry_cache=None):
 
33
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
32
34
        kind = elt.tag
33
35
        if not kind in self.supported_kinds:
34
36
            raise AssertionError('unsupported entry kind %s' % kind)
41
43
            return inventory.TreeReference(file_id, name, parent_id, revision,
42
44
                                           reference_revision)
43
45
        else:
44
 
            return xml6.Serializer_v6._unpack_entry(self, elt)
 
46
            return xml6.Serializer_v6._unpack_entry(self, elt,
 
47
                entry_cache=entry_cache, return_from_cache=return_from_cache)
45
48
 
46
49
serializer_v7 = Serializer_v7()