/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/weave_fmt/xml4.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/xml4.py
63
63
 
64
64
        return e
65
65
 
66
 
 
67
66
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
68
67
                          return_from_cache=False):
69
68
        """Construct from XML Element
81
80
            inv.add(ie)
82
81
        return inv
83
82
 
84
 
 
85
83
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
86
 
        ## original format inventories don't have a parent_id for
87
 
        ## nodes in the root directory, but it's cleaner to use one
88
 
        ## internally.
 
84
        # original format inventories don't have a parent_id for
 
85
        # nodes in the root directory, but it's cleaner to use one
 
86
        # internally.
89
87
        parent_id = elt.get('parent_id')
90
88
        parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID)
91
89
 
119
117
 
120
118
        return ie
121
119
 
122
 
 
123
120
    def _pack_revision(self, rev):
124
121
        """Revision object -> xml tree"""
125
122
        root = Element('revision',
126
 
                       committer = rev.committer,
127
 
                       timestamp = '%.9f' % rev.timestamp,
128
 
                       revision_id = rev.revision_id,
129
 
                       inventory_id = rev.inventory_id,
130
 
                       inventory_sha1 = rev.inventory_sha1,
 
123
                       committer=rev.committer,
 
124
                       timestamp='%.9f' % rev.timestamp,
 
125
                       revision_id=rev.revision_id,
 
126
                       inventory_id=rev.inventory_id,
 
127
                       inventory_sha1=rev.inventory_sha1,
131
128
                       )
132
129
        if rev.timezone:
133
130
            root.set('timezone', str(rev.timezone))
148
145
                    p.set('revision_sha1', rev.parent_sha1s[i])
149
146
        return root
150
147
 
151
 
 
152
148
    def _unpack_revision(self, elt):
153
149
        """XML Element -> Revision object"""
154
150
 
156
152
        if elt.tag not in ('revision', 'changeset'):
157
153
            raise BzrError("unexpected tag in revision file: %r" % elt)
158
154
 
159
 
        rev = Revision(committer = elt.get('committer'),
160
 
                       timestamp = float(elt.get('timestamp')),
161
 
                       revision_id = elt.get('revision_id'),
162
 
                       inventory_id = elt.get('inventory_id'),
163
 
                       inventory_sha1 = elt.get('inventory_sha1')
 
155
        rev = Revision(committer=elt.get('committer'),
 
156
                       timestamp=float(elt.get('timestamp')),
 
157
                       revision_id=elt.get('revision_id'),
 
158
                       inventory_id=elt.get('inventory_id'),
 
159
                       inventory_sha1=elt.get('inventory_sha1')
164
160
                       )
165
161
 
166
162
        precursor = elt.get('precursor')
184
180
        v = elt.get('timezone')
185
181
        rev.timezone = v and int(v)
186
182
 
187
 
        rev.message = elt.findtext('message') # text of <message>
 
183
        rev.message = elt.findtext('message')  # text of <message>
188
184
        return rev
189
185
 
190
186
 
191
 
 
192
 
 
193
187
"""singleton instance"""
194
188
serializer_v4 = _Serializer_v4()
195