~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
1 by mbp at sourcefrog
import from baz patch-364
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""XML externalization support."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
48 by Martin Pool
witty comment
21
# "XML is like violence: if it doesn't solve your problem, you aren't
22
# using enough of it." -- various
23
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
24
# importing this module is fairly slow because it has to load several
25
# ElementTree bits
26
5340.11.1 by Martin
Remove monkey patching of private ElementTree escaping functions entirely
27
import re
28
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
29
from bzrlib.serializer import Serializer
5121.2.4 by Jelmer Vernooij
Remove more unused imports.
30
from bzrlib.trace import mutter
1248 by Martin Pool
- new weave based cleanup [broken]
31
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
32
try:
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
33
    try:
34
        # it's in this package in python2.5
35
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
36
            XMLTreeBuilder, fromstring, tostring)
37
        import xml.etree as elementtree
4797.66.1 by Martin
Prevent AttributeError in xml_serializer on certain cElementTree setups
38
        # Also import ElementTree module so monkey-patching below always works
39
        import xml.etree.ElementTree
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
40
    except ImportError:
41
        from cElementTree import (ElementTree, SubElement, Element,
42
                                  XMLTreeBuilder, fromstring, tostring)
3475.1.2 by John Arbash Meinel
Fix missing import
43
        import elementtree.ElementTree
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
44
    ParseError = SyntaxError
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
45
except ImportError:
1185.33.68 by Martin Pool
Emit warning to trace file only if using cElementTree.
46
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
47
           " and make sure it's on your PYTHONPATH")
2039.2.1 by Martin Pool
Load python2.5's ElementTree if present
48
    # this copy is shipped with bzr
1227 by Martin Pool
- methods to deserialize objects from strings
49
    from util.elementtree.ElementTree import (ElementTree, SubElement,
1248 by Martin Pool
- new weave based cleanup [broken]
50
                                              Element, XMLTreeBuilder,
51
                                              fromstring, tostring)
1772.1.1 by mbp at sourcefrog
Fix up loading of fallback ElementTree
52
    import util.elementtree as elementtree
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
53
    from xml.parsers.expat import ExpatError as ParseError
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
54
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
55
from bzrlib import (
56
    cache_utf8,
6355.1.3 by Jelmer Vernooij
Split out more stuff.
57
    inventory,
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
58
    lazy_regex,
59
    errors,
60
    )
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
61
62
4237.3.1 by Jelmer Vernooij
Add new module with generic serializer information; keep XML-specific bits in
63
class XMLSerializer(Serializer):
64
    """Abstract XML object serialize/deserialize"""
1248 by Martin Pool
- new weave based cleanup [broken]
65
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
66
    squashes_xml_invalid_characters = True
67
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
68
    def read_inventory_from_string(self, xml_string, revision_id=None,
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
69
                                   entry_cache=None, return_from_cache=False):
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
70
        """Read xml_string into an inventory object.
71
72
        :param xml_string: The xml to read.
73
        :param revision_id: If not-None, the expected revision id of the
74
            inventory. Some serialisers use this to set the results' root
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
75
            revision. This should be supplied for deserialising all
76
            from-repository inventories so that xml5 inventories that were
77
            serialised without a revision identifier can be given the right
78
            revision id (but not for working tree inventories where users can
79
            edit the data without triggering checksum errors or anything).
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
80
        :param entry_cache: An optional cache of InventoryEntry objects. If
81
            supplied we will look up entries via (file_id, revision_id) which
82
            should map to a valid InventoryEntry (File/Directory/etc) object.
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
83
        :param return_from_cache: Return entries directly from the cache,
84
            rather than copying them first. This is only safe if the caller
85
            promises not to mutate the returned inventory entries, but it can
86
            make some operations significantly faster.
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
87
        """
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
88
        try:
3882.6.23 by John Arbash Meinel
Change the XMLSerializer.read_inventory_from_string api.
89
            return self._unpack_inventory(fromstring(xml_string), revision_id,
4849.4.2 by John Arbash Meinel
Change from being a per-serializer attribute to being a per-repo attribute.
90
                                          entry_cache=entry_cache,
91
                                          return_from_cache=return_from_cache)
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
92
        except ParseError, e:
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
93
            raise errors.UnexpectedInventoryFormat(e)
