~bzr-pqm/bzr/bzr.dev

3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2
#
1189 by Martin Pool
- BROKEN: partial support for commit into weave
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
#
1189 by Martin Pool
- BROKEN: partial support for commit into weave
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
#
1189 by Martin Pool
- BROKEN: partial support for commit into weave
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
17
import cStringIO
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
18
import re
1189 by Martin Pool
- BROKEN: partial support for commit into weave
19
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
20
from bzrlib import (
21
    cache_utf8,
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
22
    errors,
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
23
    inventory,
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
24
    revision as _mod_revision,
3882.6.3 by John Arbash Meinel
If we are going to thrash the inventory entry cache, increase its size.
25
    trace,
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
26
    )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
27
from bzrlib.xml_serializer import SubElement, Element, Serializer
1189 by Martin Pool
- BROKEN: partial support for commit into weave
28
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
29
from bzrlib.revision import Revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
30
from bzrlib.errors import BzrError
31
32
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
33
_utf8_re = None
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
34
_unicode_re = None
35
_xml_escape_map = {
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
36
    "&":'&',
37
    "'":"'", # FIXME: overkill
38
    "\"":""",
39
    "<":"&lt;",
40
    ">":"&gt;",
41
    }
42
43
44
def _ensure_utf8_re():
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
45
    """Make sure the _utf8_re and _unicode_re regexes have been compiled."""
46
    global _utf8_re, _unicode_re
47
    if _utf8_re is None:
48
        _utf8_re = re.compile('[&<>\'\"]|[\x80-\xff]+')
49
    if _unicode_re is None:
50
        _unicode_re = re.compile(u'[&<>\'\"\u0080-\uffff]')
51
52
53
def _unicode_escape_replace(match, _map=_xml_escape_map):
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
54
    """Replace a string of non-ascii, non XML safe characters with their escape
55
56
    This will escape both Standard XML escapes, like <>"', etc.
57
    As well as escaping non ascii characters, because ElementTree did.
58
    This helps us remain compatible to older versions of bzr. We may change
59
    our policy in the future, though.
60
    """
1934.1.7 by John Arbash Meinel
Comment why we do caching the way we do
61
    # jam 20060816 Benchmarks show that try/KeyError is faster if you
62
    # expect the entity to rarely miss. There is about a 10% difference
63
    # in overall time. But if you miss frequently, then if None is much
64
    # faster. For our use case, we *rarely* have a revision id, file id
65
    # or path name that is unicode. So use try/KeyError.
1934.1.12 by John Arbash Meinel
Switch back to using Entity serializer, since performance is equivalent, yet still compatible
66
    try:
67
        return _map[match.group()]
68
    except KeyError:
69
        return "&#%d;" % ord(match.group())
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
70
71
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
72
def _utf8_escape_replace(match, _map=_xml_escape_map):
73
    """Escape utf8 characters into XML safe ones.
74
75
    This uses 2 tricks. It is either escaping "standard" characters, like "&<>,
76
    or it is handling characters with the high-bit set. For ascii characters,
77
    we just lookup the replacement in the dictionary. For everything else, we
78
    decode back into Unicode, and then use the XML escape code.
79
    """
80
    try:
81
        return _map[match.group()]
82
    except KeyError:
83
        return ''.join('&#%d;' % ord(uni_chr)
84
                       for uni_chr in match.group().decode('utf8'))
85
86
87
_to_escaped_map = {}
88
89
def _encode_and_escape(unicode_or_utf8_str, _map=_to_escaped_map):
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
90
    """Encode the string into utf8, and escape invalid XML characters"""
1934.1.7 by John Arbash Meinel
Comment why we do caching the way we do
91
    # We frequently get entities we have not seen before, so it is better
92
    # to check if None, rather than try/KeyError
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
93
    text = _map.get(unicode_or_utf8_str)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
94
    if text is None:
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
95
        if unicode_or_utf8_str.__class__ == unicode:
96
            # The alternative policy is to do a regular UTF8 encoding
97
            # and then escape only XML meta characters.
98
            # Performance is equivalent once you use cache_utf8. *However*
99
            # this makes the serialized texts incompatible with old versions
100
            # of bzr. So no net gain. (Perhaps the read code would handle utf8
101
            # better than entity escapes, but cElementTree seems to do just fine
102
            # either way)
103
            text = str(_unicode_re.sub(_unicode_escape_replace,
104
                                       unicode_or_utf8_str)) + '"'
105
        else:
106
            # Plain strings are considered to already be in utf-8 so we do a
107
            # slightly different method for escaping.
108
            text = _utf8_re.sub(_utf8_escape_replace,
109
                                unicode_or_utf8_str) + '"'
110
        _map[unicode_or_utf8_str] = text
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
111
    return text
112
113
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
114
def _get_utf8_or_ascii(a_str,
115
                       _encode_utf8=cache_utf8.encode,
116
                       _get_cached_ascii=cache_utf8.get_cached_ascii):
117
    """Return a cached version of the string.
118
119
    cElementTree will return a plain string if the XML is plain ascii. It only
120
    returns Unicode when it needs to. We want to work in utf-8 strings. So if
121
    cElementTree returns a plain string, we can just return the cached version.
122
    If it is Unicode, then we need to encode it.
123
124
    :param a_str: An 8-bit string or Unicode as returned by
125
                  cElementTree.Element.get()
126
    :return: A utf-8 encoded 8-bit string.
127
    """
128
    # This is fairly optimized because we know what cElementTree does, this is
129
    # not meant as a generic function for all cases. Because it is possible for
130
    # an 8-bit string to not be ascii or valid utf8.
131
    if a_str.__class__ == unicode:
132
        return _encode_utf8(a_str)
133
    else:
134
        return _get_cached_ascii(a_str)
135
136
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
137
def _clear_cache():
138
    """Clean out the unicode => escaped map"""
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
139
    _to_escaped_map.clear()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
140
141
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
142
class Serializer_v8(Serializer):
143
    """This serialiser adds rich roots.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
144
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
145
    Its revision format number matches its inventory number.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
146
    """
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
147
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
148
    __slots__ = []
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
149
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
150
    root_id = None
1910.2.48 by Aaron Bentley
Update from review comments
151
    support_altered_by_hack = True
152
    # This format supports the altered-by hack that reads file ids directly out
153
    # of the versionedfile, without doing XML parsing.
154
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
155
    supported_kinds = set(['file', 'directory', 'symlink'])
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
156
    format_num = '8'
3311.3.3 by Aaron Bentley
Handle format 5 revision
157
    revision_format_num = None
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
158
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
159
    def _check_revisions(self, inv):
160
        """Extension point for subclasses to check during serialisation.
161
162
        :param inv: An inventory about to be serialised, to be checked.
163
        :raises: AssertionError if an error has occured.
164
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
165
        if inv.revision_id is None:
166
            raise AssertionError()
167
        if inv.root.revision is None:
168
            raise AssertionError()
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
169
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
170
    def _check_cache_size(self, inv_size, entry_cache):
171
        """Check that the entry_cache is large enough.
3882.6.12 by John Arbash Meinel
Use resize logic to ensure our inventory entry cache is at an optimal size.
172
173
        We want the cache to be ~2x the size of an inventory. The reason is
174
        because we use a FIFO cache, and how Inventory records are likely to
175
        change. In general, you have a small number of records which change
176
        often, and a lot of records which do not change at all. So when the
177
        cache gets full, you actually flush out a lot of the records you are
178
        interested in, which means you need to recreate all of those records.
179
        An LRU Cache would be better, but the overhead negates the cache
180
        coherency benefit.
181
182
        One way to look at it, only the size of the cache > len(inv) is your
183
        'working' set. And in general, it shouldn't be a problem to hold 2
184
        inventories in memory anyway.
185
186
        :param inv_size: The number of entries in an inventory.
187
        """
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
188
        if entry_cache is None:
189
            return
3882.6.12 by John Arbash Meinel
Use resize logic to ensure our inventory entry cache is at an optimal size.
190
        # 1.5 times might also be reasonable.
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
191
        recommended_min_cache_size = inv_size * 1.5
192
        if entry_cache.cache_size() < recommended_min_cache_size:
193
            recommended_cache_size = inv_size * 2
194
            trace.mutter('Resizing the inventory entry cache from %d to %d',
195
                         entry_cache.cache_size(), recommended_cache_size)
196
            entry_cache.resize(recommended_cache_size)
3882.6.12 by John Arbash Meinel
Use resize logic to ensure our inventory entry cache is at an optimal size.
197
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
198
    def write_inventory_to_lines(self, inv):
199
        """Return a list of lines with the encoded inventory."""
200
        return self.write_inventory(inv, None)
201
202
    def write_inventory_to_string(self, inv, working=False):
203
        """Just call write_inventory with a StringIO and return the value.
204
205
        :param working: If True skip history data - text_sha1, text_size,
206
            reference_revision, symlink_target.
207
        """
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
208
        sio = cStringIO.StringIO()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
209
        self.write_inventory(inv, sio, working)
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
210
        return sio.getvalue()
211
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
212
    def write_inventory(self, inv, f, working=False):
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
213
        """Write inventory to a file.
214
        
215
        :param inv: the inventory to write.
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
216
        :param f: the file to write. (May be None if the lines are the desired
217
            output).
218
        :param working: If True skip history data - text_sha1, text_size,
219
            reference_revision, symlink_target.
220
        :return: The inventory as a list of lines.
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
221
        """
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
222
        _ensure_utf8_re()
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
223
        self._check_revisions(inv)
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
224
        output = []
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
225
        append = output.append
226
        self._append_inventory_root(append, inv)
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
227
        entries = inv.iter_entries()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
228
        # Skip the root
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
229
        root_path, root_ie = entries.next()
230
        for path, ie in entries:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
231
            if ie.parent_id != self.root_id:
232
                parent_str = ' parent_id="'
233
                parent_id  = _encode_and_escape(ie.parent_id)
234
            else:
235
                parent_str = ''
236
                parent_id  = ''
237
            if ie.kind == 'file':
238
                if ie.executable:
239
                    executable = ' executable="yes"'
240
                else:
241
                    executable = ''
242
                if not working:
243
                    append('<file%s file_id="%s name="%s%s%s revision="%s '
244
                        'text_sha1="%s" text_size="%d" />\n' % (
245
                        executable, _encode_and_escape(ie.file_id),
246
                        _encode_and_escape(ie.name), parent_str, parent_id,
247
                        _encode_and_escape(ie.revision), ie.text_sha1,
248
                        ie.text_size))
249
                else:
250
                    append('<file%s file_id="%s name="%s%s%s />\n' % (
251
                        executable, _encode_and_escape(ie.file_id),
252
                        _encode_and_escape(ie.name), parent_str, parent_id))
253
            elif ie.kind == 'directory':
254
                if not working:
255
                    append('<directory file_id="%s name="%s%s%s revision="%s '
256
                        '/>\n' % (
257
                        _encode_and_escape(ie.file_id),
258
                        _encode_and_escape(ie.name),
259
                        parent_str, parent_id,
260
                        _encode_and_escape(ie.revision)))
261
                else:
262
                    append('<directory file_id="%s name="%s%s%s />\n' % (
263
                        _encode_and_escape(ie.file_id),
264
                        _encode_and_escape(ie.name),
265
                        parent_str, parent_id))
266
            elif ie.kind == 'symlink':
267
                if not working:
268
                    append('<symlink file_id="%s name="%s%s%s revision="%s '
269
                        'symlink_target="%s />\n' % (
270
                        _encode_and_escape(ie.file_id),
271
                        _encode_and_escape(ie.name),
272
                        parent_str, parent_id,
273
                        _encode_and_escape(ie.revision),
274
                        _encode_and_escape(ie.symlink_target)))
275
                else:
276
                    append('<symlink file_id="%s name="%s%s%s />\n' % (
277
                        _encode_and_escape(ie.file_id),
278
                        _encode_and_escape(ie.name),
279
                        parent_str, parent_id))
280
            elif ie.kind == 'tree-reference':
281
                if ie.kind not in self.supported_kinds:
282
                    raise errors.UnsupportedInventoryKind(ie.kind)
283
                if not working:
284
                    append('<tree-reference file_id="%s name="%s%s%s '
285
                        'revision="%s reference_revision="%s />\n' % (
286
                        _encode_and_escape(ie.file_id),
287
                        _encode_and_escape(ie.name),
288
                        parent_str, parent_id,
289
                        _encode_and_escape(ie.revision),
290
                        _encode_and_escape(ie.reference_revision)))
291
                else:
292
                    append('<tree-reference file_id="%s name="%s%s%s />\n' % (
293
                        _encode_and_escape(ie.file_id),
294
                        _encode_and_escape(ie.name),
295
                        parent_str, parent_id))
296
            else:
297
                raise errors.UnsupportedInventoryKind(ie.kind)
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
298
        append('</inventory>\n')
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
299
        if f is not None:
300
            f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
301
        # Just to keep the cache from growing without bounds
302
        # but we may actually not want to do clear the cache
1934.1.6 by John Arbash Meinel
With a full cache the time is down to 381 ms
303
        #_clear_cache()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
304
        return output
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
305
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
306
    def _append_inventory_root(self, append, inv):
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
307
        """Append the inventory root to output."""
308
        if inv.revision_id is not None:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
309
            revid1 = ' revision_id="'
310
            revid2 = _encode_and_escape(inv.revision_id)
311
        else:
312
            revid1 = ""
313
            revid2 = ""
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
314
        append('<inventory format="%s"%s%s>\n' % (
315
            self.format_num, revid1, revid2))
316
        append('<directory file_id="%s name="%s revision="%s />\n' % (
317
            _encode_and_escape(inv.root.file_id),
318
            _encode_and_escape(inv.root.name),
319
            _encode_and_escape(inv.root.revision)))
320
1189 by Martin Pool
- BROKEN: partial support for commit into weave
321
    def _pack_revision(self, rev):
322
        """Revision object -> xml tree"""
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
323
        # For the XML format, we need to write them as Unicode rather than as
324
        # utf-8 strings. So that cElementTree can handle properly escaping
325
        # them.
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
326
        decode_utf8 = cache_utf8.decode
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
327
        revision_id = rev.revision_id
328
        if isinstance(revision_id, str):
329
            revision_id = decode_utf8(revision_id)
3311.3.3 by Aaron Bentley
Handle format 5 revision
330
        format_num = self.format_num
331
        if self.revision_format_num is not None:
332
            format_num = self.revision_format_num
1189 by Martin Pool
- BROKEN: partial support for commit into weave
333
        root = Element('revision',
334
                       committer = rev.committer,
2102.4.1 by John Arbash Meinel
Switch to using millisecond resolution in Revision XML
335
                       timestamp = '%.3f' % rev.timestamp,
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
336
                       revision_id = revision_id,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
337
                       inventory_sha1 = rev.inventory_sha1,
3311.3.3 by Aaron Bentley
Handle format 5 revision
338
                       format=format_num,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
339
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
340
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
341
            root.set('timezone', str(rev.timezone))
342
        root.text = '\n'
343
        msg = SubElement(root, 'message')
344
        msg.text = rev.message
345
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
346
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
347
            pelts = SubElement(root, 'parents')
348
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
349
            for parent_id in rev.parent_ids:
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
350
                _mod_revision.check_not_reserved_id(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
351
                p = SubElement(pelts, 'revision_ref')
352
                p.tail = '\n'
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
353
                if isinstance(parent_id, str):
354
                    parent_id = decode_utf8(parent_id)
355
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
356
        if rev.properties:
357
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
358
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
359
360
    def _pack_revision_properties(self, rev, under_element):
361
        top_elt = SubElement(under_element, 'properties')
362
        for prop_name, prop_value in sorted(rev.properties.items()):
363
            prop_elt = SubElement(top_elt, 'property')
364
            prop_elt.set('name', prop_name)
365
            prop_elt.text = prop_value
366
            prop_elt.tail = '\n'
367
        top_elt.tail = '\n'
368
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
369
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None):
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
370
        """Construct from XML Element"""
371
        if elt.tag != 'inventory':
372
            raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
373
        format = elt.get('format')
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
374
        if format != self.format_num:
375
            raise errors.UnexpectedInventoryFormat('Invalid format version %r'
376
                                                   % format)
377
        revision_id = elt.get('revision_id')
378
        if revision_id is not None:
379
            revision_id = cache_utf8.encode(revision_id)
380
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
381
        for e in elt:
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
382
            ie = self._unpack_entry(e, entry_cache=entry_cache)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
383
            inv.add(ie)
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
384
        self._check_cache_size(len(inv), entry_cache)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
385
        return inv
386
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
387
    def _unpack_entry(self, elt, entry_cache=None):
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
388
        elt_get = elt.get
389
        file_id = elt_get('file_id')
390
        revision = elt_get('revision')
391
        # Check and see if we have already unpacked this exact entry
3882.6.8 by John Arbash Meinel
Add detailed timings on the last 100 mysql revisions.
392
        # Some timings for "repo.revision_trees(last_100_revs)"
393
        #               bzr     mysql
394
        #   unmodified  4.1s    40.8s
3882.6.6 by John Arbash Meinel
Add some actual timings, supporting why we use a FIFOCache.
395
        #   using lru   3.5s
3882.6.8 by John Arbash Meinel
Add detailed timings on the last 100 mysql revisions.
396
        #   using fifo  2.83s   29.1s
3882.6.6 by John Arbash Meinel
Add some actual timings, supporting why we use a FIFOCache.
397
        #   lru._cache  2.8s
3882.6.8 by John Arbash Meinel
Add detailed timings on the last 100 mysql revisions.
398
        #   dict        2.75s   26.8s
399
        #   inv.add     2.5s    26.0s
400
        #   no_copy     2.00s   20.5s
401
        #   no_c,dict   1.95s   18.0s
3882.6.6 by John Arbash Meinel
Add some actual timings, supporting why we use a FIFOCache.
402
        # Note that a cache of 10k nodes is more than sufficient to hold all of
3882.6.9 by John Arbash Meinel
Add some more direct timings using time.clock() instead of lsprof.
403
        # the inventory for the last 100 revs for bzr, but not for mysql (20k
404
        # is enough for mysql, which saves the same 2s as using a dict)
405
406
        # Breakdown of mysql using time.clock()
407
        #   4.1s    2 calls to element.get for file_id, revision_id
408
        #   4.5s    cache_hit lookup
409
        #   7.1s    InventoryFile.copy()
410
        #   2.4s    InventoryDirectory.copy()
411
        #   0.4s    decoding unique entries
3882.6.11 by John Arbash Meinel
comment update
412
        #   1.6s    decoding entries after FIFO fills up
3882.6.9 by John Arbash Meinel
Add some more direct timings using time.clock() instead of lsprof.
413
        #   0.8s    Adding nodes to FIFO (including flushes)
414
        #   0.1s    cache miss lookups
415
        # Using an LRU cache
416
        #   4.1s    2 calls to element.get for file_id, revision_id
417
        #   9.9s    cache_hit lookup
418
        #   10.8s   InventoryEntry.copy()
419
        #   0.3s    cache miss lookus
420
        #   1.2s    decoding entries
421
        #   1.0s    adding nodes to LRU
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
422
        if entry_cache is not None and revision is not None:
423
            key = (file_id, revision)
424
            try:
425
                # We copy it, because some operatations may mutate it
426
                cached_ie = entry_cache[key]
427
            except KeyError:
428
                pass
429
            else:
430
                # Only copying directory entries drops us 2.85s => 2.35s
431
                # if cached_ie.kind == 'directory':
432
                #     return cached_ie.copy()
433
                # return cached_ie
434
                return cached_ie.copy()
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
435
1189 by Martin Pool
- BROKEN: partial support for commit into weave
436
        kind = elt.tag
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
437
        if not InventoryEntry.versionable_kind(kind):
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
438
            raise AssertionError('unsupported entry kind %s' % kind)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
439
3882.6.13 by John Arbash Meinel
We don't need to inline get_cached until we've had the miss.
440
        get_cached = _get_utf8_or_ascii
441
3882.6.1 by John Arbash Meinel
Add an InventoryEntry cache to the xml deserializer.
442
        file_id = get_cached(file_id)
443
        if revision is not None:
444
            revision = get_cached(revision)
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
445
        parent_id = elt_get('parent_id')
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
446
        if parent_id is not None:
447
            parent_id = get_cached(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
448
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
449
        if kind == 'directory':
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
450
            ie = inventory.InventoryDirectory(file_id,
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
451
                                              elt_get('name'),
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
452
                                              parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
453
        elif kind == 'file':
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
454
            ie = inventory.InventoryFile(file_id,
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
455
                                         elt_get('name'),
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
456
                                         parent_id)
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
457
            ie.text_sha1 = elt_get('text_sha1')
458
            if elt_get('executable') == 'yes':
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
459
                ie.executable = True
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
460
            v = elt_get('text_size')
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
461
            ie.text_size = v and int(v)
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
462
        elif kind == 'symlink':
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
463
            ie = inventory.InventoryLink(file_id,
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
464
                                         elt_get('name'),
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
465
                                         parent_id)
3882.6.5 by John Arbash Meinel
Use a FIFOCache instead of an LRUCache, and factor out elt.get
466
            ie.symlink_target = elt_get('symlink_target')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
467
        else:
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
468
            raise errors.UnsupportedInventoryKind(kind)
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
469
        ie.revision = revision
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
470
        if revision is not None and entry_cache is not None:
3882.6.21 by John Arbash Meinel
Don't cache the InventoryEntry we will return, callers mutate those objects.
471
            # We cache a copy() because callers like to mutate objects, and
472
            # that would cause the item in cache to mutate as well.
473
            # This has a small effect on many-inventory performance, because
474
            # the majority fraction is spent in cache hits, not misses.
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
475
            entry_cache[key] = ie.copy()
1189 by Martin Pool
- BROKEN: partial support for commit into weave
476
477
        return ie
478
479
    def _unpack_revision(self, elt):
480
        """XML Element -> Revision object"""
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
481
        format = elt.get('format')
3311.3.3 by Aaron Bentley
Handle format 5 revision
482
        format_num = self.format_num
483
        if self.revision_format_num is not None:
484
            format_num = self.revision_format_num
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
485
        if format is not None:
3311.3.3 by Aaron Bentley
Handle format 5 revision
486
            if format != format_num:
487
                raise BzrError("invalid format version %r on revision"
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
488
                                % format)
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
489
        get_cached = _get_utf8_or_ascii
1189 by Martin Pool
- BROKEN: partial support for commit into weave
490
        rev = Revision(committer = elt.get('committer'),
491
                       timestamp = float(elt.get('timestamp')),
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
492
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
493
                       inventory_sha1 = elt.get('inventory_sha1')
494
                       )
495
        parents = elt.find('parents') or []
496
        for p in parents:
1911.2.6 by John Arbash Meinel
Cache revision ids and file ids as part of xml processing. A custom xml parser could just call decode/encode directly.
497
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
498
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
499
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
500
        if v is None:
501
            rev.timezone = 0
502
        else:
503
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
504
        rev.message = elt.findtext('message') # text of <message>
505
        return rev
506
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
507
    def _unpack_revision_properties(self, elt, rev):
508
        """Unpack properties onto a revision."""
509
        props_elt = elt.find('properties')
510
        if not props_elt:
511
            return
512
        for prop_elt in props_elt:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
513
            if prop_elt.tag != 'property':
514
                raise AssertionError(
515
                    "bad tag under properties list: %r" % prop_elt.tag)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
516
            name = prop_elt.get('name')
517
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
518
            # If a property had an empty value ('') cElementTree reads
519
            # that back as None, convert it back to '', so that all
520
            # properties have string values
521
            if value is None:
522
                value = ''
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
523
            if name in rev.properties:
524
                raise AssertionError("repeated property %r" % name)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
525
            rev.properties[name] = value
526
527
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
528
serializer_v8 = Serializer_v8()