/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: Canonical.com Patch Queue Manager
  • Date: 2010-04-28 09:40:23 UTC
  • mfrom: (5155.1.5 320119-exclude-ancestry)
  • Revision ID: pqm@pqm.ubuntu.com-20100428094023-7504mlou1qk28r9n
(vila) Add --exclude-common-ancestry log option (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
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:
83
83
 
84
84
    def read_inventory(self, f, revision_id=None):
85
85
        try:
86
 
            try:
87
 
                return self._unpack_inventory(self._read_element(f),
88
 
                    revision_id=None)
89
 
            finally:
90
 
                f.close()
 
86
            return self._unpack_inventory(self._read_element(f),
 
87
                revision_id=None)
91
88
        except ParseError, e:
92
89
            raise errors.UnexpectedInventoryFormat(e)
93
90