← 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: 2009-12-03 04:55:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4887.
  • Revision ID: john@arbash-meinel.com-20091203045502-uvhmg6b1yjbzzt8q
Change from being a per-serializer attribute to being a per-repo attribute.
This means we have some churn on *all* of the serializer apis, but it means
we *don't* have churn on all of the repository apis.

It makes it more thread-safe, since serializers are global instances.
Repositories aren't currently thread-safe anyway. (get_record_stream() specifically
is known not to be thread-safe on 2a format repos.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
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
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