1227 by Martin Pool
- methods to deserialize objects from strings
94
2889.1.1 by Robert Collins
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
95
    def read_inventory(self, f, revision_id=None):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
96
        try:
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
97
            try:
98
                return self._unpack_inventory(self._read_element(f),
99
                    revision_id=None)
100
            finally:
101
                f.close()
2029.2.1 by Marien Zwart
Handle the different exception (non-c)ElementTree raises.
102
        except ParseError, e:
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
103
            raise errors.UnexpectedInventoryFormat(e)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
104
1182 by Martin Pool
- more disentangling of xml storage format from objects
105
    def write_revision(self, rev, f):
106
        self._write_element(self._pack_revision(rev), f)
107
1248 by Martin Pool
- new weave based cleanup [broken]
108
    def write_revision_to_string(self, rev):
1185.16.123 by Martin Pool
Fix syntax of serializer_v5.pack_revision_to_string
109
        return tostring(self._pack_revision(rev)) + '\n'
1248 by Martin Pool
- new weave based cleanup [broken]
110
1182 by Martin Pool
- more disentangling of xml storage format from objects
111
    def read_revision(self, f):
112
        return self._unpack_revision(self._read_element(f))
113
1227 by Martin Pool
- methods to deserialize objects from strings
114
    def read_revision_from_string(self, xml_string):
1248 by Martin Pool
- new weave based cleanup [broken]
115
        return self._unpack_revision(fromstring(xml_string))
1227 by Martin Pool
- methods to deserialize objects from strings
116
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
117
    def _write_element(self, elt, f):
118
        ElementTree(elt).write(f, 'utf-8')
119
        f.write('\n')
120
121
    def _read_element(self, f):
122
        return ElementTree().parse(f)
1713.1.12 by Robert Collins
Improve serialisation of xml performance by overriding elementree's escape routines.
123
124
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
125
def escape_invalid_chars(message):
126
    """Escape the XML-invalid characters in a commit message.
127
128
    :param message: Commit message to escape
4354.1.1 by Jelmer Vernooij
Fix docstring for bzrlib.xml_serializer.escape_invalid_chars.
129
    :return: tuple with escaped message and number of characters escaped
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
130
    """
4416.5.1 by Jelmer Vernooij
Move squashing of XML-invalid characters to XMLSerializer.
131
    if message is None:
132
        return None, 0
4222.1.1 by Jelmer Vernooij
Make function for escaping invalid XML characters public.
133
    # Python strings can include characters that can't be
134
    # represented in well-formed XML; escape characters that
135
    # aren't listed in the XML specification
136
    # (http://www.w3.org/TR/REC-xml/#NT-Char).
137
    return re.subn(u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
138
            lambda match: match.group(0).encode('unicode_escape'),
139
            message)
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
140
141
6355.1.3 by Jelmer Vernooij
Split out more stuff.
142
def get_utf8_or_ascii(a_str, _encode_utf8=cache_utf8.encode):
6355.1.1 by Jelmer Vernooij
Move some utility functions to xml_serializer.
143
    """Return a cached version of the string.
144
145
    cElementTree will return a plain string if the XML is plain ascii. It only
146
    returns Unicode when it needs to. We want to work in utf-8 strings. So if
147
    cElementTree returns a plain string, we can just return the cached version.
148
    If it is Unicode, then we need to encode it.
149
150
    :param a_str: An 8-bit string or Unicode as returned by
151
                  cElementTree.Element.get()
152
    :return: A utf-8 encoded 8-bit string.
153
    """
154
    # This is fairly optimized because we know what cElementTree does, this is
155
    # not meant as a generic function for all cases. Because it is possible for
156
    # an 8-bit string to not be ascii or valid utf8.
157
    if a_str.__class__ is unicode:
158
        return _encode_utf8(a_str)
159
    else:
160
        return intern(a_str)
