← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml8.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/xml8.py
371
371
            prop_elt.tail = '\n'
372
372
        top_elt.tail = '\n'
373
373
 
374
 
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None):
 
374
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
 
375
                          return_from_cache=False):
375
376
        """Construct from XML Element"""
376
377
        if elt.tag != 'inventory':
377
378
            raise errors.UnexpectedInventoryFormat('Root tag is %r' % elt.tag)
384
385
            revision_id = cache_utf8.encode(revision_id)
385
386
        inv = inventory.Inventory(root_id=None, revision_id=revision_id)
386
387
        for e in elt:
387
 
            ie = self._unpack_entry(e, entry_cache=entry_cache)
 
388
            ie = self._unpack_entry(e, entry_cache=entry_cache,
 
389
                                    return_from_cache=return_from_cache)
388
390
            inv.add(ie)
389
391
        self._check_cache_size(len(inv), entry_cache)
390
392
        return inv
391
393
 
392
 
    def _unpack_entry(self, elt, entry_cache=None):
 
394
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
393
395
        elt_get = elt.get
394
396
        file_id = elt_get('file_id')
395
397
        revision = elt_get('revision')
433
435
                pass
434
436
            else:
435
437
                # Only copying directory entries drops us 2.85s => 2.35s
436
 
                if self.safe_to_use_cache_items:
 
438
                if return_from_cache:
437
439
                    if cached_ie.kind == 'directory':
438
440
                        return cached_ie.copy()
439
441
                    return cached_ie