/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 bzrlib/xml4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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 __future__ import absolute_import
18
 
 
19
 
from ...bzr.xml_serializer import (
 
17
from bzrlib.xml_serializer import (
20
18
    Element,
 
19
    ElementTree,
21
20
    SubElement,
22
21
    XMLSerializer,
23
22
    escape_invalid_chars,
24
23
    )
25
 
from ...bzr.inventory import ROOT_ID, Inventory
26
 
from ...bzr import inventory
27
 
from ...revision import Revision
28
 
from ...errors import BzrError
 
24
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
 
25
import bzrlib.inventory as inventory
 
26
from bzrlib.revision import Revision
 
27
from bzrlib.errors import BzrError
29
28
 
30
29
 
31
30
class _Serializer_v4(XMLSerializer):
42
41
        """Convert InventoryEntry to XML element"""
43
42
        e = Element('entry')
44
43
        e.set('name', ie.name)
45
 
        e.set('file_id', ie.file_id.decode('ascii'))
 
44
        e.set('file_id', ie.file_id)
46
45
        e.set('kind', ie.kind)
47
46
 
48
47
        if ie.text_size is not None:
63
62
 
64
63
        return e
65
64
 
 
65
 
66
66
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
67
67
                          return_from_cache=False):
68
68
        """Construct from XML Element
69
69
 
70
70
        :param revision_id: Ignored parameter used by xml5.
71
71
        """
72
 
        root_id = elt.get('file_id')
73
 
        root_id = (root_id.encode('ascii') if root_id else ROOT_ID)
 
72
        root_id = elt.get('file_id') or ROOT_ID
74
73
        inv = Inventory(root_id)
75
74
        for e in elt:
76
75
            ie = self._unpack_entry(e, entry_cache=entry_cache,
80
79
            inv.add(ie)
81
80
        return inv
82
81
 
 
82
 
83
83
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
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.
 
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.
87
87
        parent_id = elt.get('parent_id')
88
 
        parent_id = (parent_id.encode('ascii') if parent_id else ROOT_ID)
 
88
        if parent_id is None:
 
89
            parent_id = ROOT_ID
89
90
 
90
 
        file_id = elt.get('file_id').encode('ascii')
91
91
        kind = elt.get('kind')
92
92
        if kind == 'directory':
93
 
            ie = inventory.InventoryDirectory(file_id,
 
93
            ie = inventory.InventoryDirectory(elt.get('file_id'),
94
94
                                              elt.get('name'),
95
95
                                              parent_id)
96
96
        elif kind == 'file':
97
 
            ie = inventory.InventoryFile(file_id,
 
97
            ie = inventory.InventoryFile(elt.get('file_id'),
98
98
                                         elt.get('name'),
99
99
                                         parent_id)
100
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')
103
101
            ie.text_sha1 = elt.get('text_sha1')
104
 
            if ie.text_sha1 is not None:
105
 
                ie.text_sha1 = ie.text_sha1.encode('ascii')
106
102
            v = elt.get('text_size')
107
103
            ie.text_size = v and int(v)
108
104
        elif kind == 'symlink':
109
 
            ie = inventory.InventoryLink(file_id,
 
105
            ie = inventory.InventoryLink(elt.get('file_id'),
110
106
                                         elt.get('name'),
111
107
                                         parent_id)
112
108
            ie.symlink_target = elt.get('symlink_target')
117
113
 
118
114
        return ie
119
115
 
 
116
 
120
117
    def _pack_revision(self, rev):
121
118
        """Revision object -> xml tree"""
122
119
        root = Element('revision',
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,
 
120
                       committer = rev.committer,
 
121
                       timestamp = '%.9f' % rev.timestamp,
 
122
                       revision_id = rev.revision_id,
 
123
                       inventory_id = rev.inventory_id,
 
124
                       inventory_sha1 = rev.inventory_sha1,
128
125
                       )
129
126
        if rev.timezone:
130
127
            root.set('timezone', str(rev.timezone))
145
142
                    p.set('revision_sha1', rev.parent_sha1s[i])
146
143
        return root
147
144
 
148
 
    def write_revision_to_string(self, rev):
149
 
        return tostring(self._pack_revision(rev)) + b'\n'
150
 
 
151
 
    def _write_element(self, elt, f):
152
 
        ElementTree(elt).write(f, 'utf-8')
153
 
        f.write(b'\n')
154
145
 
155
146
    def _unpack_revision(self, elt):
156
147
        """XML Element -> Revision object"""
159
150
        if elt.tag not in ('revision', 'changeset'):
160
151
            raise BzrError("unexpected tag in revision file: %r" % elt)
161
152
 
162
 
        rev = Revision(committer=elt.get('committer'),
163
 
                       timestamp=float(elt.get('timestamp')),
164
 
                       revision_id=elt.get('revision_id'),
165
 
                       inventory_id=elt.get('inventory_id'),
166
 
                       inventory_sha1=elt.get('inventory_sha1')
 
153
        rev = Revision(committer = elt.get('committer'),
 
154
                       timestamp = float(elt.get('timestamp')),
 
155
                       revision_id = elt.get('revision_id'),
 
156
                       inventory_id = elt.get('inventory_id'),
 
157
                       inventory_sha1 = elt.get('inventory_sha1')
167
158
                       )
168
159
 
169
160
        precursor = elt.get('precursor')
187
178
        v = elt.get('timezone')
188
179
        rev.timezone = v and int(v)
189
180
 
190
 
        rev.message = elt.findtext('message')  # text of <message>
 
181
        rev.message = elt.findtext('message') # text of <message>
191
182
        return rev
192
183
 
193
184
 
 
185
 
 
186
 
194
187
"""singleton instance"""
195
188
serializer_v4 = _Serializer_v4()
 
189