/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1189 by Martin Pool
- BROKEN: partial support for commit into weave
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
1189 by Martin Pool
- BROKEN: partial support for commit into weave
18
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.
19
from bzrlib import (
20
    cache_utf8,
5671.2.3 by Jelmer Vernooij
Move Repository._find_text_key_references_from_xml_inventory_lines onto the serializer.
21
    lazy_regex,
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
22
    revision as _mod_revision,
3882.6.3 by John Arbash Meinel
If we are going to thrash the inventory entry cache, increase its size.
23
    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.
24
    )
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
25
from bzrlib.xml_serializer import (
26
    Element,
27
    SubElement,
28
    XMLSerializer,
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
29
    encode_and_escape,
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
30
    escape_invalid_chars,
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
31
    get_utf8_or_ascii,
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
32
    serialize_inventory_flat,
33
    unpack_inventory_entry,
34
    unpack_inventory_flat,
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
35
    )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
36
from bzrlib.revision import Revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
37
from bzrlib.errors import BzrError
38
39
5671.2.3 by Jelmer Vernooij
Move Repository._find_text_key_references_from_xml_inventory_lines onto the serializer.
40
_xml_unescape_map = {
41
    'apos':"'",
42
    'quot':'"',
43
    'amp':'&',
44
    'lt':'<',
45
    'gt':'>'
46
}
47
48
49
def _unescaper(match, _map=_xml_unescape_map):
50
    code = match.group(1)
51
    try:
52
        return _map[code]
53
    except KeyError:
54
        if not code.startswith('#'):
55
            raise
56
        return unichr(int(code[1:])).encode('utf8')
57
58
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
59
_unescape_re = lazy_regex.lazy_compile('\&([^;]*);')
5671.2.3 by Jelmer Vernooij
Move Repository._find_text_key_references_from_xml_inventory_lines onto the serializer.
60
61
def _unescape_xml(data):
62
    """Unescape predefined XML entities in a string of data."""
63
    return _unescape_re.sub(_unescaper, data)
64
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
65
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
66
class Serializer_v8(XMLSerializer):
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
67
    """This serialiser adds rich roots.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
68
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
69
    Its revision format number matches its inventory number.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
70
    """
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
71
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
72
    __slots__ = []
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
73
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
74
    root_id = None
1910.2.48 by Aaron Bentley
Update from review comments
75
    support_altered_by_hack = True
76
    # This format supports the altered-by hack that reads file ids directly out
77
    # of the versionedfile, without doing XML parsing.
78
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
79
    supported_kinds = set(['file', 'directory', 'symlink'])
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
80
    format_num = '8'
3311.3.3 by Aaron Bentley
Handle format 5 revision
81
    revision_format_num = None
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
82
5671.2.3 by Jelmer Vernooij
Move Repository._find_text_key_references_from_xml_inventory_lines onto the serializer.
83
    # The search regex used by xml based repositories to determine what things
84
    # where changed in a single commit.
85
    _file_ids_altered_regex = lazy_regex.lazy_compile(
86
        r'file_id="(?P<file_id>[^"]+)"'
87
        r'.* revision="(?P<revision_id>[^"]+)"'
88
        )
89
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
90
    def _check_revisions(self, inv):
91
        """Extension point for subclasses to check during serialisation.
92
93
        :param inv: An inventory about to be serialised, to be checked.
4031.3.1 by Frank Aspell
Fixing various typos
94
        :raises: AssertionError if an error has occurred.
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
95
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
96
        if inv.revision_id is None:
4505.5.2 by Robert Collins
More informative assertions in xml serialisation.
97
            raise AssertionError("inv.revision_id is None")
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
98
        if inv.root.revision is None:
4505.5.2 by Robert Collins
More informative assertions in xml serialisation.
99
            raise AssertionError("inv.root.revision is None")
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
100
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
101
    def _check_cache_size(self, inv_size, entry_cache):
102
        """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.
103
104
        We want the cache to be ~2x the size of an inventory. The reason is
105
        because we use a FIFO cache, and how Inventory records are likely to
106
        change. In general, you have a small number of records which change
107
        often, and a lot of records which do not change at all. So when the
108
        cache gets full, you actually flush out a lot of the records you are
109
        interested in, which means you need to recreate all of those records.
110
        An LRU Cache would be better, but the overhead negates the cache
111
        coherency benefit.
112
113
        One way to look at it, only the size of the cache > len(inv) is your
114
        'working' set. And in general, it shouldn't be a problem to hold 2
115
        inventories in memory anyway.
116
117
        :param inv_size: The number of entries in an inventory.
118
        """
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
119
        if entry_cache is None:
120
            return
3882.6.12 by John Arbash Meinel
Use resize logic to ensure our inventory entry cache is at an optimal size.
121
        # 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.
122
        recommended_min_cache_size = inv_size * 1.5
123
        if entry_cache.cache_size() < recommended_min_cache_size:
124
            recommended_cache_size = inv_size * 2
125
            trace.mutter('Resizing the inventory entry cache from %d to %d',
126
                         entry_cache.cache_size(), recommended_cache_size)
127
            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.
128
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
129
    def write_inventory_to_lines(self, inv):
130
        """Return a list of lines with the encoded inventory."""
131
        return self.write_inventory(inv, None)
132
133
    def write_inventory_to_string(self, inv, working=False):
134
        """Just call write_inventory with a StringIO and return the value.
