~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
16
17
from bzrlib import (
18
    cache_utf8,
3882.6.7 by John Arbash Meinel
Do Inventory.add() optimizations, and determine 'best' results.
19
    errors,
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
20
    inventory,
21
    xml6,
6355.1.8 by Jelmer Vernooij
Fix tests.
22
    )
23
from bzrlib.xml_serializer import (
24
    encode_and_escape,
25
    get_utf8_or_ascii,
26
    unpack_inventory_entry,
27
    )
28
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
29
30
class Serializer_v5(xml6.Serializer_v6):
31
    """Version 5 serializer
32
33
    Packs objects into XML and vice versa.
34
    """
35
    format_num = '5'
36
    root_id = inventory.ROOT_ID
37
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
38
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
39
                          return_from_cache=False):
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
40
        """Construct from XML Element
41
        """
42
        root_id = elt.get('file_id') or inventory.ROOT_ID
6355.1.8 by Jelmer Vernooij
Fix tests.
43
        root_id = get_utf8_or_ascii(root_id)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
44
45
        format = elt.get('format')
46
        if format is not None:
47
            if format != '5':
4476.3.28 by Andrew Bennetts
Fix trivial bug in xml5 error path.
48
                raise errors.BzrError("invalid format version %r on inventory"
49
                                      % format)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
50
        data_revision_id = elt.get('revision_id')
51
        if data_revision_id is not None:
52
            revision_id = cache_utf8.encode(data_revision_id)
53
        inv = inventory.Inventory(root_id, revision_id=revision_id)
3882.6.7 by John Arbash Meinel
Do Inventory.add() optimizations, and determine 'best' results.
54
        # Optimizations tested
55
        #   baseline w/entry cache  2.85s
56
        #   using inv._byid         2.55s
57
        #   avoiding attributes     2.46s
58
        #   adding assertions       2.50s
59
        #   last_parent cache       2.52s (worse, removed)
60
        byid = inv._byid
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
61
        for e in elt:
6355.1.8 by Jelmer Vernooij
Fix tests.
62
            ie = unpack_inventory_entry(e, entry_cache=entry_cache,
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
63
                              return_from_cache=return_from_cache)
3882.6.7 by John Arbash Meinel
Do Inventory.add() optimizations, and determine 'best' results.
64
            parent_id = ie.parent_id
65
            if parent_id is None:
66
                ie.parent_id = parent_id = root_id
67
            try:
68
                parent = byid[parent_id]
69
            except KeyError:
70
                raise errors.BzrError("parent_id {%s} not in inventory"
71
                                      % (parent_id,))
72
            if ie.file_id in byid:
73
                raise errors.DuplicateFileId(ie.file_id,
74
                                             byid[ie.file_id])
75
            if ie.name in parent.children:
76
                raise errors.BzrError("%s is already versioned"
77
                    % (osutils.pathjoin(inv.id2path(parent_id),
78
                       ie.name).encode('utf-8'),))
79
            parent.children[ie.name] = ie
80
            byid[ie.file_id] = ie
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
81
        if revision_id is not None:
82
            inv.root.revision = revision_id
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
83
        self._check_cache_size(len(inv), entry_cache)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
84
        return inv
85
86
    def _check_revisions(self, inv):
87
        """Extension point for subclasses to check during serialisation.
88
89
        In this version, no checking is done.
90
91
        :param inv: An inventory about to be serialised, to be checked.
4031.3.1 by Frank Aspell
Fixing various typos
92
        :raises: AssertionError if an error has occurred.
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
93
        """
94
95
    def _append_inventory_root(self, append, inv):
96
        """Append the inventory root to output."""
97
        if inv.root.file_id not in (None, inventory.ROOT_ID):
98
            fileid1 = ' file_id="'
6355.1.8 by Jelmer Vernooij
Fix tests.
99
            fileid2 = encode_and_escape(inv.root.file_id)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
100
        else:
101
            fileid1 = ""
102
            fileid2 = ""
103
        if inv.revision_id is not None:
104
            revid1 = ' revision_id="'
6355.1.8 by Jelmer Vernooij
Fix tests.
105
            revid2 = encode_and_escape(inv.revision_id)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
106
        else:
107
            revid1 = ""
108
            revid2 = ""
109
        append('<inventory%s%s format="5"%s%s>\n' % (
110
            fileid1, fileid2, revid1, revid2))
111
112
113
serializer_v5 = Serializer_v5()