← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

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:
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, return_from_cache=False):
 
58
                                   entry_cache=None):
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.
76
72
        """
77
73
        try:
78
74
            return self._unpack_inventory(fromstring(xml_string), revision_id,
79
 
                                          entry_cache=entry_cache,
80
 
                                          return_from_cache=return_from_cache)
 
75
                                          entry_cache=entry_cache)
81
76
        except ParseError, e:
82
77
            raise errors.UnexpectedInventoryFormat(e)
83
78
 
84
79
    def read_inventory(self, f, revision_id=None):
85
80
        try:
86
 
            try:
87
 
                return self._unpack_inventory(self._read_element(f),
88
 
                    revision_id=None)
89
 
            finally:
90
 
                f.close()
 
81
            return self._unpack_inventory(self._read_element(f),
 
82
                revision_id=None)
91
83
        except ParseError, e:
92
84
            raise errors.UnexpectedInventoryFormat(e)
93
85