← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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
30
30
    format_num = '5'
31
31
    root_id = inventory.ROOT_ID
32
32
 
33
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None):
 
33
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
 
34
                          return_from_cache=False):
34
35
        """Construct from XML Element
35
36
        """
36
37
        root_id = elt.get('file_id') or inventory.ROOT_ID
39
40
        format = elt.get('format')
40
41
        if format is not None:
41
42
            if format != '5':
42
 
                raise BzrError("invalid format version %r on inventory"
43
 
                                % format)
 
43
                raise errors.BzrError("invalid format version %r on inventory"
 
44
                                      % format)
44
45
        data_revision_id = elt.get('revision_id')
45
46
        if data_revision_id is not None:
46
47
            revision_id = cache_utf8.encode(data_revision_id)
54
55
        unpack_entry = self._unpack_entry
55
56
        byid = inv._byid
56
57
        for e in elt:
57
 
            ie = unpack_entry(e, entry_cache=entry_cache)
 
58
            ie = unpack_entry(e, entry_cache=entry_cache,
 
59
                              return_from_cache=return_from_cache)
58
60
            parent_id = ie.parent_id
59
61
            if parent_id is None:
60
62
                ie.parent_id = parent_id = root_id