/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

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