← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: Robert Collins
  • Date: 2005-10-03 14:47:12 UTC
  • mto: (1393.1.30)
  • mto: This revision was merged to the branch mainline in revision 1400.
  • Revision ID: robertc@robertcollins.net-20051003144712-44b3339bd5cfcf69
factor out file related logic from InventoryEntry to InventoryFile

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
22
22
from bzrlib.errors import BzrError
23
23
 
24
24
 
 
25
 
 
26
 
 
27
 
25
28
class Serializer_v5(Serializer):
26
29
    """Version 5 serializer
27
30
 
32
35
    
33
36
    def _pack_inventory(self, inv):
34
37
        """Convert to XML Element"""
35
 
        e = Element('inventory',
36
 
                    format='5')
 
38
        e = Element('inventory')
37
39
        e.text = '\n'
38
40
        if inv.root.file_id not in (None, ROOT_ID):
39
41
            e.set('file_id', inv.root.file_id)
80
82
                       timestamp = '%.9f' % rev.timestamp,
81
83
                       revision_id = rev.revision_id,
82
84
                       inventory_sha1 = rev.inventory_sha1,
83
 
                       format='5',
84
85
                       )
85
86
        if rev.timezone:
86
87
            root.set('timezone', str(rev.timezone))
87
88
        root.text = '\n'
 
89
 
88
90
        msg = SubElement(root, 'message')
89
91
        msg.text = rev.message
90
92
        msg.tail = '\n'
 
93
 
91
94
        if rev.parent_ids:
92
95
            pelts = SubElement(root, 'parents')
93
96
            pelts.tail = pelts.text = '\n'
96
99
                p = SubElement(pelts, 'revision_ref')
97
100
                p.tail = '\n'
98
101
                p.set('revision_id', parent_id)
99
 
        if rev.properties:
100
 
            self._pack_revision_properties(rev, root)
101
102
        return root
102
103
 
103
 
 
104
 
    def _pack_revision_properties(self, rev, under_element):
105
 
        top_elt = SubElement(under_element, 'properties')
106
 
        for prop_name, prop_value in sorted(rev.properties.items()):
107
 
            assert isinstance(prop_name, basestring) 
108
 
            assert isinstance(prop_value, basestring) 
109
 
            prop_elt = SubElement(top_elt, 'property')
110
 
            prop_elt.set('name', prop_name)
111
 
            prop_elt.text = prop_value
112
 
            prop_elt.tail = '\n'
113
 
        top_elt.tail = '\n'
114
 
 
 
104
    
115
105
 
116
106
    def _unpack_inventory(self, elt):
117
107
        """Construct from XML Element
118
108
        """
119
109
        assert elt.tag == 'inventory'
120
110
        root_id = elt.get('file_id') or ROOT_ID
121
 
        format = elt.get('format')
122
 
        if format is not None:
123
 
            if format != '5':
124
 
                raise BzrError("invalid format version %r on inventory"
125
 
                                % format)
126
111
        inv = Inventory(root_id)
127
112
        for e in elt:
128
113
            ie = self._unpack_entry(e)
154
139
                ie.executable = True
155
140
            v = elt.get('text_size')
156
141
            ie.text_size = v and int(v)
157
 
        elif kind == 'symlink':
158
 
            ie = inventory.InventoryLink(elt.get('file_id'),
159
 
                                         elt.get('name'),
160
 
                                         parent_id)
 
142
        else:
 
143
            ie = InventoryEntry(elt.get('file_id'),
 
144
                                elt.get('name'),
 
145
                                kind,
 
146
                                parent_id)
161
147
            ie.symlink_target = elt.get('symlink_target')
162
 
        else:
163
 
            raise BzrError("unknown kind %r" % kind)
164
148
        ie.revision = elt.get('revision')
165
149
 
166
150
        return ie
169
153
    def _unpack_revision(self, elt):
170
154
        """XML Element -> Revision object"""
171
155
        assert elt.tag == 'revision'
172
 
        format = elt.get('format')
173
 
        if format is not None:
174
 
            if format != '5':
175
 
                raise BzrError("invalid format version %r on inventory"
176
 
                                % format)
 
156
        
177
157
        rev = Revision(committer = elt.get('committer'),
178
158
                       timestamp = float(elt.get('timestamp')),
179
159
                       revision_id = elt.get('revision_id'),
180
160
                       inventory_sha1 = elt.get('inventory_sha1')
181
161
                       )
 
162
 
182
163
        parents = elt.find('parents') or []
183
164
        for p in parents:
184
165
            assert p.tag == 'revision_ref', \
185
166
                   "bad parent node tag %r" % p.tag
186
167
            rev.parent_ids.append(p.get('revision_id'))
187
 
        self._unpack_revision_properties(elt, rev)
 
168
 
188
169
        v = elt.get('timezone')
189
170
        rev.timezone = v and int(v)
 
171
 
190
172
        rev.message = elt.findtext('message') # text of <message>
191
173
        return rev
192
174
 
193
175
 
194
 
    def _unpack_revision_properties(self, elt, rev):
195
 
        """Unpack properties onto a revision."""
196
 
        props_elt = elt.find('properties')
197
 
        assert len(rev.properties) == 0
198
 
        if not props_elt:
199
 
            return
200
 
        for prop_elt in props_elt:
201
 
            assert prop_elt.tag == 'property', \
202
 
                "bad tag under properties list: %r" % p.tag
203
 
            name = prop_elt.get('name')
204
 
            value = prop_elt.text
205
 
            assert name not in rev.properties, \
206
 
                "repeated property %r" % p.name
207
 
            rev.properties[name] = value
208
 
 
209
176
 
210
177
serializer_v5 = Serializer_v5()