/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: John Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

Show diffs side-by-side

added added

removed removed

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