135
136
        :param working: If True skip history data - text_sha1, text_size,
137
            reference_revision, symlink_target.
138
        """
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
139
        sio = cStringIO.StringIO()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
140
        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
141
        return sio.getvalue()
142
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
143
    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
144
        """Write inventory to a file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
145
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
146
        :param inv: the inventory to write.
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
147
        :param f: the file to write. (May be None if the lines are the desired
148
            output).
149
        :param working: If True skip history data - text_sha1, text_size,
150
            reference_revision, symlink_target.
151
        :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
152
        """
6355.1.7 by Jelmer Vernooij
Fix tests.
153
        output = []
154
        append = output.append
155
        self._append_inventory_root(append, inv)
156
        serialize_inventory_flat(inv, append,
6355.1.2 by Jelmer Vernooij
Factor out serializing of inventory in xml8.
157
            self.root_id, self.supported_kinds, working)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
158
        if f is not None:
159
            f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
160
        # Just to keep the cache from growing without bounds
161
        # 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
162
        #_clear_cache()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
163
        return output
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
164
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
165
    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
166
        """Append the inventory root to output."""
167
        if inv.revision_id is not None:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
168
            revid1 = ' revision_id="'
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
169
            revid2 = encode_and_escape(inv.revision_id)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
170
        else:
171
            revid1 = ""
172
            revid2 = ""
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
173
        append('<inventory format="%s"%s%s>\n' % (
174
            self.format_num, revid1, revid2))
175
        append('<directory file_id="%s name="%s revision="%s />\n' % (
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
176
            encode_and_escape(inv.root.file_id),
177
            encode_and_escape(inv.root.name),
178
            encode_and_escape(inv.root.revision)))
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
179
1189 by Martin Pool
- BROKEN: partial support for commit into weave
180
    def _pack_revision(self, rev):
181
        """Revision object -> xml tree"""
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
182
        # For the XML format, we need to write them as Unicode rather than as
183
        # utf-8 strings. So that cElementTree can handle properly escaping
184
        # them.
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
185
        decode_utf8 = cache_utf8.decode
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
186
        revision_id = rev.revision_id
187
        if isinstance(revision_id, str):
188
            revision_id = decode_utf8(revision_id)
3311.3.3 by Aaron Bentley
Handle format 5 revision
189
        format_num = self.format_num
190
        if self.revision_format_num is not None:
191
            format_num = self.revision_format_num
1189 by Martin Pool
- BROKEN: partial support for commit into weave
192
        root = Element('revision',
193
                       committer = rev.committer,
2102.4.1 by John Arbash Meinel
Switch to using millisecond resolution in Revision XML
194
                       timestamp = '%.3f' % rev.timestamp,
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
195
                       revision_id = revision_id,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
196
                       inventory_sha1 = rev.inventory_sha1,
3311.3.3 by Aaron Bentley
Handle format 5 revision
197
                       format=format_num,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
198
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
199
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
200
            root.set('timezone', str(rev.timezone))
201
        root.text = '\n'
202
        msg = SubElement(root, 'message')
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
203
        msg.text = escape_invalid_chars(rev.message)[0]
1189 by Martin Pool
- BROKEN: partial support for commit into weave
204
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
205
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
206
            pelts = SubElement(root, 'parents')
207
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
208
            for parent_id in rev.parent_ids:
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
209
                _mod_revision.check_not_reserved_id(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
210
                p = SubElement(pelts, 'revision_ref')
211
                p.tail = '\n'
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
212
                if isinstance(parent_id, str):
213
                    parent_id = decode_utf8(parent_id)
214
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
215
        if rev.properties:
216
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
217
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
218
219
    def _pack_revision_properties(self, rev, under_element):
220
        top_elt = SubElement(under_element, 'properties')
221
        for prop_name, prop_value in sorted(rev.properties.items()):
222
            prop_elt = SubElement(top_elt, 'property')
223
            prop_elt.set('name', prop_name)
224
            prop_elt.text = prop_value
225
            prop_elt.tail = '\n'
226
        top_elt.tail = '\n'
227
6355.1.8 by Jelmer Vernooij
Fix tests.
228
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
229
        # This is here because it's overridden by xml7
230
        return unpack_inventory_entry(elt, entry_cache,
231
                return_from_cache)
232
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
233
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
234
                          return_from_cache=False):
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
235
        """Construct from XML Element"""
6355.1.9 by Jelmer Vernooij
Review feedback - pass entry_cache and_return_from_cache to unpack_inventory_flat.
236
        inv = unpack_inventory_flat(elt, self.format_num, self._unpack_entry,
237
            entry_cache, return_from_cache)
3882.6.22 by John Arbash Meinel
Start moving things around so that the entry cache is passed in.
238
        self._check_cache_size(len(inv), entry_cache)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
239
        return inv
240
241
    def _unpack_revision(self, elt):
242
        """XML Element -> Revision object"""
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
243
        format = elt.get('format')
3311.3.3 by Aaron Bentley
Handle format 5 revision
244
        format_num = self.format_num
245
        if self.revision_format_num is not None:
246
            format_num = self.revision_format_num
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
247
        if format is not None:
3311.3.3 by Aaron Bentley
Handle format 5 revision
248
            if format != format_num:
249
                raise BzrError("invalid format version %r on revision"
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
250
                                % format)
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
251
        get_cached = get_utf8_or_ascii
1189 by Martin Pool
- BROKEN: partial support for commit into weave
252
        rev = Revision(committer = elt.get('committer'),
253
                       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.
254
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
255
                       inventory_sha1 = elt.get('inventory_sha1')
256
                       )
257
        parents = elt.find('parents') or []
258
        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.
259
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
260
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
261
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
262
        if v is None:
263
            rev.timezone = 0
264
        else:
265
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
266
        rev.message = elt.findtext('message') # text of <message>
267
        return rev
268
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
269
    def _unpack_revision_properties(self, elt, rev):
270
        """Unpack properties onto a revision."""
271
        props_elt = elt.find('properties')
272
        if not props_elt:
273
            return
274
        for prop_elt in props_elt:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
275
            if prop_elt.tag != 'property':
276
                raise AssertionError(
277
                    "bad tag under properties list: %r" % prop_elt.tag)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
278
            name = prop_elt.get('name')
279
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
280
            # If a property had an empty value ('') cElementTree reads
281
            # that back as None, convert it back to '', so that all
282
            # properties have string values
283
            if value is None:
284
                value = ''
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
285
            if name in rev.properties:
286
                raise AssertionError("repeated property %r" % name)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
287
            rev.properties[name] = value
288
5671.2.3 by Jelmer Vernooij
Move Repository._find_text_key_references_from_xml_inventory_lines onto the serializer.
289
    def _find_text_key_references(self, line_iterator):
290
        """Core routine for extracting references to texts from inventories.
