← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml7.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/xml7.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-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
28
28
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
29
29
    format_num = '7'
30
30
 
31
 
    def _unpack_entry(self, elt, entry_cache=None):
 
31
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
32
32
        kind = elt.tag
33
33
        if not kind in self.supported_kinds:
34
34
            raise AssertionError('unsupported entry kind %s' % kind)
41
41
            return inventory.TreeReference(file_id, name, parent_id, revision,
42
42
                                           reference_revision)
43
43
        else:
44
 
            return xml6.Serializer_v6._unpack_entry(self, elt)
 
44
            return xml6.Serializer_v6._unpack_entry(self, elt,
 
45
                entry_cache=entry_cache, return_from_cache=return_from_cache)
45
46
 
46
47
serializer_v7 = Serializer_v7()