← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 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
    cache_utf8,
19
21
    errors,
20
22
    inventory,
21
23
    xml6,
22
 
    xml8,
23
 
    )
 
24
    )
 
25
from bzrlib.xml_serializer import (
 
26
    encode_and_escape,
 
27
    get_utf8_or_ascii,
 
28
    unpack_inventory_entry,
 
29
    )
 
30
 
24
31
 
25
32
class Serializer_v5(xml6.Serializer_v6):
26
33
    """Version 5 serializer
30
37
    format_num = '5'
31
38
    root_id = inventory.ROOT_ID
32
39
 
33
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None):
 
40
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
 
41
                          return_from_cache=False):
34
42
        """Construct from XML Element
35
43
        """
36
44
        root_id = elt.get('file_id') or inventory.ROOT_ID
37
 
        root_id = xml8._get_utf8_or_ascii(root_id)
 
45
        root_id = get_utf8_or_ascii(root_id)
38
46
 
39
47
        format = elt.get('format')
40
48
        if format is not None:
41
49
            if format != '5':
42
 
                raise BzrError("invalid format version %r on inventory"
43
 
                                % format)
 
50
                raise errors.BzrError("invalid format version %r on inventory"
 
51
                                      % format)
44
52
        data_revision_id = elt.get('revision_id')
45
53
        if data_revision_id is not None:
46
54
            revision_id = cache_utf8.encode(data_revision_id)
51
59
        #   avoiding attributes     2.46s
52
60
        #   adding assertions       2.50s
53
61
        #   last_parent cache       2.52s (worse, removed)
54
 
        unpack_entry = self._unpack_entry
55
62
        byid = inv._byid
56
63
        for e in elt:
57
 
            ie = unpack_entry(e, entry_cache=entry_cache)
 
64
            ie = unpack_inventory_entry(e, entry_cache=entry_cache,
 
65
                              return_from_cache=return_from_cache)
58
66
            parent_id = ie.parent_id
59
67
            if parent_id is None:
60
68
                ie.parent_id = parent_id = root_id
90
98
        """Append the inventory root to output."""
91
99
        if inv.root.file_id not in (None, inventory.ROOT_ID):
92
100
            fileid1 = ' file_id="'
93
 
            fileid2 = xml8._encode_and_escape(inv.root.file_id)
 
101
            fileid2 = encode_and_escape(inv.root.file_id)
94
102
        else:
95
103
            fileid1 = ""
96
104
            fileid2 = ""
97
105
        if inv.revision_id is not None:
98
106
            revid1 = ' revision_id="'
99
 
            revid2 = xml8._encode_and_escape(inv.revision_id)
 
107
            revid2 = encode_and_escape(inv.revision_id)
100
108
        else:
101
109
            revid1 = ""
102
110
            revid2 = ""