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