161
162
163
_utf8_re = lazy_regex.lazy_compile('[&<>\'\"]|[\x80-\xff]+')
164
_unicode_re = lazy_regex.lazy_compile(u'[&<>\'\"\u0080-\uffff]')
165
166
167
_xml_escape_map = {
168
    "&":'&amp;',
169
    "'":"&apos;", # FIXME: overkill
170
    "\"":"&quot;",
171
    "<":"&lt;",
172
    ">":"&gt;",
173
    }
174
175
176
def _unicode_escape_replace(match, _map=_xml_escape_map):
177
    """Replace a string of non-ascii, non XML safe characters with their escape
178
179
    This will escape both Standard XML escapes, like <>"', etc.
180
    As well as escaping non ascii characters, because ElementTree did.
181
    This helps us remain compatible to older versions of bzr. We may change
182
    our policy in the future, though.
183
    """
184
    # jam 20060816 Benchmarks show that try/KeyError is faster if you
185
    # expect the entity to rarely miss. There is about a 10% difference
186
    # in overall time. But if you miss frequently, then if None is much
187
    # faster. For our use case, we *rarely* have a revision id, file id
188
    # or path name that is unicode. So use try/KeyError.
189
    try:
190
        return _map[match.group()]
191
    except KeyError:
192
        return "&#%d;" % ord(match.group())
193
194
195
def _utf8_escape_replace(match, _map=_xml_escape_map):
196
    """Escape utf8 characters into XML safe ones.
197
198
    This uses 2 tricks. It is either escaping "standard" characters, like "&<>,
199
    or it is handling characters with the high-bit set. For ascii characters,
200
    we just lookup the replacement in the dictionary. For everything else, we
201
    decode back into Unicode, and then use the XML escape code.
202
    """
203
    try:
204
        return _map[match.group()]
205
    except KeyError:
206
        return ''.join('&#%d;' % ord(uni_chr)
207
                       for uni_chr in match.group().decode('utf8'))
208
209
210
_to_escaped_map = {}
211
212
def encode_and_escape(unicode_or_utf8_str, _map=_to_escaped_map):
213
    """Encode the string into utf8, and escape invalid XML characters"""
214
    # We frequently get entities we have not seen before, so it is better
215
    # to check if None, rather than try/KeyError
216
    text = _map.get(unicode_or_utf8_str)
217
    if text is None:
218
        if unicode_or_utf8_str.__class__ is unicode:
219
            # The alternative policy is to do a regular UTF8 encoding
220
            # and then escape only XML meta characters.
221
            # Performance is equivalent once you use cache_utf8. *However*
222
            # this makes the serialized texts incompatible with old versions
223
            # of bzr. So no net gain. (Perhaps the read code would handle utf8
224
            # better than entity escapes, but cElementTree seems to do just fine
225
            # either way)
226
            text = str(_unicode_re.sub(_unicode_escape_replace,
227
                                       unicode_or_utf8_str)) + '"'
228
        else:
229
            # Plain strings are considered to already be in utf-8 so we do a
230
            # slightly different method for escaping.
231
            text = _utf8_re.sub(_utf8_escape_replace,
232
                                unicode_or_utf8_str) + '"'
233
        _map[unicode_or_utf8_str] = text
234
    return text
235
236
237
def _clear_cache():
238
    """Clean out the unicode => escaped map"""
239
    _to_escaped_map.clear()
6355.1.3 by Jelmer Vernooij
Split out more stuff.
240
241
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
242
def unpack_inventory_entry(elt, entry_cache=None, return_from_cache=False):
6355.1.3 by Jelmer Vernooij
Split out more stuff.
243
    elt_get = elt.get
244
    file_id = elt_get('file_id')
245
    revision = elt_get('revision')
246
    # Check and see if we have already unpacked this exact entry
247
    # Some timings for "repo.revision_trees(last_100_revs)"
248
    #               bzr     mysql
249
    #   unmodified  4.1s    40.8s
250
    #   using lru   3.5s
251
    #   using fifo  2.83s   29.1s
252
    #   lru._cache  2.8s
253
    #   dict        2.75s   26.8s
254
    #   inv.add     2.5s    26.0s
255
    #   no_copy     2.00s   20.5s
256
    #   no_c,dict   1.95s   18.0s
257
    # Note that a cache of 10k nodes is more than sufficient to hold all of
258
    # the inventory for the last 100 revs for bzr, but not for mysql (20k
