~bzr-pqm/bzr/2.1

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1 by mbp at sourcefrog
import from baz patch-364
16
17
"""XML externalization support."""
18
48 by Martin Pool
witty comment
19
# "XML is like violence: if it doesn't solve your problem, you aren't
20
# using enough of it." -- various
21
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
22
# importing this module is fairly slow because it has to load several
23
# ElementTree bits
24
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
25
from bzrlib.serializer import Serializer
1248 by Martin Pool
- new weave based cleanup [broken]
26
from bzrlib.trace import mutter, warning
27
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
28
try:
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
29
    try:
30
        # it's in this package in python2.5
31
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
32
            XMLTreeBuilder, fromstring, tostring)
33
        import xml.etree as elementtree
4854.2.1 by Martin
Prevent AttributeError in xml_serializer on certain cElementTree setups
34
        # Also import ElementTree module so monkey-patching below always works
35
        import xml.etree.ElementTree
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
36
    except ImportError:
37
        from cElementTree import (ElementTree, SubElement, Element,
38
                                  XMLTreeBuilder, fromstring, tostring)
3475.1.2 by John Arbash Meinel
Fix missing import
39
        import elementtree.ElementTree
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
40
    ParseError = SyntaxError
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
41
except ImportError:
1185.33.68 by Martin Pool
Emit warning to trace file only if using cElementTree.
42
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
43
           " and make sure it's on your PYTHONPATH")
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
44
    # this copy is shipped with bzr
1227 by Martin Pool
- methods to deserialize objects from strings
45
    from util.elementtree.ElementTree import (ElementTree, SubElement,
1248 by Martin Pool
- new weave based cleanup [broken]
46
                                              Element, XMLTreeBuilder,
47
                                              fromstring, tostring)
1772.1.1 by mbp at sourcefrog
Fix up loading of fallback ElementTree
48
    import util.elementtree as elementtree
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
49
    from xml.parsers.expat import ExpatError as ParseError
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
50
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
51
from bzrlib import errors
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
52
53
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
54
class XMLSerializer(Serializer):
55
    """Abstract XML object serialize/deserialize"""
1248 by Martin Pool
- new weave based cleanup [broken]
56
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
57
    squashes_xml_invalid_characters = True
58
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
59
    def read_inventory_from_string(self, xml_string, revision_id=None,
4797.91.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
60
                                   entry_cache=None, return_from_cache=False):
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
61
        """Read xml_string into an inventory object.
62
63
        :param xml_string: The xml to read.
64
        :param revision_id: If not-None, the expected revision id of the
65
            inventory. Some serialisers use this to set the results' root
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
66
            revision. This should be supplied for deserialising all
67
            from-repository inventories so that xml5 inventories that were
68
            serialised without a revision identifier can be given the right
69
            revision id (but not for working tree inventories where users can
70
            edit the data without triggering checksum errors or anything).
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
71
        :param entry_cache: An optional cache of InventoryEntry objects. If
72
            supplied we will look up entries via (file_id, revision_id) which
73
            should map to a valid InventoryEntry (File/Directory/etc) object.
4797.91.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
74
        :param return_from_cache: Return entries directly from the cache,
75
            rather than copying them first. This is only safe if the caller
76
            promises not to mutate the returned inventory entries, but it can
77
            make some operations significantly faster.
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
78
        """
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
79
        try:
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
80
            return self._unpack_inventory(fromstring(xml_string), revision_id,
4797.91.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
81
                                          entry_cache=entry_cache,
82
                                          return_from_cache=return_from_cache)
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
83
        except ParseError, e:
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
84
            raise errors.UnexpectedInventoryFormat(e)
1227 by Martin Pool
- methods to deserialize objects from strings
85
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
86
    def read_inventory(self, f, revision_id=None):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
87
        try:
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
88
            return self._unpack_inventory(self._read_element(f),
89
                revision_id=None)
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
90
        except ParseError, e:
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
91
            raise errors.UnexpectedInventoryFormat(e)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
92
1182 by Martin Pool
- more disentangling of xml storage format from objects
93
    def write_revision(self, rev, f):
94
        self._write_element(self._pack_revision(rev), f)
95
1248 by Martin Pool
- new weave based cleanup [broken]
96
    def write_revision_to_string(self, rev):
1185.16.123 by Martin Pool
Fix syntax of serializer_v5.pack_revision_to_string
97
        return tostring(self._pack_revision(rev)) + '\n'
