13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
19
from io import BytesIO
24
revision as _mod_revision,
27
from .xml_serializer import (
34
serialize_inventory_flat,
35
unpack_inventory_entry,
36
unpack_inventory_flat,
38
from ..revision import Revision
39
from ..sixish import unichr
40
from ..errors import BzrError
52
def _unescaper(match, _map=_xml_unescape_map):
57
if not code.startswith(b'#'):
59
return unichr(int(code[1:])).encode('utf8')
62
_unescape_re = lazy_regex.lazy_compile(b'\\&([^;]*);')
65
def _unescape_xml(data):
66
"""Unescape predefined XML entities in a string of data."""
67
return _unescape_re.sub(_unescaper, data)
70
class Serializer_v8(XMLSerializer):
71
"""This serialiser adds rich roots.
73
Its revision format number matches its inventory number.
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.xml_serializer import SubElement, Element, Serializer
19
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
20
import bzrlib.inventory as inventory
21
from bzrlib.revision import Revision
22
from bzrlib.errors import BzrError
25
class Serializer_v5(Serializer):
26
"""Version 5 serializer
28
Packs objects into XML and vice versa.
79
support_altered_by_hack = True
80
# This format supports the altered-by hack that reads file ids directly out
81
# of the versionedfile, without doing XML parsing.
83
supported_kinds = {'file', 'directory', 'symlink'}
85
revision_format_num = None
87
# The search regex used by xml based repositories to determine what things
88
# where changed in a single commit.
89
_file_ids_altered_regex = lazy_regex.lazy_compile(
90
b'file_id="(?P<file_id>[^"]+)"'
91
b'.* revision="(?P<revision_id>[^"]+)"'
94
def _check_revisions(self, inv):
95
"""Extension point for subclasses to check during serialisation.
97
:param inv: An inventory about to be serialised, to be checked.
98
:raises: AssertionError if an error has occurred.
100
if inv.revision_id is None:
101
raise AssertionError("inv.revision_id is None")
102
if inv.root.revision is None:
103
raise AssertionError("inv.root.revision is None")
105
def _check_cache_size(self, inv_size, entry_cache):
106
"""Check that the entry_cache is large enough.
108
We want the cache to be ~2x the size of an inventory. The reason is
109
because we use a FIFO cache, and how Inventory records are likely to
110
change. In general, you have a small number of records which change
111
often, and a lot of records which do not change at all. So when the
112
cache gets full, you actually flush out a lot of the records you are
113
interested in, which means you need to recreate all of those records.
114
An LRU Cache would be better, but the overhead negates the cache
117
One way to look at it, only the size of the cache > len(inv) is your
118
'working' set. And in general, it shouldn't be a problem to hold 2
119
inventories in memory anyway.
121
:param inv_size: The number of entries in an inventory.
123
if entry_cache is None:
125
# 1.5 times might also be reasonable.
126
recommended_min_cache_size = inv_size * 1.5
127
if entry_cache.cache_size() < recommended_min_cache_size:
128
recommended_cache_size = inv_size * 2
129
trace.mutter('Resizing the inventory entry cache from %d to %d',
130
entry_cache.cache_size(), recommended_cache_size)
131
entry_cache.resize(recommended_cache_size)
133
def write_inventory_to_lines(self, inv):
134
"""Return a list of lines with the encoded inventory."""
135
return self.write_inventory(inv, None)
137
def write_inventory_to_chunks(self, inv):
138
return self.write_inventory(inv, None)
140
def write_inventory(self, inv, f, working=False):
141
"""Write inventory to a file.
143
:param inv: the inventory to write.
144
:param f: the file to write. (May be None if the lines are the desired
146
:param working: If True skip history data - text_sha1, text_size,
147
reference_revision, symlink_target.
148
:return: The inventory as a list of lines.
151
append = output.append
152
self._append_inventory_root(append, inv)
153
serialize_inventory_flat(inv, append,
154
self.root_id, self.supported_kinds, working)
157
# Just to keep the cache from growing without bounds
158
# but we may actually not want to do clear the cache
162
def _append_inventory_root(self, append, inv):
163
"""Append the inventory root to output."""
33
def _pack_inventory(self, inv):
34
"""Convert to XML Element"""
35
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)
164
42
if inv.revision_id is not None:
166
[b' revision_id="', encode_and_escape(inv.revision_id), b'"'])
169
append(b'<inventory format="%s"%s>\n' % (
170
self.format_num, revid1))
171
append(b'<directory file_id="%s" name="%s" revision="%s" />\n' % (
172
encode_and_escape(inv.root.file_id),
173
encode_and_escape(inv.root.name),
174
encode_and_escape(inv.root.revision)))
176
def write_revision_to_lines(self, rev):
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"""
50
# 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']:
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.
71
if ie.parent_id != ROOT_ID:
72
assert isinstance(ie.parent_id, basestring)
73
e.set('parent_id', ie.parent_id)
77
def _pack_revision(self, rev):
177
78
"""Revision object -> xml tree"""
178
# For the XML format, we need to write them as Unicode rather than as
179
# utf-8 strings. So that cElementTree can handle properly escaping
182
el = (b'<revision committer="%s" format="%s" '
183
b'inventory_sha1="%s" revision_id="%s" '
184
b'timestamp="%.3f"' % (
185
encode_and_escape(rev.committer),
186
self.revision_format_num or self.format_num,
188
encode_and_escape(cache_utf8.decode(rev.revision_id)),
190
if rev.timezone is not None:
191
el += b' timezone="%s"' % str(rev.timezone).encode('ascii')
192
lines.append(el + b'>\n')
193
message = encode_and_escape(escape_invalid_chars(rev.message)[0])
194
lines.extend((b'<message>' + message + b'</message>\n').splitlines(True))
79
root = Element('revision',
80
committer = rev.committer,
81
timestamp = '%.9f' % rev.timestamp,
82
revision_id = rev.revision_id,
83
inventory_sha1 = rev.inventory_sha1,
87
root.set('timezone', str(rev.timezone))
89
msg = SubElement(root, 'message')
90
msg.text = rev.message
195
92
if rev.parent_ids:
196
lines.append(b'<parents>\n')
93
pelts = SubElement(root, 'parents')
94
pelts.tail = pelts.text = '\n'
197
95
for parent_id in rev.parent_ids:
198
_mod_revision.check_not_reserved_id(parent_id)
200
b'<revision_ref revision_id="%s" />\n'
201
% encode_and_escape(cache_utf8.decode(parent_id)))
202
lines.append(b'</parents>\n')
96
assert isinstance(parent_id, basestring)
97
p = SubElement(pelts, 'revision_ref')
99
p.set('revision_id', parent_id)
203
100
if rev.properties:
204
preamble = b'<properties>'
205
for prop_name, prop_value in sorted(rev.properties.items()):
207
proplines = (preamble + b'<property name="%s">%s</property>\n' % (
208
encode_and_escape(prop_name),
209
encode_and_escape(escape_invalid_chars(prop_value)[0]))).splitlines(True)
211
proplines = [preamble + b'<property name="%s" />\n' % (encode_and_escape(prop_name), )]
213
lines.extend(proplines)
214
lines.append(b'</properties>\n')
215
lines.append(b'</revision>\n')
218
def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
219
# This is here because it's overridden by xml7
220
return unpack_inventory_entry(elt, entry_cache,
223
def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
224
return_from_cache=False):
225
"""Construct from XML Element"""
226
inv = unpack_inventory_flat(elt, self.format_num, self._unpack_entry,
227
entry_cache, return_from_cache)
228
self._check_cache_size(len(inv), entry_cache)
101
self._pack_revision_properties(rev, root)
105
def _pack_revision_properties(self, rev, under_element):
106
top_elt = SubElement(under_element, 'properties')
107
for prop_name, prop_value in sorted(rev.properties.items()):
108
assert isinstance(prop_name, basestring)
109
assert isinstance(prop_value, basestring)
110
prop_elt = SubElement(top_elt, 'property')
111
prop_elt.set('name', prop_name)
112
prop_elt.text = prop_value
117
def _unpack_inventory(self, elt):
118
"""Construct from XML Element
120
assert elt.tag == 'inventory'
121
root_id = elt.get('file_id') or ROOT_ID
122
format = elt.get('format')
123
if format is not None:
125
raise BzrError("invalid format version %r on inventory"
127
revision_id = elt.get('revision_id')
128
inv = Inventory(root_id, revision_id=revision_id)
130
ie = self._unpack_entry(e)
131
if ie.parent_id == ROOT_ID:
132
ie.parent_id = root_id
137
def _unpack_entry(self, elt):
139
if not InventoryEntry.versionable_kind(kind):
140
raise AssertionError('unsupported entry kind %s' % kind)
142
parent_id = elt.get('parent_id')
143
if parent_id == None:
146
if kind == 'directory':
147
ie = inventory.InventoryDirectory(elt.get('file_id'),
151
ie = inventory.InventoryFile(elt.get('file_id'),
154
ie.text_sha1 = elt.get('text_sha1')
155
if elt.get('executable') == 'yes':
157
v = elt.get('text_size')
158
ie.text_size = v and int(v)
159
elif kind == 'symlink':
160
ie = inventory.InventoryLink(elt.get('file_id'),
163
ie.symlink_target = elt.get('symlink_target')
165
raise BzrError("unknown kind %r" % kind)
166
ie.revision = elt.get('revision')
231
171
def _unpack_revision(self, elt):
232
172
"""XML Element -> Revision object"""
173
assert elt.tag == 'revision'
233
174
format = elt.get('format')
234
format_num = self.format_num
235
if self.revision_format_num is not None:
236
format_num = self.revision_format_num
237
175
if format is not None:
238
if format.encode() != format_num:
239
raise BzrError("invalid format version %r on revision"
241
get_cached = get_utf8_or_ascii
242
rev = Revision(committer=elt.get('committer'),
243
timestamp=float(elt.get('timestamp')),
244
revision_id=get_cached(elt.get('revision_id')),
245
inventory_sha1=elt.get('inventory_sha1').encode('ascii')
177
raise BzrError("invalid format version %r on inventory"
179
rev = Revision(committer = elt.get('committer'),
180
timestamp = float(elt.get('timestamp')),
181
revision_id = elt.get('revision_id'),
182
inventory_sha1 = elt.get('inventory_sha1')
247
184
parents = elt.find('parents') or []
248
185
for p in parents:
249
rev.parent_ids.append(get_cached(p.get('revision_id')))
186
assert p.tag == 'revision_ref', \
187
"bad parent node tag %r" % p.tag
188
rev.parent_ids.append(p.get('revision_id'))
250
189
self._unpack_revision_properties(elt, rev)
251
190
v = elt.get('timezone')
255
rev.timezone = int(v)
256
rev.message = elt.findtext('message') # text of <message>
191
rev.timezone = v and int(v)
192
rev.message = elt.findtext('message') # text of <message>
259
196
def _unpack_revision_properties(self, elt, rev):
260
197
"""Unpack properties onto a revision."""
261
198
props_elt = elt.find('properties')
262
if props_elt is None:
199
assert len(rev.properties) == 0
264
202
for prop_elt in props_elt:
265
if prop_elt.tag != 'property':
266
raise AssertionError(
267
"bad tag under properties list: %r" % prop_elt.tag)
203
assert prop_elt.tag == 'property', \
204
"bad tag under properties list: %r" % prop_elt.tag
268
205
name = prop_elt.get('name')
269
206
value = prop_elt.text
270
# If a property had an empty value ('') cElementTree reads
271
# that back as None, convert it back to '', so that all
272
# properties have string values
275
if name in rev.properties:
276
raise AssertionError("repeated property %r" % name)
207
assert name not in rev.properties, \
208
"repeated property %r" % name
277
209
rev.properties[name] = value
279
def _find_text_key_references(self, line_iterator):
280
"""Core routine for extracting references to texts from inventories.
282
This performs the translation of xml lines to revision ids.
284
:param line_iterator: An iterator of lines, origin_version_id
285
:return: A dictionary mapping text keys ((fileid, revision_id) tuples)
286
to whether they were referred to by the inventory of the
287
revision_id that they contain. Note that if that revision_id was
288
not part of the line_iterator's output then False will be given -
289
even though it may actually refer to that key.
291
if not self.support_altered_by_hack:
292
raise AssertionError(
293
"_find_text_key_references only "
294
"supported for branches which store inventory as unnested xml"
295
", not on %r" % self)
298
# this code needs to read every new line in every inventory for the
299
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
300
# not present in one of those inventories is unnecessary but not
301
# harmful because we are filtering by the revision id marker in the
302
# inventory lines : we only select file ids altered in one of those
303
# revisions. We don't need to see all lines in the inventory because
304
# only those added in an inventory in rev X can contain a revision=X
306
unescape_revid_cache = {}
307
unescape_fileid_cache = {}
309
# jam 20061218 In a big fetch, this handles hundreds of thousands
310
# of lines, so it has had a lot of inlining and optimizing done.
311
# Sorry that it is a little bit messy.
312
# Move several functions to be local variables, since this is a long
314
search = self._file_ids_altered_regex.search
315
unescape = _unescape_xml
316
setdefault = result.setdefault
317
for line, line_key in line_iterator:
321
# One call to match.group() returning multiple items is quite a
322
# bit faster than 2 calls to match.group() each returning 1
323
file_id, revision_id = match.group('file_id', 'revision_id')
325
# Inlining the cache lookups helps a lot when you make 170,000
326
# lines and 350k ids, versus 8.4 unique ids.
327
# Using a cache helps in 2 ways:
328
# 1) Avoids unnecessary decoding calls
329
# 2) Re-uses cached strings, which helps in future set and
331
# (2) is enough that removing encoding entirely along with
332
# the cache (so we are using plain strings) results in no
333
# performance improvement.
335
revision_id = unescape_revid_cache[revision_id]
337
unescaped = unescape(revision_id)
338
unescape_revid_cache[revision_id] = unescaped
339
revision_id = unescaped
341
# Note that unconditionally unescaping means that we deserialise
342
# every fileid, which for general 'pull' is not great, but we don't
343
# really want to have some many fulltexts that this matters anyway.
346
file_id = unescape_fileid_cache[file_id]
348
unescaped = unescape(file_id)
349
unescape_fileid_cache[file_id] = unescaped
352
key = (file_id, revision_id)
353
setdefault(key, False)
354
if revision_id == line_key[-1]:
359
serializer_v8 = Serializer_v8()
212
serializer_v5 = Serializer_v5()
added
removed
bzrlib/xml5.py