259
    # is enough for mysql, which saves the same 2s as using a dict)
260
261
    # Breakdown of mysql using time.clock()
262
    #   4.1s    2 calls to element.get for file_id, revision_id
263
    #   4.5s    cache_hit lookup
264
    #   7.1s    InventoryFile.copy()
265
    #   2.4s    InventoryDirectory.copy()
266
    #   0.4s    decoding unique entries
267
    #   1.6s    decoding entries after FIFO fills up
268
    #   0.8s    Adding nodes to FIFO (including flushes)
269
    #   0.1s    cache miss lookups
270
    # Using an LRU cache
271
    #   4.1s    2 calls to element.get for file_id, revision_id
272
    #   9.9s    cache_hit lookup
273
    #   10.8s   InventoryEntry.copy()
274
    #   0.3s    cache miss lookus
275
    #   1.2s    decoding entries
276
    #   1.0s    adding nodes to LRU
277
    if entry_cache is not None and revision is not None:
278
        key = (file_id, revision)
279
        try:
280
            # We copy it, because some operations may mutate it
281
            cached_ie = entry_cache[key]
282
        except KeyError:
283
            pass
284
        else:
285
            # Only copying directory entries drops us 2.85s => 2.35s
286
            if return_from_cache:
287
                if cached_ie.kind == 'directory':
288
                    return cached_ie.copy()
289
                return cached_ie
290
            return cached_ie.copy()
291
292
    kind = elt.tag
293
    if not inventory.InventoryEntry.versionable_kind(kind):
294
        raise AssertionError('unsupported entry kind %s' % kind)
295
296
    file_id = get_utf8_or_ascii(file_id)
297
    if revision is not None:
298
        revision = get_utf8_or_ascii(revision)
299
    parent_id = elt_get('parent_id')
300
    if parent_id is not None:
301
        parent_id = get_utf8_or_ascii(parent_id)
302
303
    if kind == 'directory':
304
        ie = inventory.InventoryDirectory(file_id,
305
                                          elt_get('name'),
306
                                          parent_id)
307
    elif kind == 'file':
308
        ie = inventory.InventoryFile(file_id,
309
                                     elt_get('name'),
310
                                     parent_id)
311
        ie.text_sha1 = elt_get('text_sha1')
312
        if elt_get('executable') == 'yes':
313
            ie.executable = True
314
        v = elt_get('text_size')
315
        ie.text_size = v and int(v)
316
    elif kind == 'symlink':
317
        ie = inventory.InventoryLink(file_id,
318
                                     elt_get('name'),
319
                                     parent_id)
320
        ie.symlink_target = elt_get('symlink_target')
321
    else:
322
        raise errors.UnsupportedInventoryKind(kind)
323
    ie.revision = revision
324
    if revision is not None and entry_cache is not None:
325
        # We cache a copy() because callers like to mutate objects, and
326
        # that would cause the item in cache to mutate as well.
327
        # This has a small effect on many-inventory performance, because
328
        # the majority fraction is spent in cache hits, not misses.
329
        entry_cache[key] = ie.copy()
330
331
    return ie
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
332
333
6355.1.9 by Jelmer Vernooij
Review feedback - pass entry_cache and_return_from_cache to unpack_inventory_flat.
334
def unpack_inventory_flat(elt, format_num, unpack_entry,
335
            entry_cache=None, return_from_cache=False):
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
336
    """Unpack a flat XML inventory.
337
338
    :param elt: XML element for the inventory
339
    :param format_num: Expected format number
340
    :param unpack_entry: Function for unpacking inventory entries
341
    :return: An inventory
342
    :raise UnexpectedInventoryFormat: When unexpected elements or data is
343
        encountered
344
    """
345
    if elt.tag != 'inventory':
346
        raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
347
    format = elt.get('format')
348
    if format != format_num:
349
        raise errors.UnexpectedInventoryFormat('Invalid format version %r'
350
                                               % format)
351
    revision_id = elt.get('revision_id')
352
    if revision_id is not None:
353
        revision_id = cache_utf8.encode(revision_id)
354
    inv = inventory.Inventory(root_id=None, revision_id=revision_id)
