14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
24
from bzrlib.xml_serializer import SubElement, Element, Serializer
19
25
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
20
import bzrlib.inventory as inventory
21
26
from bzrlib.revision import Revision
22
27
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()
25
92
class Serializer_v5(Serializer):
26
93
"""Version 5 serializer
33
def _pack_inventory(self, inv):
34
"""Convert to XML Element"""
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)
35
116
entries = inv.iter_entries()
36
e = Element('inventory',
39
path, root = entries.next()
40
if root.file_id not in (None, ROOT_ID):
41
e.set('file_id', root.file_id)
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."""
130
if inv.root.file_id not in (None, ROOT_ID):
132
append(_encode_and_escape(inv.root.file_id))
133
append(' format="5"')
42
134
if inv.revision_id is not None:
43
e.set('revision_id', inv.revision_id)
44
for path, ie in entries:
45
e.append(self._pack_entry(ie))
48
def _pack_entry(self, ie):
49
"""Convert InventoryEntry to XML element"""
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."""
50
141
# TODO: should just be a plain assertion
51
if not InventoryEntry.versionable_kind(ie.kind):
52
raise AssertionError('unsupported entry kind %s' % ie.kind)
54
e.set('name', ie.name)
55
e.set('file_id', ie.file_id)
57
if ie.text_size != None:
58
e.set('text_size', '%d' % ie.text_size)
60
for f in ['text_sha1', 'revision', 'symlink_target']:
142
assert InventoryEntry.versionable_kind(ie.kind), \
143
'unsupported entry kind %s' % ie.kind
66
e.set('executable', 'yes')
68
# to be conservative, we don't externalize the root pointers
69
# for now, leaving them as null in the xml form. in a future
70
# version it will be implied by nested elements.
148
append(' executable="yes"')
150
append(_encode_and_escape(ie.file_id))
152
append(_encode_and_escape(ie.name))
71
153
if ie.parent_id != ROOT_ID:
72
154
assert isinstance(ie.parent_id, basestring)
73
e.set('parent_id', ie.parent_id)
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)
77
172
def _pack_revision(self, rev):
78
173
"""Revision object -> xml tree"""
137
231
def _unpack_entry(self, elt):
139
233
if not InventoryEntry.versionable_kind(kind):
140
234
raise AssertionError('unsupported entry kind %s' % kind)
236
get_cached = cache_utf8.get_cached_unicode
142
238
parent_id = elt.get('parent_id')
143
239
if parent_id == None:
144
240
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')
146
251
if kind == 'directory':
147
ie = inventory.InventoryDirectory(elt.get('file_id'),
252
ie = inventory.InventoryDirectory(file_id,
150
255
elif kind == 'file':
151
ie = inventory.InventoryFile(elt.get('file_id'),
256
ie = inventory.InventoryFile(file_id,
154
259
ie.text_sha1 = elt.get('text_sha1')
157
262
v = elt.get('text_size')
158
263
ie.text_size = v and int(v)
159
264
elif kind == 'symlink':
160
ie = inventory.InventoryLink(elt.get('file_id'),
265
ie = inventory.InventoryLink(file_id,
163
268
ie.symlink_target = elt.get('symlink_target')
165
270
raise BzrError("unknown kind %r" % kind)
166
ie.revision = elt.get('revision')
271
revision = elt.get('revision')
272
if revision is not None:
273
revision = get_cached(revision)
274
ie.revision = revision
171
278
def _unpack_revision(self, elt):
172
279
"""XML Element -> Revision object"""
173
280
assert elt.tag == 'revision'
176
283
if format != '5':
177
284
raise BzrError("invalid format version %r on inventory"
286
get_cached = cache_utf8.get_cached_unicode
179
287
rev = Revision(committer = elt.get('committer'),
180
288
timestamp = float(elt.get('timestamp')),
181
revision_id = elt.get('revision_id'),
289
revision_id = get_cached(elt.get('revision_id')),
182
290
inventory_sha1 = elt.get('inventory_sha1')
184
292
parents = elt.find('parents') or []
185
293
for p in parents:
186
294
assert p.tag == 'revision_ref', \
187
295
"bad parent node tag %r" % p.tag
188
rev.parent_ids.append(p.get('revision_id'))
296
rev.parent_ids.append(get_cached(p.get('revision_id')))
189
297
self._unpack_revision_properties(elt, rev)
190
298
v = elt.get('timezone')
191
rev.timezone = v and int(v)
302
rev.timezone = int(v)
192
303
rev.message = elt.findtext('message') # text of <message>
196
306
def _unpack_revision_properties(self, elt, rev):
197
307
"""Unpack properties onto a revision."""
198
308
props_elt = elt.find('properties')
added
removed
bzrlib/xml5.py