1248 by Martin Pool
- new weave based cleanup [broken]
98
1182 by Martin Pool
- more disentangling of xml storage format from objects
99
    def read_revision(self, f):
100
        return self._unpack_revision(self._read_element(f))
101
1227 by Martin Pool
- methods to deserialize objects from strings
102
    def read_revision_from_string(self, xml_string):
1248 by Martin Pool
- new weave based cleanup [broken]
103
        return self._unpack_revision(fromstring(xml_string))
1227 by Martin Pool
- methods to deserialize objects from strings
104
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
105
    def _write_element(self, elt, f):
106
        ElementTree(elt).write(f, 'utf-8')
107
        f.write('\n')
108
109
    def _read_element(self, f):
110
        return ElementTree().parse(f)
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
111
112
1772.1.1 by mbp at sourcefrog
Fix up loading of fallback ElementTree
113
# performance tuning for elementree's serialiser. This should be
1713.1.14 by Robert Collins
Review feedback.
114
# sent upstream - RBC 20060523.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
115
# the functions here are patched into elementtree at runtime.
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
116
import re
1713.1.14 by Robert Collins
Review feedback.
117
escape_re = re.compile("[&'\"<>]")
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
118
escape_map = {
119
    "&":'&amp;',
120
    "'":"&apos;", # FIXME: overkill
121
    "\"":"&quot;",
122
    "<":"&lt;",
123
    ">":"&gt;",
124
    }
125
def _escape_replace(match, map=escape_map):
126
    return map[match.group()]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
127
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
128
def _escape_attrib(text, encoding=None, replace=None):
129
    # escape attribute value
130
    try:
131
        if encoding:
132
            try:
133
                text = elementtree.ElementTree._encode(text, encoding)
134
            except UnicodeError:
135
                return elementtree.ElementTree._encode_entity(text)
136
        if replace is None:
137
            return escape_re.sub(_escape_replace, text)
138
        else:
139
            text = replace(text, "&", "&amp;")
140
            text = replace(text, "'", "&apos;") # FIXME: overkill
141
            text = replace(text, "\"", "&quot;")
142
            text = replace(text, "<", "&lt;")
143
            text = replace(text, ">", "&gt;")
144
            return text
145
    except (TypeError, AttributeError):
146
        elementtree.ElementTree._raise_serialization_error(text)
147
148
elementtree.ElementTree._escape_attrib = _escape_attrib
149
1713.1.14 by Robert Collins
Review feedback.
150
escape_cdata_re = re.compile("[&<>]")
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
151
escape_cdata_map = {
152
    "&":'&amp;',
153
    "<":"&lt;",
154
    ">":"&gt;",
155
    }
156
def _escape_cdata_replace(match, map=escape_cdata_map):
157
    return map[match.group()]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
158
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
159
def _escape_cdata(text, encoding=None, replace=None):
160
    # escape character data
161
    try:
162
        if encoding:
163
            try:
164
                text = elementtree.ElementTree._encode(text, encoding)
165
            except UnicodeError:
166
                return elementtree.ElementTree._encode_entity(text)
167
        if replace is None:
168
            return escape_cdata_re.sub(_escape_cdata_replace, text)
169
        else:
170
            text = replace(text, "&", "&amp;")
171
            text = replace(text, "<", "&lt;")
172
            text = replace(text, ">", "&gt;")
173
            return text
174
    except (TypeError, AttributeError):
175
        elementtree.ElementTree._raise_serialization_error(text)
176
177
elementtree.ElementTree._escape_cdata = _escape_cdata
2520.4.101 by Aaron Bentley
Use a registry to look up xml serializers by format
178
179
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
180
def escape_invalid_chars(message):
181
    """Escape the XML-invalid characters in a commit message.
182
183
    :param message: Commit message to escape
4354.1.1 by Jelmer Vernooij
Fix docstring for bzrlib.xml_serializer.escape_invalid_chars.
184
    :return: tuple with escaped message and number of characters escaped
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
185
    """
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
186
    if message is None:
187
        return None, 0
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
188
    # Python strings can include characters that can't be
189
    # represented in well-formed XML; escape characters that
190
    # aren't listed in the XML specification
191
    # (http://www.w3.org/TR/REC-xml/#NT-Char).
192
    return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
193
            lambda match: match.group(0).encode('unicode_escape'),
194
            message)