1
# Copyright (C) 2005, 2006 Canonical Ltd
3
1
# This program is free software; you can redistribute it and/or modify
4
2
# it under the terms of the GNU General Public License as published by
5
3
# the Free Software Foundation; either version 2 of the License, or
6
4
# (at your option) any later version.
8
6
# This program is distributed in the hope that it will be useful,
9
7
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
8
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
9
# GNU General Public License for more details.
13
11
# You should have received a copy of the GNU General Public License
14
12
# along with this program; if not, write to the Free Software
15
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24
from bzrlib.xml_serializer import SubElement, Element, Serializer
16
from bzrlib.xml import ElementTree, SubElement, Element, Serializer
25
17
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
26
from bzrlib.revision import Revision
18
import bzrlib.inventory as inventory
19
from bzrlib.revision import Revision
27
20
from bzrlib.errors import BzrError
33
"'":"'", # FIXME: overkill
40
def _ensure_utf8_re():
41
"""Make sure the _utf8_re regex has been compiled"""
43
if _utf8_re is not None:
45
_utf8_re = re.compile(u'[&<>\'\"\u0080-\uffff]')
48
def _utf8_escape_replace(match, _map=_utf8_escape_map):
49
"""Replace a string of non-ascii, non XML safe characters with their escape
51
This will escape both Standard XML escapes, like <>"', etc.
52
As well as escaping non ascii characters, because ElementTree did.
53
This helps us remain compatible to older versions of bzr. We may change
54
our policy in the future, though.
56
# jam 20060816 Benchmarks show that try/KeyError is faster if you
57
# expect the entity to rarely miss. There is about a 10% difference
58
# in overall time. But if you miss frequently, then if None is much
59
# faster. For our use case, we *rarely* have a revision id, file id
60
# or path name that is unicode. So use try/KeyError.
62
return _map[match.group()]
64
return "&#%d;" % ord(match.group())
67
_unicode_to_escaped_map = {}
69
def _encode_and_escape(unicode_str, _map=_unicode_to_escaped_map):
70
"""Encode the string into utf8, and escape invalid XML characters"""
71
# We frequently get entities we have not seen before, so it is better
72
# to check if None, rather than try/KeyError
73
text = _map.get(unicode_str)
75
# The alternative policy is to do a regular UTF8 encoding
76
# and then escape only XML meta characters.
77
# Performance is equivalent once you use cache_utf8. *However*
78
# this makes the serialized texts incompatible with old versions
79
# of bzr. So no net gain. (Perhaps the read code would handle utf8
80
# better than entity escapes, but cElementTree seems to do just fine
82
text = str(_utf8_re.sub(_utf8_escape_replace, unicode_str)) + '"'
83
_map[unicode_str] = text
88
"""Clean out the unicode => escaped map"""
89
_unicode_to_escaped_map.clear()
92
23
class Serializer_v5(Serializer):
93
24
"""Version 5 serializer
100
def write_inventory_to_string(self, inv):
101
"""Just call write_inventory with a StringIO and return the value"""
102
sio = cStringIO.StringIO()
103
self.write_inventory(inv, sio)
104
return sio.getvalue()
106
def write_inventory(self, inv, f):
107
"""Write inventory to a file.
109
:param inv: the inventory to write.
110
:param f: the file to write.
114
append = output.append
115
self._append_inventory_root(append, inv)
116
entries = inv.iter_entries()
118
root_path, root_ie = entries.next()
119
for path, ie in entries:
120
self._append_entry(append, ie)
121
append('</inventory>\n')
123
# Just to keep the cache from growing without bounds
124
# but we may actually not want to do clear the cache
127
def _append_inventory_root(self, append, inv):
128
"""Append the inventory root to output."""
31
def _pack_inventory(self, inv):
32
"""Convert to XML Element"""
33
e = Element('inventory',
130
36
if inv.root.file_id not in (None, ROOT_ID):
132
append(_encode_and_escape(inv.root.file_id))
133
append(' format="5"')
134
if inv.revision_id is not None:
135
append(' revision_id="')
136
append(_encode_and_escape(inv.revision_id))
139
def _append_entry(self, append, ie):
140
"""Convert InventoryEntry to XML element and append to output."""
141
# TODO: should just be a plain assertion
142
assert InventoryEntry.versionable_kind(ie.kind), \
143
'unsupported entry kind %s' % ie.kind
37
e.set('file_id', inv.root.file_id)
38
for path, ie in inv.iter_entries():
39
e.append(self._pack_entry(ie))
43
def _pack_entry(self, ie):
44
"""Convert InventoryEntry to XML element"""
45
if not InventoryEntry.versionable_kind(ie.kind):
46
raise AssertionError('unsupported entry kind %s' % ie.kind)
48
e.set('name', ie.name)
49
e.set('file_id', ie.file_id)
51
if ie.text_size != None:
52
e.set('text_size', '%d' % ie.text_size)
54
for f in ['text_sha1', 'revision', 'symlink_target']:
148
append(' executable="yes"')
150
append(_encode_and_escape(ie.file_id))
152
append(_encode_and_escape(ie.name))
60
e.set('executable', 'yes')
62
# to be conservative, we don't externalize the root pointers
63
# for now, leaving them as null in the xml form. in a future
64
# version it will be implied by nested elements.
153
65
if ie.parent_id != ROOT_ID:
154
66
assert isinstance(ie.parent_id, basestring)
155
append(' parent_id="')
156
append(_encode_and_escape(ie.parent_id))
157
if ie.revision is not None:
158
append(' revision="')
159
append(_encode_and_escape(ie.revision))
160
if ie.symlink_target is not None:
161
append(' symlink_target="')
162
append(_encode_and_escape(ie.symlink_target))
163
if ie.text_sha1 is not None:
164
append(' text_sha1="')
167
if ie.text_size is not None:
168
append(' text_size="%d"' % ie.text_size)
67
e.set('parent_id', ie.parent_id)
172
74
def _pack_revision(self, rev):
173
75
"""Revision object -> xml tree"""
231
133
def _unpack_entry(self, elt):
233
135
if not InventoryEntry.versionable_kind(kind):
234
136
raise AssertionError('unsupported entry kind %s' % kind)
236
get_cached = cache_utf8.get_cached_unicode
238
138
parent_id = elt.get('parent_id')
239
139
if parent_id == None:
240
140
parent_id = ROOT_ID
241
# TODO: jam 20060817 At present, caching file ids costs us too
242
# much time. It slows down overall read performances from
243
# approx 500ms to 700ms. And doesn't improve future reads.
244
# it might be because revision ids and file ids are mixing.
245
# Consider caching *just* the file ids, for a limited period
247
#parent_id = get_cached(parent_id)
248
#file_id = get_cached(elt.get('file_id'))
249
file_id = elt.get('file_id')
251
142
if kind == 'directory':
252
ie = inventory.InventoryDirectory(file_id,
143
ie = inventory.InventoryDirectory(elt.get('file_id'),
255
146
elif kind == 'file':
256
ie = inventory.InventoryFile(file_id,
147
ie = inventory.InventoryFile(elt.get('file_id'),
259
150
ie.text_sha1 = elt.get('text_sha1')
262
153
v = elt.get('text_size')
263
154
ie.text_size = v and int(v)
264
155
elif kind == 'symlink':
265
ie = inventory.InventoryLink(file_id,
156
ie = inventory.InventoryLink(elt.get('file_id'),
268
159
ie.symlink_target = elt.get('symlink_target')
270
161
raise BzrError("unknown kind %r" % kind)
271
revision = elt.get('revision')
272
if revision is not None:
273
revision = get_cached(revision)
274
ie.revision = revision
162
ie.revision = elt.get('revision')
278
167
def _unpack_revision(self, elt):
279
168
"""XML Element -> Revision object"""
280
169
assert elt.tag == 'revision'
283
172
if format != '5':
284
173
raise BzrError("invalid format version %r on inventory"
286
get_cached = cache_utf8.get_cached_unicode
287
175
rev = Revision(committer = elt.get('committer'),
288
176
timestamp = float(elt.get('timestamp')),
289
revision_id = get_cached(elt.get('revision_id')),
177
revision_id = elt.get('revision_id'),
290
178
inventory_sha1 = elt.get('inventory_sha1')
292
180
parents = elt.find('parents') or []
293
181
for p in parents:
294
182
assert p.tag == 'revision_ref', \
295
183
"bad parent node tag %r" % p.tag
296
rev.parent_ids.append(get_cached(p.get('revision_id')))
184
rev.parent_ids.append(p.get('revision_id'))
297
185
self._unpack_revision_properties(elt, rev)
298
186
v = elt.get('timezone')
302
rev.timezone = int(v)
187
rev.timezone = v and int(v)
303
188
rev.message = elt.findtext('message') # text of <message>
306
192
def _unpack_revision_properties(self, elt, rev):
307
193
"""Unpack properties onto a revision."""
308
194
props_elt = elt.find('properties')
312
198
for prop_elt in props_elt:
313
199
assert prop_elt.tag == 'property', \
314
"bad tag under properties list: %r" % prop_elt.tag
200
"bad tag under properties list: %r" % p.tag
315
201
name = prop_elt.get('name')
316
202
value = prop_elt.text
317
# If a property had an empty value ('') cElementTree reads
318
# that back as None, convert it back to '', so that all
319
# properties have string values
322
203
assert name not in rev.properties, \
323
"repeated property %r" % name
204
"repeated property %r" % p.name
324
205
rev.properties[name] = value
added
removed
bzrlib/xml5.py
