← 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-07-11 21:41:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080711214124-qi09irlj7pd5cuzg
Shortcut the case when one revision is in the ancestry of the other.

At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.

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,
20
19
    inventory,
21
20
    xml6,
22
21
    xml8,
30
29
    format_num = '5'
31
30
    root_id = inventory.ROOT_ID
32
31
 
33
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None):
 
32
    def _unpack_inventory(self, elt, revision_id):
34
33
        """Construct from XML Element
35
34
        """
36
35
        root_id = elt.get('file_id') or inventory.ROOT_ID
45
44
        if data_revision_id is not None:
46
45
            revision_id = cache_utf8.encode(data_revision_id)
47
46
        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
56
47
        for e in elt:
57
 
            ie = unpack_entry(e, entry_cache=entry_cache)
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
 
48
            ie = self._unpack_entry(e)
 
49
            if ie.parent_id is None:
 
50
                ie.parent_id = root_id
 
51
            inv.add(ie)
75
52
        if revision_id is not None:
76
53
            inv.root.revision = revision_id
77
 
        self._check_cache_size(len(inv), entry_cache)
78
54
        return inv
79
55
 
80
56
    def _check_revisions(self, inv):