← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: Andrew Bennetts
  • Date: 2009-03-04 07:10:07 UTC
  • mto: (4086.1.2 hpss-integration)
  • mto: This revision was merged to the branch mainline in revision 4087.
  • Revision ID: andrew.bennetts@canonical.com-20090304071007-8iqoi1m44ypmzg2a
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.xml_serializer import (
18
 
    Element,
19
 
    SubElement,
20
 
    XMLSerializer,
21
 
    escape_invalid_chars,
22
 
    )
23
 
from bzrlib.inventory import ROOT_ID, Inventory
 
17
from bzrlib.xml_serializer import ElementTree, SubElement, Element, Serializer
 
18
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
24
19
import bzrlib.inventory as inventory
25
20
from bzrlib.revision import Revision
26
21
from bzrlib.errors import BzrError
27
22
 
28
23
 
29
 
class _Serializer_v4(XMLSerializer):
 
24
class _Serializer_v4(Serializer):
30
25
    """Version 0.0.4 serializer
31
26
 
32
27
    You should use the serializer_v4 singleton.
62
57
        return e
63
58
 
64
59
 
65
 
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
66
 
                          return_from_cache=False):
 
60
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None):
67
61
        """Construct from XML Element
68
62
 
69
63
        :param revision_id: Ignored parameter used by xml5.
71
65
        root_id = elt.get('file_id') or ROOT_ID
72
66
        inv = Inventory(root_id)
73
67
        for e in elt:
74
 
            ie = self._unpack_entry(e, entry_cache=entry_cache,
75
 
                                    return_from_cache=return_from_cache)
 
68
            ie = self._unpack_entry(e, entry_cache=entry_cache)
76
69
            if ie.parent_id == ROOT_ID:
77
70
                ie.parent_id = root_id
78
71
            inv.add(ie)
79
72
        return inv
80
73
 
81
74
 
82
 
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
 
75
    def _unpack_entry(self, elt, entry_cache=None):
83
76
        ## original format inventories don't have a parent_id for
84
77
        ## nodes in the root directory, but it's cleaner to use one
85
78
        ## internally.
127
120
        root.text = '\n'
128
121
 
129
122
        msg = SubElement(root, 'message')
130
 
        msg.text = escape_invalid_chars(rev.message)[0]
 
123
        msg.text = rev.message
131
124
        msg.tail = '\n'
132
125
 
133
126
        if rev.parents: