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 |
||
5340.11.1
by Martin
Remove monkey patching of private ElementTree escaping functions entirely |
25 |
import re |
26 |
||
4237.3.1
by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in |
27 |
from bzrlib.serializer import Serializer |
5121.2.4
by Jelmer Vernooij
Remove more unused imports. |
28 |
from bzrlib.trace import mutter |
1248
by Martin Pool
- new weave based cleanup [broken] |
29 |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
30 |
try: |
2039.2.1
by Martin Pool
Load python2.5's ElementTree if present |
31 |
try: |
32 |
# it's in this package in python2.5
|
|
33 |
from xml.etree.cElementTree import (ElementTree, SubElement, Element, |
|
34 |
XMLTreeBuilder, fromstring, tostring) |
|
35 |
import xml.etree as elementtree |
|
4797.66.1
by Martin
Prevent AttributeError in xml_serializer on certain cElementTree setups |
36 |
# Also import ElementTree module so monkey-patching below always works
|
37 |
import xml.etree.ElementTree |
|
2039.2.1
by Martin Pool
Load python2.5's ElementTree if present |
38 |
except ImportError: |
39 |
from cElementTree import (ElementTree, SubElement, Element, |
|
40 |
XMLTreeBuilder, fromstring, tostring) |
|
3475.1.2
by John Arbash Meinel
Fix missing import |
41 |
import elementtree.ElementTree |
2029.2.1
by Marien Zwart
Handle the different exception (non-c)ElementTree raises. |
42 |
ParseError = SyntaxError |
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
43 |
except ImportError: |
1185.33.68
by Martin Pool
Emit warning to trace file only if using cElementTree. |
44 |
mutter('WARNING: using slower ElementTree; consider installing cElementTree' |
45 |
" and make sure it's on your PYTHONPATH") |
|
2039.2.1
by Martin Pool
Load python2.5's ElementTree if present |
46 |
# this copy is shipped with bzr
|
1227
by Martin Pool
- methods to deserialize objects from strings |
47 |
from util.elementtree.ElementTree import (ElementTree, SubElement, |
1248
by Martin Pool
- new weave based cleanup [broken] |
48 |
Element, XMLTreeBuilder, |
49 |
fromstring, tostring) |
|
1772.1.1
by mbp at sourcefrog
Fix up loading of fallback ElementTree |
50 |
import util.elementtree as elementtree |
2029.2.1
by Marien Zwart
Handle the different exception (non-c)ElementTree raises. |
51 |
from xml.parsers.expat import ExpatError as ParseError |
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
52 |
|
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
53 |
from bzrlib import errors |
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
54 |
|
55 |
||
4237.3.1
by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in |
56 |
class XMLSerializer(Serializer): |
57 |
"""Abstract XML object serialize/deserialize"""
|
|
1248
by Martin Pool
- new weave based cleanup [broken] |
58 |
|
4416.5.1
by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer. |
59 |
squashes_xml_invalid_characters = True |
60 |
||
3882.6.23
by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api. |
61 |
def read_inventory_from_string(self, xml_string, revision_id=None, |
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
62 |
entry_cache=None, return_from_cache=False): |
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
63 |
"""Read xml_string into an inventory object.
|
64 |
||
65 |
:param xml_string: The xml to read.
|
|
66 |
:param revision_id: If not-None, the expected revision id of the
|
|
67 |
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. |
68 |
revision. This should be supplied for deserialising all
|
69 |
from-repository inventories so that xml5 inventories that were
|
|
70 |
serialised without a revision identifier can be given the right
|
|
71 |
revision id (but not for working tree inventories where users can
|
|
72 |
edit the data without triggering checksum errors or anything).
|
|
3882.6.23
by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api. |
73 |
:param entry_cache: An optional cache of InventoryEntry objects. If
|
74 |
supplied we will look up entries via (file_id, revision_id) which
|
|
75 |
should map to a valid InventoryEntry (File/Directory/etc) object.
|
|
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
76 |
:param return_from_cache: Return entries directly from the cache,
|
77 |
rather than copying them first. This is only safe if the caller
|
|
78 |
promises not to mutate the returned inventory entries, but it can
|
|
79 |
make some operations significantly faster.
|
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
80 |
"""
|
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
81 |
try: |
3882.6.23
by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api. |
82 |
return self._unpack_inventory(fromstring(xml_string), revision_id, |
4849.4.2
by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute. |
83 |
entry_cache=entry_cache, |
84 |
return_from_cache=return_from_cache) |
|
2029.2.1
by Marien Zwart
Handle the different exception (non-c)ElementTree raises. |
85 |
except ParseError, e: |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
86 |
raise errors.UnexpectedInventoryFormat(e) |
1227
by Martin Pool
- methods to deserialize objects from strings |
87 |
|
2889.1.1
by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into |
88 |
def read_inventory(self, f, revision_id=None): |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
89 |
try: |
4708.2.1
by Martin
Ensure all files opened by bazaar proper are explicitly closed |
90 |
try: |
91 |
return self._unpack_inventory(self._read_element(f), |
|
92 |
revision_id=None) |
|
93 |
finally: |
|
94 |
f.close() |
|
2029.2.1
by Marien Zwart
Handle the different exception (non-c)ElementTree raises. |
95 |
except ParseError, e: |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
96 |
raise errors.UnexpectedInventoryFormat(e) |
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
97 |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
98 |
def write_revision(self, rev, f): |
99 |
self._write_element(self._pack_revision(rev), f) |
|
100 |
||
1248
by Martin Pool
- new weave based cleanup [broken] |
101 |
def write_revision_to_string(self, rev): |
1185.16.123
by Martin Pool
Fix syntax of serializer_v5.pack_revision_to_string |
102 |
return tostring(self._pack_revision(rev)) + '\n' |
1248
by Martin Pool
- new weave based cleanup [broken] |
103 |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
104 |
def read_revision(self, f): |
105 |
return self._unpack_revision(self._read_element(f)) |
|
106 |
||
1227
by Martin Pool
- methods to deserialize objects from strings |
107 |
def read_revision_from_string(self, xml_string): |
1248
by Martin Pool
- new weave based cleanup [broken] |
108 |
return self._unpack_revision(fromstring(xml_string)) |
1227
by Martin Pool
- methods to deserialize objects from strings |
109 |
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
110 |
def _write_element(self, elt, f): |
111 |
ElementTree(elt).write(f, 'utf-8') |
|
112 |
f.write('\n') |
|
113 |
||
114 |
def _read_element(self, f): |
|
115 |
return ElementTree().parse(f) |
|
1713.1.12
by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines. |
116 |
|
117 |
||
4222.1.1
by Jelmer Vernooij
Make function for escaping invalid XML characters public. |
118 |
def escape_invalid_chars(message): |
119 |
"""Escape the XML-invalid characters in a commit message.
|
|
120 |
||
121 |
:param message: Commit message to escape
|
|
4354.1.1
by Jelmer Vernooij
Fix docstring for bzrlib.xml_serializer.escape_invalid_chars. |
122 |
:return: tuple with escaped message and number of characters escaped
|
4222.1.1
by Jelmer Vernooij
Make function for escaping invalid XML characters public. |
123 |
"""
|
4416.5.1
by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer. |
124 |
if message is None: |
125 |
return None, 0 |
|
4222.1.1
by Jelmer Vernooij
Make function for escaping invalid XML characters public. |
126 |
# Python strings can include characters that can't be
|
127 |
# represented in well-formed XML; escape characters that
|
|
128 |
# aren't listed in the XML specification
|
|
129 |
# (http://www.w3.org/TR/REC-xml/#NT-Char).
|
|
130 |
return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+', |
|
131 |
lambda match: match.group(0).encode('unicode_escape'), |
|
132 |
message) |