← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/bench_knit.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_knit.py
61
61
 
62
62
    def setup_load_data_c(self):
63
63
        self.requireFeature(CompiledKnitFeature)
64
 
        orig = knit._load_data
65
 
        def reset():
66
 
            knit._load_data = orig
67
 
        self.addCleanup(reset)
68
 
        from bzrlib._knit_load_data_c import _load_data_c
69
 
        knit._load_data = _load_data_c
 
64
        from bzrlib._knit_load_data_pyx import _load_data_c
 
65
        self.overrideAttr(knit, '_load_data', _load_data_c)
70
66
 
71
67
    def setup_load_data_py(self):
72
 
        orig = knit._load_data
73
 
        def reset():
74
 
            knit._load_data = orig
75
 
        self.addCleanup(reset)
76
68
        from bzrlib._knit_load_data_py import _load_data_py
77
 
        knit._load_data = _load_data_py
 
69
        self.overrideAttr(knit, '_load_data', _load_data_py)
78
70
 
79
71
    def test_read_50k_index_c(self):
80
72
        self.setup_load_data_c()