~bzr-pqm/bzr/bzr.dev

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