← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.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/xml4.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-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
16
16
 
17
17
from bzrlib.xml_serializer import (
18
18
    Element,
19
 
    ElementTree,
20
19
    SubElement,
21
20
    XMLSerializer,
22
21
    escape_invalid_chars,
23
22
    )
24
 
from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
 
23
from bzrlib.inventory import ROOT_ID, Inventory
25
24
import bzrlib.inventory as inventory
26
25
from bzrlib.revision import Revision
27
26
from bzrlib.errors import BzrError
63
62
        return e
64
63
 
65
64
 
66
 
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None):
 
65
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
 
66
                          return_from_cache=False):
67
67
        """Construct from XML Element
68
68
 
69
69
        :param revision_id: Ignored parameter used by xml5.
71
71
        root_id = elt.get('file_id') or ROOT_ID
72
72
        inv = Inventory(root_id)
73
73
        for e in elt:
74
 
            ie = self._unpack_entry(e, entry_cache=entry_cache)
 
74
            ie = self._unpack_entry(e, entry_cache=entry_cache,
 
75
                                    return_from_cache=return_from_cache)
75
76
            if ie.parent_id == ROOT_ID:
76
77
                ie.parent_id = root_id
77
78
            inv.add(ie)
78
79
        return inv
79
80
 
80
81
 
81
 
    def _unpack_entry(self, elt, entry_cache=None):
 
82
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
82
83
        ## original format inventories don't have a parent_id for
83
84
        ## nodes in the root directory, but it's cleaner to use one
84
85
        ## internally.