← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/__init__.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Benchmark test suite for bzr."""
18
18
 
77
77
        :param link_working: Instead of copying all of the working tree
78
78
            files, just hardlink them to the cached files. Tests can unlink
79
79
            files that they will change.
80
 
        :param link_bzr: Hardlink the .bzr directory. For readonly 
 
80
        :param link_bzr: Hardlink the .bzr directory. For readonly
81
81
            operations this is safe, and shaves off a lot of setup time
82
82
        """
83
83
        from bzrlib.benchmarks.tree_creator.kernel_like import (
104
104
    def make_many_commit_tree(self, directory_name='.',
105
105
                              hardlink=False):
106
106
        """Create a tree with many commits.
107
 
        
108
 
        No file changes are included. Not hardlinking the working tree, 
 
107
 
 
108
        No file changes are included. Not hardlinking the working tree,
109
109
        because there are no working tree files.
110
110
        """
111
111
        from bzrlib.benchmarks.tree_creator.simple_many_commit import (
117
117
    def make_heavily_merged_tree(self, directory_name='.',
118
118
                                 hardlink=False):
119
119
        """Create a tree in which almost every commit is a merge.
120
 
       
121
 
        No file changes are included.  This produces two trees, 
 
120
 
 
121
        No file changes are included.  This produces two trees,
122
122
        one of which is returned.  Except for the first commit, every
123
123
        commit in its revision-history is a merge another commit in the other
124
 
        tree.  Not hardlinking the working tree, because there are no working 
 
124
        tree.  Not hardlinking the working tree, because there are no working
125
125
        tree files.
126
126
        """
127
127
        from bzrlib.benchmarks.tree_creator.heavily_merged import (
190
190
                   'bzrlib.benchmarks.bench_rocks',
191
191
                   'bzrlib.benchmarks.bench_startup',
192
192
                   'bzrlib.benchmarks.bench_status',
 
193
                   'bzrlib.benchmarks.bench_tags',
193
194
                   'bzrlib.benchmarks.bench_transform',
194
195
                   'bzrlib.benchmarks.bench_workingtree',
195
196
                   'bzrlib.benchmarks.bench_sftp',
196
197
                   'bzrlib.benchmarks.bench_xml',
197
198
                   ]
198
 
    suite = TestLoader().loadTestsFromModuleNames(testmod_names) 
 
199
    suite = TestLoader().loadTestsFromModuleNames(testmod_names)
199
200
 
200
201
    # Load any benchmarks from plugins
201
202
    for name, plugin in _mod_plugin.plugins().items():