← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

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
 
    errors,
22
19
    inventory,
23
20
    xml6,
24
 
    )
25
 
from bzrlib.xml_serializer import (
26
 
    encode_and_escape,
27
 
    get_utf8_or_ascii,
28
 
    unpack_inventory_entry,
29
 
    )
30
 
 
 
21
    xml8,
 
22
    )
31
23
 
32
24
class Serializer_v5(xml6.Serializer_v6):
33
25
    """Version 5 serializer
37
29
    format_num = '5'
38
30
    root_id = inventory.ROOT_ID
39
31
 
40
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
41
 
                          return_from_cache=False):
 
32
    def _unpack_inventory(self, elt, revision_id):
42
33
        """Construct from XML Element
43
34
        """
44
35
        root_id = elt.get('file_id') or inventory.ROOT_ID
45
 
        root_id = get_utf8_or_ascii(root_id)
 
36
        root_id = xml8._get_utf8_or_ascii(root_id)
46
37
 
47
38
        format = elt.get('format')
48
39
        if format is not None:
49
40
            if format != '5':
50
 
                raise errors.BzrError("invalid format version %r on inventory"
51
 
                                      % format)
 
41
                raise BzrError("invalid format version %r on inventory"
 
42
                                % format)
52
43
        data_revision_id = elt.get('revision_id')
53
44
        if data_revision_id is not None:
54
45
            revision_id = cache_utf8.encode(data_revision_id)
55
46
        inv = inventory.Inventory(root_id, revision_id=revision_id)
56
 
        # Optimizations tested
57
 
        #   baseline w/entry cache  2.85s
58
 
        #   using inv._byid         2.55s
59
 
        #   avoiding attributes     2.46s
60
 
        #   adding assertions       2.50s
61
 
        #   last_parent cache       2.52s (worse, removed)
62
 
        byid = inv._byid
63
47
        for e in elt:
64
 
            ie = unpack_inventory_entry(e, entry_cache=entry_cache,
65
 
                              return_from_cache=return_from_cache)
66
 
            parent_id = ie.parent_id
67
 
            if parent_id is None:
68
 
                ie.parent_id = parent_id = root_id
69
 
            try:
70
 
                parent = byid[parent_id]
71
 
            except KeyError:
72
 
                raise errors.BzrError("parent_id {%s} not in inventory"
73
 
                                      % (parent_id,))
74
 
            if ie.file_id in byid:
75
 
                raise errors.DuplicateFileId(ie.file_id,
76
 
                                             byid[ie.file_id])
77
 
            if ie.name in parent.children:
78
 
                raise errors.BzrError("%s is already versioned"
79
 
                    % (osutils.pathjoin(inv.id2path(parent_id),
80
 
                       ie.name).encode('utf-8'),))
81
 
            parent.children[ie.name] = ie
82
 
            byid[ie.file_id] = ie
 
48
            ie = self._unpack_entry(e)
 
49
            if ie.parent_id is None:
 
50
                ie.parent_id = root_id
 
51
            inv.add(ie)
83
52
        if revision_id is not None:
84
53
            inv.root.revision = revision_id
85
 
        self._check_cache_size(len(inv), entry_cache)
86
54
        return inv
87
55
 
88
56
    def _check_revisions(self, inv):
91
59
        In this version, no checking is done.
92
60
 
93
61
        :param inv: An inventory about to be serialised, to be checked.
94
 
        :raises: AssertionError if an error has occurred.
 
62
        :raises: AssertionError if an error has occured.
95
63
        """
96
64
 
97
65
    def _append_inventory_root(self, append, inv):
98
66
        """Append the inventory root to output."""
99
67
        if inv.root.file_id not in (None, inventory.ROOT_ID):
100
68
            fileid1 = ' file_id="'
101
 
            fileid2 = encode_and_escape(inv.root.file_id)
 
69
            fileid2 = xml8._encode_and_escape(inv.root.file_id)
102
70
        else:
103
71
            fileid1 = ""
104
72
            fileid2 = ""
105
73
        if inv.revision_id is not None:
106
74
            revid1 = ' revision_id="'
107
 
            revid2 = encode_and_escape(inv.revision_id)
 
75
            revid2 = xml8._encode_and_escape(inv.revision_id)
108
76
        else:
109
77
            revid1 = ""
110
78
            revid2 = ""