/brz/remove-bazaar

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