~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
1910.2.48 by Aaron Bentley
Update from review comments
149
    support_altered_by_hack = True
150
    # This format supports the altered-by hack that reads file ids directly out
151
    # of the versionedfile, without doing XML parsing.
152
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
153
    supported_kinds = set(['file', 'directory', 'symlink'])
154
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
155
    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')
156
        """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
157
        sio = cStringIO.StringIO()
158
        self.write_inventory(inv, sio)
159
        return sio.getvalue()
160
161
    def write_inventory(self, inv, f):
162
        """Write inventory to a file.
163
        
164
        :param inv: the inventory to write.
165
        :param f: the file to write.
166
        """
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
167
        _ensure_utf8_re()
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
168
        output = []
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
169
        append = output.append
170
        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
171
        entries = inv.iter_entries()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
172
        # Skip the root
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
173
        root_path, root_ie = entries.next()
174
        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
175
            self._append_entry(append, ie)
176
        append('</inventory>\n')
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
177
        f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
178
        # Just to keep the cache from growing without bounds
179
        # 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
180
        #_clear_cache()
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
181
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
182
    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
183
        """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
184
        append('<inventory')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
185
        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
186
            append(' file_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.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
188
        append(' format="5"')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
189
        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
190
            append(' revision_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
191
            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
192
        append('>\n')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
193
        
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
194
    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
195
        """Convert InventoryEntry to XML element and append to output."""
196
        # TODO: should just be a plain assertion
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
197
        if ie.kind not in self.supported_kinds:
198
            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
199
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
200
        append("<")
201
        append(ie.kind)
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
202
        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
203
            append(' executable="yes"')
204
        append(' file_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
205
        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
206
        append(' name="')
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.name))
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
208
        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
209
            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
210
            append(' parent_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
211
            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
212
        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
213
            append(' revision="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
214
            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
215
        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
216
            append(' symlink_target="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
217
            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
218
        if ie.text_sha1 is not None:
1934.1.15 by John Arbash Meinel
One field was incorrect, need text_sha1 not text_size
219
            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
220
            append(ie.text_sha1)
221
            append('"')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
222
        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
223
            append(' text_size="%d"' % ie.text_size)
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
224
        if getattr(ie, 'reference_revision', None) is not None:
225
            append(' reference_revision="')
226
            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
227
        append(" />\n")
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
228
        return
229
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
230
    def _parent_condition(self, ie):
231
        return ie.parent_id != ROOT_ID
232
1189 by Martin Pool
- BROKEN: partial support for commit into weave
233
    def _pack_revision(self, rev):
234
        """Revision object -> xml tree"""
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
235
        # For the XML format, we need to write them as Unicode rather than as
236
        # utf-8 strings. So that cElementTree can handle properly escaping
237
        # them.
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
238
        decode_utf8 = cache_utf8.decode
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
239
        revision_id = rev.revision_id
240
        if isinstance(revision_id, str):
241
            revision_id = decode_utf8(revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
242
        root = Element('revision',
243
                       committer = rev.committer,
2102.4.1 by John Arbash Meinel
Switch to using millisecond resolution in Revision XML
244
                       timestamp = '%.3f' % rev.timestamp,
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
245
                       revision_id = revision_id,
1189 by Martin Pool
- BROKEN: partial support for commit into weave
246
                       inventory_sha1 = rev.inventory_sha1,
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
247
                       format='5',
1189 by Martin Pool
- BROKEN: partial support for commit into weave
248
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
249
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
250
            root.set('timezone', str(rev.timezone))
251
        root.text = '\n'
252
        msg = SubElement(root, 'message')
253
        msg.text = rev.message
254
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
255
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
256
            pelts = SubElement(root, 'parents')
257
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
258
            for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
259
                assert isinstance(parent_id, basestring)
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
260
                _mod_revision.check_not_reserved_id(parent_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
261
                p = SubElement(pelts, 'revision_ref')
262
                p.tail = '\n'
2249.5.5 by John Arbash Meinel
better comment for why we are decoding
263
                if isinstance(parent_id, str):
264
                    parent_id = decode_utf8(parent_id)
265
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
266
        if rev.properties:
267
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
268
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
269
270
    def _pack_revision_properties(self, rev, under_element):
271
        top_elt = SubElement(under_element, 'properties')
272
        for prop_name, prop_value in sorted(rev.properties.items()):
273
            assert isinstance(prop_name, basestring) 
274
            assert isinstance(prop_value, basestring) 
275
            prop_elt = SubElement(top_elt, 'property')
276
            prop_elt.set('name', prop_name)
277
            prop_elt.text = prop_value
278
            prop_elt.tail = '\n'
279
        top_elt.tail = '\n'
280
1189 by Martin Pool
- BROKEN: partial support for commit into weave
281
    def _unpack_inventory(self, elt):
282
        """Construct from XML Element
283
        """
284
        assert elt.tag == 'inventory'
285
        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
286
        root_id = _get_utf8_or_ascii(root_id)
287
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
288
        format = elt.get('format')
289
        if format is not None:
290
            if format != '5':
291
                raise BzrError("invalid format version %r on inventory"
292
                                % format)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
293
        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.
294
        if revision_id is not None:
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
295
            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.
296
        inv = Inventory(root_id, revision_id=revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
297
        for e in elt:
298
            ie = self._unpack_entry(e)
2294.1.9 by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID
299
            if ie.parent_id is None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
300
                ie.parent_id = root_id
301
            inv.add(ie)
302
        return inv
303
2294.1.9 by John Arbash Meinel
Minor performance improvement, use None as signal rather than ROOT_ID
304
    def _unpack_entry(self, elt):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
305
        kind = elt.tag
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
306
        if not InventoryEntry.versionable_kind(kind):
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
307
            raise AssertionError('unsupported entry kind %s' % kind)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
308
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
309
        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.
310
1189 by Martin Pool
- BROKEN: partial support for commit into weave
311
        parent_id = elt.get('parent_id')
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
312
        if parent_id is not None:
313
            parent_id = get_cached(parent_id)
314
        file_id = get_cached(elt.get('file_id'))
1189 by Martin Pool
- BROKEN: partial support for commit into weave
315
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
316
        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.
317
            ie = inventory.InventoryDirectory(file_id,
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
318
                                              elt.get('name'),
319
                                              parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
320
        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.
321
            ie = inventory.InventoryFile(file_id,
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
322
                                         elt.get('name'),
323
                                         parent_id)
324
            ie.text_sha1 = elt.get('text_sha1')
325
            if elt.get('executable') == 'yes':
326
                ie.executable = True
327
            v = elt.get('text_size')
328
            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
329
        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.
330
            ie = inventory.InventoryLink(file_id,
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
331
                                         elt.get('name'),
332
                                         parent_id)
333
            ie.symlink_target = elt.get('symlink_target')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
334
        else:
2100.3.1 by Aaron Bentley
Start roundtripping tree-reference entries
335
            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.
336
        revision = elt.get('revision')
337
        if revision is not None:
338
            revision = get_cached(revision)
339
        ie.revision = revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
340
341
        return ie
342
343
    def _unpack_revision(self, elt):
344
        """XML Element -> Revision object"""
345
        assert elt.tag == 'revision'
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
346
        format = elt.get('format')
347
        if format is not None:
348
            if format != '5':
349
                raise BzrError("invalid format version %r on inventory"
350
                                % format)
2249.5.4 by John Arbash Meinel
When reading XML, always return utf-8 revision ids.
351
        get_cached = _get_utf8_or_ascii
1189 by Martin Pool
- BROKEN: partial support for commit into weave
352
        rev = Revision(committer = elt.get('committer'),
353
                       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.
354
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
355
                       inventory_sha1 = elt.get('inventory_sha1')
356
                       )
357
        parents = elt.find('parents') or []
358
        for p in parents:
359
            assert p.tag == 'revision_ref', \
360
                   "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.
361
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
362
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
363
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
364
        if v is None:
365
            rev.timezone = 0
366
        else:
367
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
368
        rev.message = elt.findtext('message') # text of <message>
369
        return rev
370
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
371
    def _unpack_revision_properties(self, elt, rev):
372
        """Unpack properties onto a revision."""
373
        props_elt = elt.find('properties')
374
        assert len(rev.properties) == 0
375
        if not props_elt:
376
            return
377
        for prop_elt in props_elt:
378
            assert prop_elt.tag == 'property', \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
379
                "bad tag under properties list: %r" % prop_elt.tag
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
380
            name = prop_elt.get('name')
381
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
382
            # If a property had an empty value ('') cElementTree reads
383
            # that back as None, convert it back to '', so that all
384
            # properties have string values
385
            if value is None:
386
                value = ''
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
387
            assert name not in rev.properties, \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
388
                "repeated property %r" % name
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
389
            rev.properties[name] = value
390
391
1189 by Martin Pool
- BROKEN: partial support for commit into weave
392
serializer_v5 = Serializer_v5()