← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: John Arbash Meinel
  • Date: 2008-12-10 18:29:35 UTC
  • mto: This revision was merged to the branch mainline in revision 3912.
  • Revision ID: john@arbash-meinel.com-20081210182935-dejc81qksqka717d
Do Inventory.add() optimizations, and determine 'best' results.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
16
16
 
17
17
from bzrlib import (
18
18
    cache_utf8,
 
19
    errors,
19
20
    inventory,
20
21
    xml6,
21
22
    xml8,
44
45
        if data_revision_id is not None:
45
46
            revision_id = cache_utf8.encode(data_revision_id)
46
47
        inv = inventory.Inventory(root_id, revision_id=revision_id)
 
48
        # Optimizations tested
 
49
        #   baseline w/entry cache  2.85s
 
50
        #   using inv._byid         2.55s
 
51
        #   avoiding attributes     2.46s
 
52
        #   adding assertions       2.50s
 
53
        #   last_parent cache       2.52s (worse, removed)
 
54
        unpack_entry = self._unpack_entry
 
55
        byid = inv._byid
47
56
        for e in elt:
48
 
            ie = self._unpack_entry(e)
49
 
            if ie.parent_id is None:
50
 
                ie.parent_id = root_id
51
 
            inv.add(ie)
 
57
            ie = unpack_entry(e)
 
58
            parent_id = ie.parent_id
 
59
            if parent_id is None:
 
60
                ie.parent_id = parent_id = root_id
 
61
            try:
 
62
                parent = byid[parent_id]
 
63
            except KeyError:
 
64
                raise errors.BzrError("parent_id {%s} not in inventory"
 
65
                                      % (parent_id,))
 
66
            if ie.file_id in byid:
 
67
                raise errors.DuplicateFileId(ie.file_id,
 
68
                                             byid[ie.file_id])
 
69
            if ie.name in parent.children:
 
70
                raise errors.BzrError("%s is already versioned"
 
71
                    % (osutils.pathjoin(inv.id2path(parent_id),
 
72
                       ie.name).encode('utf-8'),))
 
73
            parent.children[ie.name] = ie
 
74
            byid[ie.file_id] = ie
52
75
        if revision_id is not None:
53
76
            inv.root.revision = revision_id
54
77
        return inv