~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,
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.
25
    )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
from bzrlib.xml_serializer import SubElement, Element, Serializer
1189 by Martin Pool
- BROKEN: partial support for commit into weave
27
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
28
from bzrlib.revision import Revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
29
from bzrlib.errors import BzrError
30
31
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
32
_utf8_re = None
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
33
_unicode_re = None
34
_xml_escape_map = {
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
35
    "&":'&',
36
    "'":"'", # FIXME: overkill
37
    "\"":""",
38
    "<":"&lt;",
39
    ">":"&gt;",
40
    }
41
42
43
def _ensure_utf8_re():
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
44
    """Make sure the _utf8_re and _unicode_re regexes have been compiled."""
45
    global _utf8_re, _unicode_re
46
    if _utf8_re is None:
47
        _utf8_re = re.compile('[&<>\'\"]|[\x80-\xff]+')
48
    if _unicode_re is None:
49
        _unicode_re = re.compile(u'[&<>\'\"\u0080-\uffff]')
50
51
52
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')
53
    """Replace a string of non-ascii, non XML safe characters with their escape
54
55
    This will escape both Standard XML escapes, like <>"', etc.
56
    As well as escaping non ascii characters, because ElementTree did.
57
    This helps us remain compatible to older versions of bzr. We may change
58
    our policy in the future, though.
59
    """
1934.1.7 by John Arbash Meinel
Comment why we do caching the way we do
60
    # jam 20060816 Benchmarks show that try/KeyError is faster if you
61
    # expect the entity to rarely miss. There is about a 10% difference
62
    # in overall time. But if you miss frequently, then if None is much
63
    # faster. For our use case, we *rarely* have a revision id, file id
64
    # 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
65
    try:
66
        return _map[match.group()]
67
    except KeyError:
68
        return "&#%d;" % ord(match.group())
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
69
70
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
71
def _utf8_escape_replace(match, _map=_xml_escape_map):
72
    """Escape utf8 characters into XML safe ones.
73
74
    This uses 2 tricks. It is either escaping "standard" characters, like "&<>,
75
    or it is handling characters with the high-bit set. For ascii characters,
76
    we just lookup the replacement in the dictionary. For everything else, we
77
    decode back into Unicode, and then use the XML escape code.
78
    """
79
    try:
80
        return _map[match.group()]
81
    except KeyError:
82
        return ''.join('&#%d;' % ord(uni_chr)
83
                       for uni_chr in match.group().decode('utf8'))
84
85
86
_to_escaped_map = {}
87
88
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')
89
    """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
90
    # We frequently get entities we have not seen before, so it is better
91
    # to check if None, rather than try/KeyError
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
92
    text = _map.get(unicode_or_utf8_str)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
93
    if text is None:
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
94
        if unicode_or_utf8_str.__class__ == unicode:
95
            # The alternative policy is to do a regular UTF8 encoding
96
            # and then escape only XML meta characters.
97
            # Performance is equivalent once you use cache_utf8. *However*
98
            # this makes the serialized texts incompatible with old versions
99
            # of bzr. So no net gain. (Perhaps the read code would handle utf8
100
            # better than entity escapes, but cElementTree seems to do just fine
101
            # either way)
102
            text = str(_unicode_re.sub(_unicode_escape_replace,
103
                                       unicode_or_utf8_str)) + '"'
104
        else:
105
            # Plain strings are considered to already be in utf-8 so we do a
106
            # slightly different method for escaping.
107
            text = _utf8_re.sub(_utf8_escape_replace,
108
                                unicode_or_utf8_str) + '"'
109
        _map[unicode_or_utf8_str] = text
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
110
    return text
111
112
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
113
def _get_utf8_or_ascii(a_str,
114
                       _encode_utf8=cache_utf8.encode,
115
                       _get_cached_ascii=cache_utf8.get_cached_ascii):
116
    """Return a cached version of the string.
117
118
    cElementTree will return a plain string if the XML is plain ascii. It only
119
    returns Unicode when it needs to. We want to work in utf-8 strings. So if
120
    cElementTree returns a plain string, we can just return the cached version.
121
    If it is Unicode, then we need to encode it.
122
123
    :param a_str: An 8-bit string or Unicode as returned by
124
                  cElementTree.Element.get()
125
    :return: A utf-8 encoded 8-bit string.
126
    """
127
    # This is fairly optimized because we know what cElementTree does, this is
128
    # not meant as a generic function for all cases. Because it is possible for
129
    # an 8-bit string to not be ascii or valid utf8.
130
    if a_str.__class__ == unicode:
131
        return _encode_utf8(a_str)
132
    else:
133
        return _get_cached_ascii(a_str)
134
135
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
136
def _clear_cache():
137
    """Clean out the unicode => escaped map"""
2249.5.10 by John Arbash Meinel
Make sure xml5 can handle unicode or utf8 strings
138
    _to_escaped_map.clear()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
139
140
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
141
class Serializer_v8(Serializer):
142
    """This serialiser adds rich roots.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
143
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
144
    Its revision format number matches its inventory number.
1189 by Martin Pool
- BROKEN: partial support for commit into weave
145
    """
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
146
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
147
    __slots__ = []
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
148
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
149
    root_id = None
1910.2.48 by Aaron Bentley
Update from review comments
150
    support_altered_by_hack = True
151
    # This format supports the altered-by hack that reads file ids directly out
152
    # of the versionedfile, without doing XML parsing.
153
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
154
    supported_kinds = set(['file', 'directory', 'symlink'])
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
155
    format_num = '8'
3311.3.3 by Aaron Bentley
Handle format 5 revision
156
    revision_format_num = None
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
157
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
158
    def _check_revisions(self, inv):
159
        """Extension point for subclasses to check during serialisation.
160
161
        :param inv: An inventory about to be serialised, to be checked.
162
        :raises: AssertionError if an error has occured.
163
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
164
        if inv.revision_id is None:
165
            raise AssertionError()
166
        if inv.root.revision is None:
167
            raise AssertionError()
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
168
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
169
    def write_inventory_to_lines(self, inv):
170
        """Return a list of lines with the encoded inventory."""
171
        return self.write_inventory(inv, None)
172
173
    def write_inventory_to_string(self, inv, working=False):
174
        """Just call write_inventory with a StringIO and return the value.
175
176
        :param working: If True skip history data - text_sha1, text_size,
177
            reference_revision, symlink_target.
178
        """
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
179
        sio = cStringIO.StringIO()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
180
        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
181
        return sio.getvalue()
182
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
183
    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
184
        """Write inventory to a file.
185
        
186
        :param inv: the inventory to write.
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
187
        :param f: the file to write. (May be None if the lines are the desired
188
            output).
189
        :param working: If True skip history data - text_sha1, text_size,
190
            reference_revision, symlink_target.
191
        :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
192
        """
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
193
        _ensure_utf8_re()
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
194
        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
195
        output = []
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
196
        append = output.append
197
        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
198
        entries = inv.iter_entries()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
199
        # Skip the root
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
200
        root_path, root_ie = entries.next()
201
        for path, ie in entries:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
202
            if ie.parent_id != self.root_id:
203
                parent_str = ' parent_id="'
204
                parent_id  = _encode_and_escape(ie.parent_id)
205
            else:
206
                parent_str = ''
207
                parent_id  = ''
208
            if ie.kind == 'file':
209
                if ie.executable:
210
                    executable = ' executable="yes"'
211
                else:
212
                    executable = ''
213
                if not working:
214
                    append('<file%s file_id="%s name="%s%s%s revision="%s '
215
                        'text_sha1="%s" text_size="%d" />\n' % (
216
                        executable, _encode_and_escape(ie.file_id),
217
                        _encode_and_escape(ie.name), parent_str, parent_id,
218
                        _encode_and_escape(ie.revision), ie.text_sha1,
219
                        ie.text_size))
220
                else:
221
                    append('<file%s file_id="%s name="%s%s%s />\n' % (
222
                        executable, _encode_and_escape(ie.file_id),
223
                        _encode_and_escape(ie.name), parent_str, parent_id))
224
            elif ie.kind == 'directory':
225
                if not working:
226
                    append('<directory file_id="%s name="%s%s%s revision="%s '
227
                        '/>\n' % (
228
                        _encode_and_escape(ie.file_id),
229
                        _encode_and_escape(ie.name),
230
                        parent_str, parent_id,
231
                        _encode_and_escape(ie.revision)))
232
                else:
233
                    append('<directory file_id="%s name="%s%s%s />\n' % (
234
                        _encode_and_escape(ie.file_id),
235
                        _encode_and_escape(ie.name),
236
                        parent_str, parent_id))
237
            elif ie.kind == 'symlink':
238
                if not working:
239
                    append('<symlink file_id="%s name="%s%s%s revision="%s '
240
                        'symlink_target="%s />\n' % (
241
                        _encode_and_escape(ie.file_id),
242
                        _encode_and_escape(ie.name),
243
                        parent_str, parent_id,
244
                        _encode_and_escape(ie.revision),
245
                        _encode_and_escape(ie.symlink_target)))
246
                else:
247
                    append('<symlink file_id="%s name="%s%s%s />\n' % (
248
                        _encode_and_escape(ie.file_id),
249
                        _encode_and_escape(ie.name),
250
                        parent_str, parent_id))
251
            elif ie.kind == 'tree-reference':
252
                if ie.kind not in self.supported_kinds:
253
                    raise errors.UnsupportedInventoryKind(ie.kind)
254
                if not working:
255
                    append('<tree-reference file_id="%s name="%s%s%s '
256
                        'revision="%s reference_revision="%s />\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
                        _encode_and_escape(ie.reference_revision)))
262
                else:
263
                    append('<tree-reference file_id="%s name="%s%s%s />\n' % (
264
                        _encode_and_escape(ie.file_id),
265
                        _encode_and_escape(ie.name),
266
                        parent_str, parent_id))
267
            else:
268
                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
269
        append('</inventory>\n')
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
270
        if f is not None:
271
            f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
272
        # Just to keep the cache from growing without bounds
273
        # 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
274
        #_clear_cache()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
275
        return output
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
276
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
277
    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
278
        """Append the inventory root to output."""
279
        if inv.revision_id is not None:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
280
            revid1 = ' revision_id="'
281
            revid2 = _encode_and_escape(inv.revision_id)
282
        else:
283
            revid1 = ""
284
            revid2 = ""
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
285
        append('<inventory format="%s"%s%s>\n' % (
286
            self.format_num, revid1, revid2))
287
        append('<directory file_id="%s name="%s revision="%s />\n' % (
288
            _encode_and_escape(inv.root.file_id),
289
            _encode_and_escape(inv.root.name),
290
            _encode_and_escape(inv.root.revision)))
291
1189 by Martin Pool
- BROKEN: partial support for commit into weave
292
    def _pack_revision(self, rev):
293
        """Revision object -> xml tree"""
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
294
        # For the XML format, we need to write them as Unicode rather than as
295
        # utf-8 strings. So that cElementTree can handle properly escaping
296
        # them.
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
297
        decode_utf8 = cache_utf8.decode
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
298
        revision_id = rev.revision_id
299
        if isinstance(revision_id, str):
300
            revision_id = decode_utf8(revision_id)
3311.3.3 by Aaron Bentley
Handle format 5 revision
301
        format_num = self.format_num
302
        if self.revision_format_num is not None:
303
            format_num = self.revision_format_num
1189 by Martin Pool
- BROKEN: partial support for commit into weave
304
        root = Element('revision',
305
                       committer = rev.committer,
2102.4.1 by John Arbash Meinel
Switch to using millisecond resolution in Revision XML
306
                       timestamp = '%.3f' % rev.timestamp,
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
307
                       revision_id = revision_id,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
308
                       inventory_sha1 = rev.inventory_sha1,
3311.3.3 by Aaron Bentley
Handle format 5 revision
309
                       format=format_num,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
310
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
311
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
312
            root.set('timezone', str(rev.timezone))
313
        root.text = '\n'
314
        msg = SubElement(root, 'message')
315
        msg.text = rev.message
316
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
317
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
318
            pelts = SubElement(root, 'parents')
319
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
320
            for parent_id in rev.parent_ids:
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
321
                _mod_revision.check_not_reserved_id(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
322
                p = SubElement(pelts, 'revision_ref')
323
                p.tail = '\n'
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
324
                if isinstance(parent_id, str):
325
                    parent_id = decode_utf8(parent_id)
326
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
327
        if rev.properties:
328
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
329
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
330
331
    def _pack_revision_properties(self, rev, under_element):
332
        top_elt = SubElement(under_element, 'properties')
333
        for prop_name, prop_value in sorted(rev.properties.items()):
334
            prop_elt = SubElement(top_elt, 'property')
335
            prop_elt.set('name', prop_name)
336
            prop_elt.text = prop_value
337
            prop_elt.tail = '\n'
338
        top_elt.tail = '\n'
339
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
340
    def _unpack_inventory(self, elt, revision_id=None):
341
        """Construct from XML Element"""
342
        if elt.tag != 'inventory':
343
            raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
344
        format = elt.get('format')
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
345
        if format != self.format_num:
346
            raise errors.UnexpectedInventoryFormat('Invalid format version %r'
347
                                                   % format)
348
        revision_id = elt.get('revision_id')
349
        if revision_id is not None:
350
            revision_id = cache_utf8.encode(revision_id)
351
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
352
        for e in elt:
353
            ie = self._unpack_entry(e)
354
            inv.add(ie)
355
        return inv
356
2294.1.9 by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID
357
    def _unpack_entry(self, elt):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
358
        kind = elt.tag
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
359
        if not InventoryEntry.versionable_kind(kind):
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
360
            raise AssertionError('unsupported entry kind %s' % kind)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
361
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
362
        get_cached = _get_utf8_or_ascii
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.
363
1189 by Martin Pool
- BROKEN: partial support for commit into weave
364
        parent_id = elt.get('parent_id')
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
365
        if parent_id is not None:
366
            parent_id = get_cached(parent_id)
367
        file_id = get_cached(elt.get('file_id'))
1189 by Martin Pool
- BROKEN: partial support for commit into weave
368
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
369
        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.
370
            ie = inventory.InventoryDirectory(file_id,
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
371
                                              elt.get('name'),
372
                                              parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
373
        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.
374
            ie = inventory.InventoryFile(file_id,
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
375
                                         elt.get('name'),
376
                                         parent_id)
377
            ie.text_sha1 = elt.get('text_sha1')
378
            if elt.get('executable') == 'yes':
379
                ie.executable = True
380
            v = elt.get('text_size')
381
            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
382
        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.
383
            ie = inventory.InventoryLink(file_id,
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
384
                                         elt.get('name'),
385
                                         parent_id)
386
            ie.symlink_target = elt.get('symlink_target')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
387
        else:
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
388
            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.
389
        revision = elt.get('revision')
390
        if revision is not None:
391
            revision = get_cached(revision)
392
        ie.revision = revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
393
394
        return ie
395
396
    def _unpack_revision(self, elt):
397
        """XML Element -> Revision object"""
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
398
        format = elt.get('format')
3311.3.3 by Aaron Bentley
Handle format 5 revision
399
        format_num = self.format_num
400
        if self.revision_format_num is not None:
401
            format_num = self.revision_format_num
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
402
        if format is not None:
3311.3.3 by Aaron Bentley
Handle format 5 revision
403
            if format != format_num:
404
                raise BzrError("invalid format version %r on revision"
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
405
                                % format)
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
406
        get_cached = _get_utf8_or_ascii
1189 by Martin Pool
- BROKEN: partial support for commit into weave
407
        rev = Revision(committer = elt.get('committer'),
408
                       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.
409
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
410
                       inventory_sha1 = elt.get('inventory_sha1')
411
                       )
412
        parents = elt.find('parents') or []
413
        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.
414
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
415
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
416
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
417
        if v is None:
418
            rev.timezone = 0
419
        else:
420
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
421
        rev.message = elt.findtext('message') # text of <message>
422
        return rev
423
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
424
    def _unpack_revision_properties(self, elt, rev):
425
        """Unpack properties onto a revision."""
426
        props_elt = elt.find('properties')
427
        if not props_elt:
428
            return
429
        for prop_elt in props_elt:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
430
            if prop_elt.tag != 'property':
431
                raise AssertionError(
432
                    "bad tag under properties list: %r" % prop_elt.tag)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
433
            name = prop_elt.get('name')
434
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
435
            # If a property had an empty value ('') cElementTree reads
436
            # that back as None, convert it back to '', so that all
437
            # properties have string values
438
            if value is None:
439
                value = ''
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
440
            if name in rev.properties:
441
                raise AssertionError("repeated property %r" % name)
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
442
            rev.properties[name] = value
443
444
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
445
serializer_v8 = Serializer_v8()