← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-03 04:55:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4887.
  • Revision ID: john@arbash-meinel.com-20091203045502-uvhmg6b1yjbzzt8q
Change from being a per-serializer attribute to being a per-repo attribute.
This means we have some churn on *all* of the serializer apis, but it means
we *don't* have churn on all of the repository apis.

It makes it more thread-safe, since serializers are global instances.
Repositories aren't currently thread-safe anyway. (get_record_stream() specifically
is known not to be thread-safe on 2a format repos.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
55
55
    squashes_xml_invalid_characters = True
56
56
 
57
57
    def read_inventory_from_string(self, xml_string, revision_id=None,
58
 
                                   entry_cache=None):
 
58
                                   entry_cache=None, return_from_cache=False):
59
59
        """Read xml_string into an inventory object.
60
60
 
61
61
        :param xml_string: The xml to read.
69
69
        :param entry_cache: An optional cache of InventoryEntry objects. If
70
70
            supplied we will look up entries via (file_id, revision_id) which
71
71
            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.
72
76
        """
73
77
        try:
74
78
            return self._unpack_inventory(fromstring(xml_string), revision_id,
75
 
                                          entry_cache=entry_cache)
 
79
                                          entry_cache=entry_cache,
 
80
                                          return_from_cache=return_from_cache)
76
81
        except ParseError, e:
77
82
            raise errors.UnexpectedInventoryFormat(e)
78
83