← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-02 13:07:14 UTC
  • mto: (4524.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4525.
  • Revision ID: v.ladeuil+lp@free.fr-20090702130714-hsyqfusi8vn3a11m
Use tree.has_changes() where appropriate (the test suite caught a
bug in has_changes() (not filtering out the root) in an impressive
number of tests)

* bzrlib/send.py:
(send): Use tree.has_changes() instead of tree.changes_from().

* bzrlib/reconfigure.py:
(Reconfigure._check): Use tree.has_changes() instead of
tree.changes_from().

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.compare_basis): Use
tree.has_changes() instead of tree.changes_from().

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use
tree.has_changes() instead of tree.changes_from().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from bzrlib.xml_serializer import ElementTree, SubElement, Element, Serializer
 
17
from bzrlib.xml_serializer import (
 
18
    Element,
 
19
    ElementTree,
 
20
    SubElement,
 
21
    XMLSerializer,
 
22
    escape_invalid_chars,
 
23
    )
18
24
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
19
25
import bzrlib.inventory as inventory
20
26
from bzrlib.revision import Revision
21
27
from bzrlib.errors import BzrError
22
28
 
23
29
 
24
 
class _Serializer_v4(Serializer):
 
30
class _Serializer_v4(XMLSerializer):
25
31
    """Version 0.0.4 serializer
26
32
 
27
33
    You should use the serializer_v4 singleton.
28
 
    
 
34
 
29
35
    v4 serialisation is no longer supported, only deserialisation.
30
36
    """
31
 
    
 
37
 
32
38
    __slots__ = []
33
 
    
 
39
 
34
40
    def _pack_entry(self, ie):
35
41
        """Convert InventoryEntry to XML element"""
36
42
        e = Element('entry')
120
126
        root.text = '\n'
121
127
 
122
128
        msg = SubElement(root, 'message')
123
 
        msg.text = rev.message
 
129
        msg.text = escape_invalid_chars(rev.message)[0]
124
130
        msg.tail = '\n'
125
131
 
126
132
        if rev.parents:
134
140
                    p.set('revision_sha1', rev.parent_sha1s[i])
135
141
        return root
136
142
 
137
 
    
 
143
 
138
144
    def _unpack_revision(self, elt):
139
145
        """XML Element -> Revision object"""
140
 
        
 
146
 
141
147
        # <changeset> is deprecated...
142
148
        if elt.tag not in ('revision', 'changeset'):
143
149
            raise BzrError("unexpected tag in revision file: %r" % elt)