355
    for e in elt:
6355.1.9 by Jelmer Vernooij
Review feedback - pass entry_cache and_return_from_cache to unpack_inventory_flat.
356
        ie = unpack_entry(e, entry_cache, return_from_cache)
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
357
        inv.add(ie)
358
    return inv
359
360
6355.1.7 by Jelmer Vernooij
Fix tests.
361
def serialize_inventory_flat(inv, append, root_id, supported_kinds, working):
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
362
    """Serialize an inventory to a flat XML file.
363
364
    :param inv: Inventory to serialize
6355.1.7 by Jelmer Vernooij
Fix tests.
365
    :param append: Function for writing a line of output
6355.1.6 by Jelmer Vernooij
Move core inventory code to xml_serializer.
366
    :param working: If True skip history data - text_sha1, text_size,
367
        reference_revision, symlink_target.    self._check_revisions(inv)
368
    """
369
    entries = inv.iter_entries()
370
    # Skip the root
371
    root_path, root_ie = entries.next()
372
    for path, ie in entries:
373
        if ie.parent_id != root_id:
374
            parent_str = ' parent_id="'
375
            parent_id  = encode_and_escape(ie.parent_id)
376
        else:
377
            parent_str = ''
378
            parent_id  = ''
379
        if ie.kind == 'file':
380
            if ie.executable:
381
                executable = ' executable="yes"'
382
            else:
383
                executable = ''
384
            if not working:
385
                append('<file%s file_id="%s name="%s%s%s revision="%s '
386
                    'text_sha1="%s" text_size="%d" />\n' % (
387
                    executable, encode_and_escape(ie.file_id),
388
                    encode_and_escape(ie.name), parent_str, parent_id,
389
                    encode_and_escape(ie.revision), ie.text_sha1,
390
                    ie.text_size))
391
            else:
392
                append('<file%s file_id="%s name="%s%s%s />\n' % (
393
                    executable, encode_and_escape(ie.file_id),
394
                    encode_and_escape(ie.name), parent_str, parent_id))
395
        elif ie.kind == 'directory':
396
            if not working:
397
                append('<directory file_id="%s name="%s%s%s revision="%s '
398
                    '/>\n' % (
399
                    encode_and_escape(ie.file_id),
400
                    encode_and_escape(ie.name),
401
                    parent_str, parent_id,
402
                    encode_and_escape(ie.revision)))
403
            else:
404
                append('<directory file_id="%s name="%s%s%s />\n' % (
405
                    encode_and_escape(ie.file_id),
406
                    encode_and_escape(ie.name),
407
                    parent_str, parent_id))
408
        elif ie.kind == 'symlink':
409
            if not working:
410
                append('<symlink file_id="%s name="%s%s%s revision="%s '
411
                    'symlink_target="%s />\n' % (
412
                    encode_and_escape(ie.file_id),
413
                    encode_and_escape(ie.name),
414
                    parent_str, parent_id,
415
                    encode_and_escape(ie.revision),
416
                    encode_and_escape(ie.symlink_target)))
417
            else:
418
                append('<symlink file_id="%s name="%s%s%s />\n' % (
419
                    encode_and_escape(ie.file_id),
420
                    encode_and_escape(ie.name),
421
                    parent_str, parent_id))
422
        elif ie.kind == 'tree-reference':
423
            if ie.kind not in supported_kinds:
424
                raise errors.UnsupportedInventoryKind(ie.kind)
425
            if not working:
426
                append('<tree-reference file_id="%s name="%s%s%s '
427
                    'revision="%s reference_revision="%s />\n' % (
428
                    encode_and_escape(ie.file_id),
429
                    encode_and_escape(ie.name),
430
                    parent_str, parent_id,
431
                    encode_and_escape(ie.revision),
432
                    encode_and_escape(ie.reference_revision)))
433
            else:
434
                append('<tree-reference file_id="%s name="%s%s%s />\n' % (
435
                    encode_and_escape(ie.file_id),
436
                    encode_and_escape(ie.name),
437
                    parent_str, parent_id))
438
        else:
439
            raise errors.UnsupportedInventoryKind(ie.kind)
440
    append('</inventory>\n')