← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: Martin Pool
  • Date: 2009-01-13 03:06:36 UTC
  • mfrom: (3932.2.3 1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mbp@sourcefrog.net-20090113030636-dqx4t8yaaqgdvam5
Merge 1.11rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from __future__ import absolute_import
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
17
from bzrlib import (
20
18
    cache_utf8,
21
19
    errors,
22
20
    inventory,
23
21
    xml6,
24
 
    )
25
 
from bzrlib.xml_serializer import (
26
 
    encode_and_escape,
27
 
    get_utf8_or_ascii,
28
 
    unpack_inventory_entry,
29
 
    )
30
 
 
 
22
    xml8,
 
23
    )
31
24
 
32
25
class Serializer_v5(xml6.Serializer_v6):
33
26
    """Version 5 serializer
37
30
    format_num = '5'
38
31
    root_id = inventory.ROOT_ID
39
32
 
40
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
41
 
                          return_from_cache=False):
 
33
    def _unpack_inventory(self, elt, revision_id, entry_cache=None):
42
34
        """Construct from XML Element
43
35
        """
44
36
        root_id = elt.get('file_id') or inventory.ROOT_ID
45
 
        root_id = get_utf8_or_ascii(root_id)
 
37
        root_id = xml8._get_utf8_or_ascii(root_id)
46
38
 
47
39
        format = elt.get('format')
48
40
        if format is not None:
49
41
            if format != '5':
50
 
                raise errors.BzrError("invalid format version %r on inventory"
51
 
                                      % format)
 
42
                raise BzrError("invalid format version %r on inventory"
 
43
                                % format)
52
44
        data_revision_id = elt.get('revision_id')
53
45
        if data_revision_id is not None:
54
46
            revision_id = cache_utf8.encode(data_revision_id)
59
51
        #   avoiding attributes     2.46s
60
52
        #   adding assertions       2.50s
61
53
        #   last_parent cache       2.52s (worse, removed)
 
54
        unpack_entry = self._unpack_entry
62
55
        byid = inv._byid
63
56
        for e in elt:
64
 
            ie = unpack_inventory_entry(e, entry_cache=entry_cache,
65
 
                              return_from_cache=return_from_cache)
 
57
            ie = unpack_entry(e, entry_cache=entry_cache)
66
58
            parent_id = ie.parent_id
67
59
            if parent_id is None:
68
60
                ie.parent_id = parent_id = root_id
91
83
        In this version, no checking is done.
92
84
 
93
85
        :param inv: An inventory about to be serialised, to be checked.
94
 
        :raises: AssertionError if an error has occurred.
 
86
        :raises: AssertionError if an error has occured.
95
87
        """
96
88
 
97
89
    def _append_inventory_root(self, append, inv):
98
90
        """Append the inventory root to output."""
99
91
        if inv.root.file_id not in (None, inventory.ROOT_ID):
100
92
            fileid1 = ' file_id="'
101
 
            fileid2 = encode_and_escape(inv.root.file_id)
 
93
            fileid2 = xml8._encode_and_escape(inv.root.file_id)
102
94
        else:
103
95
            fileid1 = ""
104
96
            fileid2 = ""
105
97
        if inv.revision_id is not None:
106
98
            revid1 = ' revision_id="'
107
 
            revid2 = encode_and_escape(inv.revision_id)
 
99
            revid2 = xml8._encode_and_escape(inv.revision_id)
108
100
        else:
109
101
            revid1 = ""
110
102
            revid2 = ""