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