~bzr-pqm/bzr/bzr.dev

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
31
_utf8_escape_map = {
32
    "&":'&',
33
    "'":"'", # FIXME: overkill
34
    "\"":""",
35
    "<":"&lt;",
36
    ">":"&gt;",
37
    }
38
39
40
def _ensure_utf8_re():
41
    """Make sure the _utf8_re regex has been compiled"""
42
    global _utf8_re
43
    if _utf8_re is not None:
44
        return
1934.1.12 by John Arbash Meinel
Switch back to using Entity serializer, since performance is equivalent, yet still compatible
45
    _utf8_re = re.compile(u'[&<>\'\"\u0080-\uffff]')
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
46
47
48
def _utf8_escape_replace(match, _map=_utf8_escape_map):
49
    """Replace a string of non-ascii, non XML safe characters with their escape
50
51
    This will escape both Standard XML escapes, like <>"', etc.
52
    As well as escaping non ascii characters, because ElementTree did.
53
    This helps us remain compatible to older versions of bzr. We may change
54
    our policy in the future, though.
55
    """
1934.1.7 by John Arbash Meinel
Comment why we do caching the way we do
56
    # jam 20060816 Benchmarks show that try/KeyError is faster if you
57
    # expect the entity to rarely miss. There is about a 10% difference
58
    # in overall time. But if you miss frequently, then if None is much
59
    # faster. For our use case, we *rarely* have a revision id, file id
60
    # 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
61
    try:
62
        return _map[match.group()]
63
    except KeyError:
64
        return "&#%d;" % ord(match.group())
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
65
66
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
67
_unicode_to_escaped_map = {}
68
1934.1.12 by John Arbash Meinel
Switch back to using Entity serializer, since performance is equivalent, yet still compatible
69
def _encode_and_escape(unicode_str, _map=_unicode_to_escaped_map):
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
70
    """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
71
    # We frequently get entities we have not seen before, so it is better
72
    # to check if None, rather than try/KeyError
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
73
    text = _map.get(unicode_str)
74
    if text is None:
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
75
        # The alternative policy is to do a regular UTF8 encoding
1934.1.12 by John Arbash Meinel
Switch back to using Entity serializer, since performance is equivalent, yet still compatible
76
        # and then escape only XML meta characters.
77
        # Performance is equivalent once you use cache_utf8. *However*
78
        # this makes the serialized texts incompatible with old versions
79
        # of bzr. So no net gain. (Perhaps the read code would handle utf8
80
        # better than entity escapes, but cElementTree seems to do just fine
81
        # either way)
82
        text = str(_utf8_re.sub(_utf8_escape_replace, unicode_str)) + '"'
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
83
        _map[unicode_str] = text
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
84
    return text
85
86
87
def _clear_cache():
88
    """Clean out the unicode => escaped map"""
89
    _unicode_to_escaped_map.clear()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
90
91
1189 by Martin Pool
- BROKEN: partial support for commit into weave
92
class Serializer_v5(Serializer):
93
    """Version 5 serializer
94
95
    Packs objects into XML and vice versa.
96
    """
97
    
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
98
    __slots__ = []
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
99
1910.2.48 by Aaron Bentley
Update from review comments
100
    support_altered_by_hack = True
101
    # This format supports the altered-by hack that reads file ids directly out
102
    # of the versionedfile, without doing XML parsing.
103
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
104
    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')
105
        """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
106
        sio = cStringIO.StringIO()
107
        self.write_inventory(inv, sio)
108
        return sio.getvalue()
109
110
    def write_inventory(self, inv, f):
111
        """Write inventory to a file.
112
        
113
        :param inv: the inventory to write.
114
        :param f: the file to write.
115
        """
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
116
        _ensure_utf8_re()
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
117
        output = []
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
118
        append = output.append
119
        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
120
        entries = inv.iter_entries()
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
121
        # Skip the root
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
122
        root_path, root_ie = entries.next()
123
        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
124
            self._append_entry(append, ie)
125
        append('</inventory>\n')
1934.1.4 by John Arbash Meinel
rewrite escaper to use xml numerical entities, rather than using encode('utf8')
126
        f.writelines(output)
1934.1.5 by John Arbash Meinel
Cache the entity escaping cuts us down to 450ms
127
        # Just to keep the cache from growing without bounds
128
        # 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
129
        #_clear_cache()
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
130
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
131
    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
132
        """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
133
        append('<inventory')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
134
        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
135
            append(' file_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
136
            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
137
        append(' format="5"')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
138
        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
139
            append(' revision_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
140
            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
141
        append('>\n')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
142
        
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
143
    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
144
        """Convert InventoryEntry to XML element and append to output."""
145
        # TODO: should just be a plain assertion
146
        assert InventoryEntry.versionable_kind(ie.kind), \
147
            'unsupported entry kind %s' % ie.kind
148
1934.1.8 by John Arbash Meinel
Passing around the append function rather than the list shaves off another 10%, down to 400ms
149
        append("<")
150
        append(ie.kind)
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
151
        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
152
            append(' executable="yes"')
153
        append(' file_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
154
        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
155
        append(' name="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
156
        append(_encode_and_escape(ie.name))
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
157
        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
158
            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
159
            append(' parent_id="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
160
            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
161
        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
162
            append(' revision="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
163
            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
164
        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
165
            append(' symlink_target="')
1934.1.9 by John Arbash Meinel
Caching the trailing " and directly appending, down another 50ms, 275ms cached, 354ms uncached
166
            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
167
        if ie.text_sha1 is not None:
1934.1.15 by John Arbash Meinel
One field was incorrect, need text_sha1 not text_size
168
            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
169
            append(ie.text_sha1)
170
            append('"')
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
171
        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
172
            append(' text_size="%d"' % ie.text_size)
173
        append(" />\n")
1934.1.3 by John Arbash Meinel
[merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences
174
        return
175
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
176
    def _parent_condition(self, ie):
177
        return ie.parent_id != ROOT_ID
178
1189 by Martin Pool
- BROKEN: partial support for commit into weave
179
    def _pack_revision(self, rev):
180
        """Revision object -> xml tree"""
181
        root = Element('revision',
182
                       committer = rev.committer,
183
                       timestamp = '%.9f' % rev.timestamp,
184
                       revision_id = rev.revision_id,
185
                       inventory_sha1 = rev.inventory_sha1,
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
186
                       format='5',
1189 by Martin Pool
- BROKEN: partial support for commit into weave
187
                       )
1913.1.1 by John Arbash Meinel
Fix bug #55783
188
        if rev.timezone is not None:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
189
            root.set('timezone', str(rev.timezone))
190
        root.text = '\n'
191
        msg = SubElement(root, 'message')
192
        msg.text = rev.message
193
        msg.tail = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
194
        if rev.parent_ids:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
195
            pelts = SubElement(root, 'parents')
196
            pelts.tail = pelts.text = '\n'
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
197
            for parent_id in rev.parent_ids:
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
198
                assert isinstance(parent_id, basestring)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
199
                p = SubElement(pelts, 'revision_ref')
200
                p.tail = '\n'
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
201
                p.set('revision_id', parent_id)
1185.16.36 by Martin Pool
- store revision properties in revision xml
202
        if rev.properties:
203
            self._pack_revision_properties(rev, root)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
204
        return root
1185.16.36 by Martin Pool
- store revision properties in revision xml
205
206
    def _pack_revision_properties(self, rev, under_element):
207
        top_elt = SubElement(under_element, 'properties')
208
        for prop_name, prop_value in sorted(rev.properties.items()):
209
            assert isinstance(prop_name, basestring) 
210
            assert isinstance(prop_value, basestring) 
211
            prop_elt = SubElement(top_elt, 'property')
212
            prop_elt.set('name', prop_name)
213
            prop_elt.text = prop_value
214
            prop_elt.tail = '\n'
215
        top_elt.tail = '\n'
216
1189 by Martin Pool
- BROKEN: partial support for commit into weave
217
    def _unpack_inventory(self, elt):
218
        """Construct from XML Element
219
        """
220
        assert elt.tag == 'inventory'
221
        root_id = elt.get('file_id') or ROOT_ID
1393.1.59 by Martin Pool
- put 'format=5' on inventory and revision xml
222
        format = elt.get('format')
223
        if format is not None:
224
            if format != '5':
225
                raise BzrError("invalid format version %r on inventory"
226
                                % format)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
227
        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.
228
        if revision_id is not None:
229
            revision_id = cache_utf8.get_cached_unicode(revision_id)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
230
        inv = Inventory(root_id, revision_id=revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
231
        for e in elt:
232
            ie = self._unpack_entry(e)
233
            if ie.parent_id == ROOT_ID:
234
                ie.parent_id = root_id
235
            inv.add(ie)
236
        return inv
237
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
238
    def _unpack_entry(self, elt, none_parents=False):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
239
        kind = elt.tag
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
240
        if not InventoryEntry.versionable_kind(kind):
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
241
            raise AssertionError('unsupported entry kind %s' % kind)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
242
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.
243
        get_cached = cache_utf8.get_cached_unicode
244
1189 by Martin Pool
- BROKEN: partial support for commit into weave
245
        parent_id = elt.get('parent_id')
1910.2.47 by Aaron Bentley
Merge bzr.dev
246
        if parent_id is None and not none_parents:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
247
            parent_id = ROOT_ID
1934.1.20 by John Arbash Meinel
Document why we aren't caching file ids at the moment
248
        # TODO: jam 20060817 At present, caching file ids costs us too 
249
        #       much time. It slows down overall read performances from
250
        #       approx 500ms to 700ms. And doesn't improve future reads.
251
        #       it might be because revision ids and file ids are mixing.
252
        #       Consider caching *just* the file ids, for a limited period
253
        #       of time.
1934.1.18 by John Arbash Meinel
Caching revision_ids costs us a little (512 vs 475), but caching file-ids costs us a lot (780 vs 512), so disabling caching of file ids for now
254
        #parent_id = get_cached(parent_id)
255
        #file_id = get_cached(elt.get('file_id'))
256
        file_id = elt.get('file_id')
1189 by Martin Pool
- BROKEN: partial support for commit into weave
257
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
258
        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.
259
            ie = inventory.InventoryDirectory(file_id,
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
260
                                              elt.get('name'),
261
                                              parent_id)
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
262
        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.
263
            ie = inventory.InventoryFile(file_id,
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
264
                                         elt.get('name'),
265
                                         parent_id)
266
            ie.text_sha1 = elt.get('text_sha1')
267
            if elt.get('executable') == 'yes':
268
                ie.executable = True
269
            v = elt.get('text_size')
270
            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
271
        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.
272
            ie = inventory.InventoryLink(file_id,
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
273
                                         elt.get('name'),
274
                                         parent_id)
275
            ie.symlink_target = elt.get('symlink_target')
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
276
        else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
277
            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.
278
        revision = elt.get('revision')
279
        if revision is not None:
280
            revision = get_cached(revision)
281
        ie.revision = revision
1189 by Martin Pool
- BROKEN: partial support for commit into weave
282
283
        return ie
284
285
    def _unpack_revision(self, elt):
286
        """XML Element -> Revision object"""
287
        assert elt.tag == 'revision'
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)
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.
293
        get_cached = cache_utf8.get_cached_unicode
1189 by Martin Pool
- BROKEN: partial support for commit into weave
294
        rev = Revision(committer = elt.get('committer'),
295
                       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.
296
                       revision_id = get_cached(elt.get('revision_id')),
1189 by Martin Pool
- BROKEN: partial support for commit into weave
297
                       inventory_sha1 = elt.get('inventory_sha1')
298
                       )
299
        parents = elt.find('parents') or []
300
        for p in parents:
301
            assert p.tag == 'revision_ref', \
302
                   "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.
303
            rev.parent_ids.append(get_cached(p.get('revision_id')))
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
304
        self._unpack_revision_properties(elt, rev)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
305
        v = elt.get('timezone')
1913.1.1 by John Arbash Meinel
Fix bug #55783
306
        if v is None:
307
            rev.timezone = 0
308
        else:
309
            rev.timezone = int(v)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
310
        rev.message = elt.findtext('message') # text of <message>
311
        return rev
312
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
313
    def _unpack_revision_properties(self, elt, rev):
314
        """Unpack properties onto a revision."""
315
        props_elt = elt.find('properties')
316
        assert len(rev.properties) == 0
317
        if not props_elt:
318
            return
319
        for prop_elt in props_elt:
320
            assert prop_elt.tag == 'property', \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
321
                "bad tag under properties list: %r" % prop_elt.tag
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
322
            name = prop_elt.get('name')
323
            value = prop_elt.text
1886.1.1 by John Arbash Meinel
Fix bug #47782,
324
            # If a property had an empty value ('') cElementTree reads
325
            # that back as None, convert it back to '', so that all
326
            # properties have string values
327
            if value is None:
328
                value = ''
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
329
            assert name not in rev.properties, \
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
330
                "repeated property %r" % name
1185.16.37 by Martin Pool
- properties are retrieved when revisions are loaded
331
            rev.properties[name] = value
332
333
1189 by Martin Pool
- BROKEN: partial support for commit into weave
334
serializer_v5 = Serializer_v5()