/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: 2018-11-24 15:56:05 UTC
  • mto: This revision was merged to the branch mainline in revision 7214.
  • Revision ID: jelmer@jelmer.uk-20181124155605-g8yh28kpruubzgjk
Remove references to bzrtools.

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 __future__ import absolute_import
 
18
 
 
19
from ...bzr.xml_serializer import (
18
20
    Element,
19
21
    SubElement,
20
22
    XMLSerializer,
21
23
    escape_invalid_chars,
22
24
    )
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
 
25
from ...bzr.inventory import ROOT_ID, Inventory
 
26
from ...bzr import inventory
 
27
from ...revision import Revision
 
28
from ...errors import BzrError
27
29
 
28
30
 
29
31
class _Serializer_v4(XMLSerializer):
40
42
        """Convert InventoryEntry to XML element"""
41
43
        e = Element('entry')
42
44
        e.set('name', ie.name)
43
 
        e.set('file_id', ie.file_id)
 
45
        e.set('file_id', ie.file_id.decode('ascii'))
44
46
        e.set('kind', ie.kind)
45
47
 
46
48
        if ie.text_size is not None:
61
63
 
62
64
        return e
63
65
 
64
 
 
65
66
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
66
67
                          return_from_cache=False):
67
68
        """Construct from XML Element
68
69
 
69
70
        :param revision_id: Ignored parameter used by xml5.
70
71
        """
71
 
        root_id = elt.get('file_id') or ROOT_ID
 
72
        root_id = elt.get('file_id')
 
73
        root_id = (root_id.encode('ascii') if root_id else ROOT_ID)
72
74
        inv = Inventory(root_id)
73
75
        for e in elt:
74
76
            ie = self._unpack_entry(e, entry_cache=entry_cache,
78
80
            inv.add(ie)
79
81
        return inv
80
82
 
81
 
 
82
83
    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.
 
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.
86
87
        parent_id = elt.get('parent_id')
87
 
        if parent_id is None:
88
 
            parent_id = ROOT_ID
 
88
        parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID)
89
89
 
 
90
        file_id = elt.get('file_id').encode('ascii')
90
91
        kind = elt.get('kind')
91
92
        if kind == 'directory':
92
 
            ie = inventory.InventoryDirectory(elt.get('file_id'),
 
93
            ie = inventory.InventoryDirectory(file_id,
93
94
                                              elt.get('name'),
94
95
                                              parent_id)
95
96
        elif kind == 'file':
96
 
            ie = inventory.InventoryFile(elt.get('file_id'),
 
97
            ie = inventory.InventoryFile(file_id,
97
98
                                         elt.get('name'),
98
99
                                         parent_id)
99
100
            ie.text_id = elt.get('text_id')
 
101
            if ie.text_id is not None:
 
102
                ie.text_id = ie.text_id.encode('utf-8')
100
103
            ie.text_sha1 = elt.get('text_sha1')
 
104
            if ie.text_sha1 is not None:
 
105
                ie.text_sha1 = ie.text_sha1.encode('ascii')
101
106
            v = elt.get('text_size')
102
107
            ie.text_size = v and int(v)
103
108
        elif kind == 'symlink':
104
 
            ie = inventory.InventoryLink(elt.get('file_id'),
 
109
            ie = inventory.InventoryLink(file_id,
105
110
                                         elt.get('name'),
106
111
                                         parent_id)
107
112
            ie.symlink_target = elt.get('symlink_target')
112
117
 
113
118
        return ie
114
119
 
115
 
 
116
120
    def _pack_revision(self, rev):
117
121
        """Revision object -> xml tree"""
118
122
        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,
 
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,
124
128
                       )
125
129
        if rev.timezone:
126
130
            root.set('timezone', str(rev.timezone))
141
145
                    p.set('revision_sha1', rev.parent_sha1s[i])
142
146
        return root
143
147
 
144
 
 
145
148
    def _unpack_revision(self, elt):
146
149
        """XML Element -> Revision object"""
147
150
 
149
152
        if elt.tag not in ('revision', 'changeset'):
150
153
            raise BzrError("unexpected tag in revision file: %r" % elt)
151
154
 
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')
 
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')
157
160
                       )
158
161
 
159
162
        precursor = elt.get('precursor')
177
180
        v = elt.get('timezone')
178
181
        rev.timezone = v and int(v)
179
182
 
180
 
        rev.message = elt.findtext('message') # text of <message>
 
183
        rev.message = elt.findtext('message')  # text of <message>
181
184
        return rev
182
185
 
183
186
 
184
 
 
185
 
 
186
187
"""singleton instance"""
187
188
serializer_v4 = _Serializer_v4()
188