/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/xml4.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from bzrlib.xml_serializer import (
 
17
from ...bzr.xml_serializer import (
18
18
    Element,
19
19
    SubElement,
20
20
    XMLSerializer,
21
21
    escape_invalid_chars,
22
22
    )
23
 
from bzrlib.inventory import ROOT_ID, Inventory
24
 
import bzrlib.inventory as inventory
25
 
from bzrlib.revision import Revision
26
 
from bzrlib.errors import BzrError
 
23
from ...bzr.inventory import ROOT_ID, Inventory
 
24
from ...bzr import inventory
 
25
from ...revision import Revision
 
26
from ...errors import BzrError
27
27
 
28
28
 
29
29
class _Serializer_v4(XMLSerializer):
40
40
        """Convert InventoryEntry to XML element"""
41
41
        e = Element('entry')
42
42
        e.set('name', ie.name)
43
 
        e.set('file_id', ie.file_id)
 
43
        e.set('file_id', ie.file_id.decode('ascii'))
44
44
        e.set('kind', ie.kind)
45
45
 
46
46
        if ie.text_size is not None:
61
61
 
62
62
        return e
63
63
 
64
 
 
65
64
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
66
65
                          return_from_cache=False):
67
66
        """Construct from XML Element
68
67
 
69
68
        :param revision_id: Ignored parameter used by xml5.
70
69
        """
71
 
        root_id = elt.get('file_id') or ROOT_ID
 
70
        root_id = elt.get('file_id')
 
71
        root_id = (root_id.encode('ascii') if root_id else ROOT_ID)
72
72
        inv = Inventory(root_id)
73
73
        for e in elt:
74
74
            ie = self._unpack_entry(e, entry_cache=entry_cache,
78
78
            inv.add(ie)
79
79
        return inv
80
80
 
81
 
 
82
81
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
83
 
        ## original format inventories don't have a parent_id for
84
 
        ## nodes in the root directory, but it's cleaner to use one
85
 
        ## internally.
 
82
        # original format inventories don't have a parent_id for
 
83
        # nodes in the root directory, but it's cleaner to use one
 
84
        # internally.
86
85
        parent_id = elt.get('parent_id')
87
 
        if parent_id is None:
88
 
            parent_id = ROOT_ID
 
86
        parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID)
89
87
 
 
88
        file_id = elt.get('file_id').encode('ascii')
90
89
        kind = elt.get('kind')
91
90
        if kind == 'directory':
92
 
            ie = inventory.InventoryDirectory(elt.get('file_id'),
 
91
            ie = inventory.InventoryDirectory(file_id,
93
92
                                              elt.get('name'),
94
93
                                              parent_id)
95
94
        elif kind == 'file':
96
 
            ie = inventory.InventoryFile(elt.get('file_id'),
 
95
            ie = inventory.InventoryFile(file_id,
97
96
                                         elt.get('name'),
98
97
                                         parent_id)
99
98
            ie.text_id = elt.get('text_id')
 
99
            if ie.text_id is not None:
 
100
                ie.text_id = ie.text_id.encode('utf-8')
100
101
            ie.text_sha1 = elt.get('text_sha1')
 
102
            if ie.text_sha1 is not None:
 
103
                ie.text_sha1 = ie.text_sha1.encode('ascii')
101
104
            v = elt.get('text_size')
102
105
            ie.text_size = v and int(v)
103
106
        elif kind == 'symlink':
104
 
            ie = inventory.InventoryLink(elt.get('file_id'),
 
107
            ie = inventory.InventoryLink(file_id,
105
108
                                         elt.get('name'),
106
109
                                         parent_id)
107
110
            ie.symlink_target = elt.get('symlink_target')
112
115
 
113
116
        return ie
114
117
 
115
 
 
116
118
    def _pack_revision(self, rev):
117
119
        """Revision object -> xml tree"""
118
120
        root = Element('revision',
119
 
                       committer = rev.committer,
120
 
                       timestamp = '%.9f' % rev.timestamp,
121
 
                       revision_id = rev.revision_id,
122
 
                       inventory_id = rev.inventory_id,
123
 
                       inventory_sha1 = rev.inventory_sha1,
 
121
                       committer=rev.committer,
 
122
                       timestamp='%.9f' % rev.timestamp,
 
123
                       revision_id=rev.revision_id,
 
124
                       inventory_id=rev.inventory_id,
 
125
                       inventory_sha1=rev.inventory_sha1,
124
126
                       )
125
127
        if rev.timezone:
126
128
            root.set('timezone', str(rev.timezone))
141
143
                    p.set('revision_sha1', rev.parent_sha1s[i])
142
144
        return root
143
145
 
 
146
    def write_revision_to_string(self, rev):
 
147
        return tostring(self._pack_revision(rev)) + b'\n'
 
148
 
 
149
    def _write_element(self, elt, f):
 
150
        ElementTree(elt).write(f, 'utf-8')
 
151
        f.write(b'\n')
144
152
 
145
153
    def _unpack_revision(self, elt):
146
154
        """XML Element -> Revision object"""
149
157
        if elt.tag not in ('revision', 'changeset'):
150
158
            raise BzrError("unexpected tag in revision file: %r" % elt)
151
159
 
152
 
        rev = Revision(committer = elt.get('committer'),
153
 
                       timestamp = float(elt.get('timestamp')),
154
 
                       revision_id = elt.get('revision_id'),
155
 
                       inventory_id = elt.get('inventory_id'),
156
 
                       inventory_sha1 = elt.get('inventory_sha1')
 
160
        rev = Revision(committer=elt.get('committer'),
 
161
                       timestamp=float(elt.get('timestamp')),
 
162
                       revision_id=elt.get('revision_id'),
 
163
                       inventory_id=elt.get('inventory_id'),
 
164
                       inventory_sha1=elt.get('inventory_sha1')
157
165
                       )
158
166
 
159
167
        precursor = elt.get('precursor')
177
185
        v = elt.get('timezone')
178
186
        rev.timezone = v and int(v)
179
187
 
180
 
        rev.message = elt.findtext('message') # text of <message>
 
188
        rev.message = elt.findtext('message')  # text of <message>
181
189
        return rev
182
190
 
183
191
 
184
 
 
185
 
 
186
192
"""singleton instance"""
187
193
serializer_v4 = _Serializer_v4()
188