/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
        """
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
164
        assert inv.revision_id is not None
165
        assert inv.root.revision is not None
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
166
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
167
    def write_inventory_to_lines(self, inv):
168
        """Return a list of lines with the encoded inventory."""
169
        return self.write_inventory(inv, None)
170
171
    def write_inventory_to_string(self, inv, working=False):
172
        """Just call write_inventory with a StringIO and return the value.
173
174
        :param working: If True skip history data - text_sha1, text_size,
175
            reference_revision, symlink_target.
176
        """
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
177
        sio = cStringIO.StringIO()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
178
        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
179
        return sio.getvalue()
180
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
181
    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
182
        """Write inventory to a file.
183
        
184
        :param inv: the inventory to write.
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
185
        :param f: the file to write. (May be None if the lines are the desired
186
            output).
187
        :param working: If True skip history data - text_sha1, text_size,
188
            reference_revision, symlink_target.
189
        :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
190
        """
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
191
        _ensure_utf8_re()
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
192
        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
193
        output = []
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
194
        append = output.append
195
        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
196
        entries = inv.iter_entries()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
197
        # Skip the root
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
198
        root_path, root_ie = entries.next()
199
        for path, ie in entries:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
200
            if ie.parent_id != self.root_id:
201
                parent_str = ' parent_id="'
202
                parent_id  = _encode_and_escape(ie.parent_id)
203
            else:
204
                parent_str = ''
205
                parent_id  = ''
206
            if ie.kind == 'file':
207
                if ie.executable:
208
                    executable = ' executable="yes"'
209
                else:
210
                    executable = ''
211
                if not working:
212
                    append('<file%s file_id="%s name="%s%s%s revision="%s '
213
                        'text_sha1="%s" text_size="%d" />\n' % (
214
                        executable, _encode_and_escape(ie.file_id),
215
                        _encode_and_escape(ie.name), parent_str, parent_id,
216
                        _encode_and_escape(ie.revision), ie.text_sha1,
217
                        ie.text_size))
218
                else:
219
                    append('<file%s file_id="%s name="%s%s%s />\n' % (
220
                        executable, _encode_and_escape(ie.file_id),
221
                        _encode_and_escape(ie.name), parent_str, parent_id))
222
            elif ie.kind == 'directory':
223
                if not working:
224
                    append('<directory file_id="%s name="%s%s%s revision="%s '
225
                        '/>\n' % (
226
                        _encode_and_escape(ie.file_id),
227
                        _encode_and_escape(ie.name),
228
                        parent_str, parent_id,
229
                        _encode_and_escape(ie.revision)))
230
                else:
231
                    append('<directory file_id="%s name="%s%s%s />\n' % (
232
                        _encode_and_escape(ie.file_id),
233
                        _encode_and_escape(ie.name),
234
                        parent_str, parent_id))
235
            elif ie.kind == 'symlink':
236
                if not working:
237
                    append('<symlink file_id="%s name="%s%s%s revision="%s '
238
                        'symlink_target="%s />\n' % (
239
                        _encode_and_escape(ie.file_id),
240
                        _encode_and_escape(ie.name),
241
                        parent_str, parent_id,
242
                        _encode_and_escape(ie.revision),
243
                        _encode_and_escape(ie.symlink_target)))
244
                else:
245
                    append('<symlink file_id="%s name="%s%s%s />\n' % (
246
                        _encode_and_escape(ie.file_id),
247
                        _encode_and_escape(ie.name),
248
                        parent_str, parent_id))
249
            elif ie.kind == 'tree-reference':
250
                if ie.kind not in self.supported_kinds:
251
                    raise errors.UnsupportedInventoryKind(ie.kind)
252
                if not working:
253
                    append('<tree-reference file_id="%s name="%s%s%s '
254
                        'revision="%s reference_revision="%s />\n' % (
255
                        _encode_and_escape(ie.file_id),
256
                        _encode_and_escape(ie.name),
257
                        parent_str, parent_id,
258
                        _encode_and_escape(ie.revision),
259
                        _encode_and_escape(ie.reference_revision)))
260
                else:
261
                    append('<tree-reference file_id="%s name="%s%s%s />\n' % (
262
                        _encode_and_escape(ie.file_id),
263
                        _encode_and_escape(ie.name),
264
                        parent_str, parent_id))
265
            else:
266
                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
267
        append('</inventory>\n')
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
268
        if f is not None:
269
            f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
270
        # Just to keep the cache from growing without bounds
271
        # 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
272
        #_clear_cache()
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
273
        return output
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
274
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
275
    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
276
        """Append the inventory root to output."""
277
        if inv.revision_id is not None:
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
278
            revid1 = ' revision_id="'
279
            revid2 = _encode_and_escape(inv.revision_id)
280
        else:
281
            revid1 = ""
282
            revid2 = ""
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
283
        append('<inventory format="%s"%s%s>\n' % (
284
            self.format_num, revid1, revid2))
285
        append('<directory file_id="%s name="%s revision="%s />\n' % (
286
            _encode_and_escape(inv.root.file_id),
287
            _encode_and_escape(inv.root.name),
288
            _encode_and_escape(inv.root.revision)))
289
1189 by Martin Pool
- BROKEN: partial support for commit into weave
290
    def _pack_revision(self, rev):
291
        """Revision object -> xml tree"""
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
292
        # For the XML format, we need to write them as Unicode rather than as
293
        # utf-8 strings. So that cElementTree can handle properly escaping
294
        # them.
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
295
        decode_utf8 = cache_utf8.decode
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
296
        revision_id = rev.revision_id
297
        if isinstance(revision_id, str):
298
            revision_id = decode_utf8(revision_id)
3311.3.3 by Aaron Bentley
Handle format 5 revision
299
        format_num = self.format_num
300
        if self.revision_format_num is not None:
301
            format_num = self.revision_format_num
1189 by Martin Pool
- BROKEN: partial support for commit into weave
302
        root = Element('revision',
303
                       committer = rev.committer,
2102.4.1 by John Arbash Meinel
Switch to using millisecond resolution in Revision XML
304
                       timestamp = '%.3f' % rev.timestamp,
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
305
                       revision_id = revision_id,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
306
                       inventory_sha1 = rev.inventory_sha1,
3311.3.3 by Aaron Bentley
Handle format 5 revision
307
                       format=format_num,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
308
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
309
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
310
            root.set('timezone', str(rev.timezone))
311
        root.text = '\n'
312
        msg = SubElement(root, 'message')
313
        msg.text = rev.message
314
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
315
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
316
            pelts = SubElement(root, 'parents')
317
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
318
            for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
319
                assert isinstance(parent_id, basestring)
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
320
                _mod_revision.check_not_reserved_id(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
321
                p = SubElement(pelts, 'revision_ref')
322
                p.tail = '\n'
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
323
                if isinstance(parent_id, str):
324
                    parent_id = decode_utf8(parent_id)
325
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
326
        if rev.properties:
327
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
328
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
329
330
    def _pack_revision_properties(self, rev, under_element):
331
        top_elt = SubElement(under_element, 'properties')
332
        for prop_name, prop_value in sorted(rev.properties.items()):
333
            assert isinstance(prop_name, basestring) 
334
            assert isinstance(prop_value, basestring) 
335
            prop_elt = SubElement(top_elt, 'property')
336
            prop_elt.set('name', prop_name)
337
            prop_elt.text = prop_value
338
            prop_elt.tail = '\n'
339
        top_elt.tail = '\n'
340
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
341
    def _unpack_inventory(self, elt, revision_id=None):
342
        """Construct from XML Element"""
343
        if elt.tag != 'inventory':
344
            raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
345
        format = elt.get('format')
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
346
        if format != self.format_num:
347
            raise errors.UnexpectedInventoryFormat('Invalid format version %r'
348
                                                   % format)
349
        revision_id = elt.get('revision_id')
350
        if revision_id is not None:
351
            revision_id = cache_utf8.encode(revision_id)
352
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
353
        for e in elt:
354
            ie = self._unpack_entry(e)
355
            inv.add(ie)
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
356
        assert inv.root.revision is not None
1189 by Martin Pool
- BROKEN: partial support for commit into weave
357
        return inv
358
2294.1.9 by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID
359
    def _unpack_entry(self, elt):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
360
        kind = elt.tag
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
361
        if not InventoryEntry.versionable_kind(kind):
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
362
            raise AssertionError('unsupported entry kind %s' % kind)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
363
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
364
        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.
365
1189 by Martin Pool
- BROKEN: partial support for commit into weave
366
        parent_id = elt.get('parent_id')
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
367
        if parent_id is not None:
368
            parent_id = get_cached(parent_id)
369
        file_id = get_cached(elt.get('file_id'))
1189 by Martin Pool
- BROKEN: partial support for commit into weave
370
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
371
        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.
372
            ie = inventory.InventoryDirectory(file_id,
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
373
                                              elt.get('name'),
374
                                              parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
375
        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.
376
            ie = inventory.InventoryFile(file_id,
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
377
                                         elt.get('name'),
378
                                         parent_id)
379
            ie.text_sha1 = elt.get('text_sha1')
380
            if elt.get('executable') == 'yes':
381
                ie.executable = True
382
            v = elt.get('text_size')
383
            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
384
        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.
385
            ie = inventory.InventoryLink(file_id,
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
386
                                         elt.get('name'),
387
                                         parent_id)
388
            ie.symlink_target = elt.get('symlink_target')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
389
        else:
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
390
            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.
391
        revision = elt.get('revision')
392
        if revision is not None:
393
            revision = get_cached(revision)
394
        ie.revision = revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
395
396
        return ie
397
398
    def _unpack_revision(self, elt):
399
        """XML Element -> Revision object"""
400
        assert elt.tag == 'revision'
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
401
        format = elt.get('format')
3311.3.3 by Aaron Bentley
Handle format 5 revision
402
        format_num = self.format_num
403
        if self.revision_format_num is not None:
404
            format_num = self.revision_format_num
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
405
        if format is not None:
3311.3.3 by Aaron Bentley
Handle format 5 revision
406
            if format != format_num:
407
                raise BzrError("invalid format version %r on revision"
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
408
                                % format)
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
409
        get_cached = _get_utf8_or_ascii
1189 by Martin Pool
- BROKEN: partial support for commit into weave
410
        rev = Revision(committer = elt.get('committer'),
411
                       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.
412
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
413
                       inventory_sha1 = elt.get('inventory_sha1')
414
                       )
415
        parents = elt.find('parents') or []
416
        for p in parents:
417
            assert p.tag == 'revision_ref', \
418
                   "bad parent node tag %r" % p.tag
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.
419
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
420
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
421
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
422
        if v is None:
423
            rev.timezone = 0
424
        else:
425
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
426
        rev.message = elt.findtext('message') # text of <message>
427
        return rev
428
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
429
    def _unpack_revision_properties(self, elt, rev):
430
        """Unpack properties onto a revision."""
431
        props_elt = elt.find('properties')
432
        assert len(rev.properties) == 0
433
        if not props_elt:
434
            return
435
        for prop_elt in props_elt:
436
            assert prop_elt.tag == 'property', \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
437
                "bad tag under properties list: %r" % prop_elt.tag
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
438
            name = prop_elt.get('name')
439
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
440
            # If a property had an empty value ('') cElementTree reads
441
            # that back as None, convert it back to '', so that all
442
            # properties have string values
443
            if value is None:
444
                value = ''
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
445
            assert name not in rev.properties, \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
446
                "repeated property %r" % name
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
447
            rev.properties[name] = value
448
449
3311.3.4 by Aaron Bentley
Have xml5 inherit from xml6 from xml8
450
serializer_v8 = Serializer_v8()