/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/tree_creator/kernel_like.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
import os
21
21
 
22
22
from bzrlib import (
23
 
    add,
24
23
    bzrdir,
25
24
    osutils,
26
25
    workingtree,
31
30
 
32
31
 
33
32
class KernelLikeTreeCreator(TreeCreator):
34
 
    """Create a basic tree with ~10k unversioned files""" 
 
33
    """Create a basic tree with ~10k unversioned files"""
35
34
 
36
35
    def __init__(self, test, link_working=False, url=None):
37
36
        super(KernelLikeTreeCreator, self).__init__(test,
97
96
 
98
97
 
99
98
class KernelLikeAddedTreeCreator(TreeCreator):
 
99
    """Create a tree with ~10k versioned but not committed files"""
100
100
 
101
101
    def __init__(self, test, link_working=False, hot_cache=True):
102
102
        super(KernelLikeAddedTreeCreator, self).__init__(test,
118
118
        # Add everything to it
119
119
        tree.lock_write()
120
120
        try:
121
 
            add.smart_add_tree(tree, [root], recurse=True, save=True)
 
121
            tree.smart_add([root], recurse=True, save=True)
122
122
            if in_cache:
123
123
                self._protect_files(root+'/.bzr')
124
124
        finally:
188
188
        finally:
189
189
            f.close()
190
190
 
191
 
    def create(self):
 
191
    def create(self, root=None):
192
192
        """Create a kernel like inventory
193
193
 
 
194
        :param root: Exists to mimic the base class, but this class
 
195
            returns only an in-memory Inventory, so it should always be None.
194
196
        :return: An Inventory object.
195
197
        """
 
198
        assert root is None, "Cannot create a memory inventory in a on disk."
196
199
        cache_dir = self._get_cache_dir()
197
200
        if cache_dir is None:
198
201
            return self._create_and_return()