291
292
        This performs the translation of xml lines to revision ids.
293
294
        :param line_iterator: An iterator of lines, origin_version_id
295
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
296
            to whether they were referred to by the inventory of the
297
            revision_id that they contain. Note that if that revision_id was
298
            not part of the line_iterator's output then False will be given -
299
            even though it may actually refer to that key.
300
        """
301
        if not self.support_altered_by_hack:
302
            raise AssertionError(
303
                "_find_text_key_references only "
304
                "supported for branches which store inventory as unnested xml"
305
                ", not on %r" % self)
306
        result = {}
307
308
        # this code needs to read every new line in every inventory for the
309
        # inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
310
        # not present in one of those inventories is unnecessary but not
311
        # harmful because we are filtering by the revision id marker in the
312
        # inventory lines : we only select file ids altered in one of those
313
        # revisions. We don't need to see all lines in the inventory because
314
        # only those added in an inventory in rev X can contain a revision=X
315
        # line.
316
        unescape_revid_cache = {}
317
        unescape_fileid_cache = {}
318
319
        # jam 20061218 In a big fetch, this handles hundreds of thousands
320
        # of lines, so it has had a lot of inlining and optimizing done.
321
        # Sorry that it is a little bit messy.
322
        # Move several functions to be local variables, since this is a long
323
        # running loop.
324
        search = self._file_ids_altered_regex.search
325
        unescape = _unescape_xml
326
        setdefault = result.setdefault
327
        for line, line_key in line_iterator:
328
            match = search(line)
329
            if match is None:
330
                continue
331
            # One call to match.group() returning multiple items is quite a
332
            # bit faster than 2 calls to match.group() each returning 1
333
            file_id, revision_id = match.group('file_id', 'revision_id')
334
335
            # Inlining the cache lookups helps a lot when you make 170,000
336
            # lines and 350k ids, versus 8.4 unique ids.
337
            # Using a cache helps in 2 ways:
338
            #   1) Avoids unnecessary decoding calls
339
            #   2) Re-uses cached strings, which helps in future set and
340
            #      equality checks.
341
            # (2) is enough that removing encoding entirely along with
342
            # the cache (so we are using plain strings) results in no
343
            # performance improvement.
344
            try:
345
                revision_id = unescape_revid_cache[revision_id]
346
            except KeyError:
347
                unescaped = unescape(revision_id)
348
                unescape_revid_cache[revision_id] = unescaped
349
                revision_id = unescaped
350
351
            # Note that unconditionally unescaping means that we deserialise
352
            # every fileid, which for general 'pull' is not great, but we don't
353
            # really want to have some many fulltexts that this matters anyway.
354
            # RBC 20071114.
355
            try:
356
                file_id = unescape_fileid_cache[file_id]
357
            except KeyError:
358
                unescaped = unescape(file_id)
359
                unescape_fileid_cache[file_id] = unescaped
360
                file_id = unescaped
361
362
            key = (file_id, revision_id)
363
            setdefault(key, False)
364
            if revision_id == line_key[-1]:
365
                result[key] = True
366
        return result
367
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
368
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
369
serializer_v8 = Serializer_v8()