/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/xml_serializer.py

  • Committer: John Arbash Meinel
  • Date: 2009-04-21 23:54:16 UTC
  • mto: (4300.1.7 groupcompress_info)
  • mto: This revision was merged to the branch mainline in revision 4301.
  • Revision ID: john@arbash-meinel.com-20090421235416-f0cz6ilf5cufbugi
https://launchpad.net/bugs/364900
Fix bug #364900, properly remove the 64kB that was just encoded in the copy.
Also, stop supporting None as a copy length in 'encode_copy_instruction'.
It was only used by the test suite, and it is good to pull that sort of thing out of
production code. (Besides, setting the copy to 64kB has the same effect.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.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
23
23
# ElementTree bits
24
24
 
25
25
from bzrlib.serializer import Serializer
26
 
from bzrlib.trace import mutter
 
26
from bzrlib.trace import mutter, warning
27
27
 
28
28
try:
29
29
    try:
52
52
class XMLSerializer(Serializer):
53
53
    """Abstract XML object serialize/deserialize"""
54
54
 
55
 
    squashes_xml_invalid_characters = True
56
 
 
57
55
    def read_inventory_from_string(self, xml_string, revision_id=None,
58
 
                                   entry_cache=None, return_from_cache=False):
 
56
                                   entry_cache=None):
59
57
        """Read xml_string into an inventory object.
60
58
 
61
59
        :param xml_string: The xml to read.
69
67
        :param entry_cache: An optional cache of InventoryEntry objects. If
70
68
            supplied we will look up entries via (file_id, revision_id) which
71
69
            should map to a valid InventoryEntry (File/Directory/etc) object.
72
 
        :param return_from_cache: Return entries directly from the cache,
73
 
            rather than copying them first. This is only safe if the caller
74
 
            promises not to mutate the returned inventory entries, but it can
75
 
            make some operations significantly faster.
76
70
        """
77
71
        try:
78
72
            return self._unpack_inventory(fromstring(xml_string), revision_id,
79
 
                                          entry_cache=entry_cache,
80
 
                                          return_from_cache=return_from_cache)
 
73
                                          entry_cache=entry_cache)
81
74
        except ParseError, e:
82
75
            raise errors.UnexpectedInventoryFormat(e)
83
76
 
179
172
    """Escape the XML-invalid characters in a commit message.
180
173
 
181
174
    :param message: Commit message to escape
182
 
    :return: tuple with escaped message and number of characters escaped
 
175
    :param count: Number of characters that were escaped
183
176
    """
184
 
    if message is None:
185
 
        return None, 0
186
177
    # Python strings can include characters that can't be
187
178
    # represented in well-formed XML; escape characters that
188
179
    # aren't listed in the XML specification