Merge lp:~spiv/bzr-usertest/network-suite into lp:~bzr/bzr-usertest/trunk-old

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

This adds the most interesting cases from http://bazaar-vcs.org/SmartPushAnalysis1.4 to script_network.py.

[lp:~spiv/bzr-usertest/network-suite]

124. By Andrew Bennetts on 2008-11-03

Fix thinko.

[Martin Pool (mbp)]

 class AnotherBranchTask(ScriptTask):

+ def __init__(self, branch_name='-anotherBranch'):
+ self._branch_name = branch_name
+ super(AnotherBranchTask, self).__init__()
+
+ def id(self):
+ return super(AnotherBranchTask, self).id() + self._branch_name
+
+ def name(self):
+ return super(AnotherBranchTask, self).name() + self._branch_name
+
     def load(self):
         self.compile_default("""
             cd ..
- $tool clone $repo_read_url/trunk ${work_basename}-anotherBranch
- cd ${work_basename}-anotherBranch
- """)
- # Go up an extra level for Bazaar to get outside the shared repo
- self.compile_for_tools([TOOL_BZR], """
- cd ..
- cd ..
- $tool clone $repo_read_url/trunk ${work_basename}-anotherBranch
- cd ${work_basename}-anotherBranch
- """)
+ $tool clone $repo_read_url/trunk ${work_basename}%(branch_name)s
+ cd ${work_basename}%(branch_name)s
+ """ % {'branch_name': self._branch_name})

So it looks like you're doing variable substitution into this string through both ${} and %()s. That's not necessarily wrong and it seems syntactically valid, but I do wonder if it's good style. Is there a reason you can't feed the branch name in through the same mechanism that the rest of usertest apparently uses?

review: Needs Fixing (none)

[Andrew Bennetts (spiv)]

Martin Pool wrote:
> def load(self):
[...]
> + $tool clone $repo_read_url/trunk ${work_basename}%(branch_name)s
> + cd ${work_basename}%(branch_name)s
> + """ % {'branch_name': self._branch_name})
>
> So it looks like you're doing variable substitution into this string through both ${} and %()s. That's not necessarily wrong and it seems syntactically valid, but I do wonder if it's good style. Is there a reason you can't feed the branch name in through the same mechanism that the rest of usertest apparently uses?

Yes, they need to happen at different times.

I want to paramaterise branch_name when creating the script, so that I can reuse
this script snippet multiple times in the overall script built by the
script_suite function.

usertest then takes that complete script suite and runs it once for each tool
(and possibly repeats if it has been instructed to do so). work_basename needs
to vary by run.

I could use string.Template for my per-script substitution instead of the %
operator, like per-run substitution, but I think that the double-escaping of
${work_basename} that would require would be no better, and more verbose.

[Martin Pool (mbp)]

On Mon, Nov 3, 2008 at 4:33 PM, Andrew Bennetts
<email address hidden> wrote:
> Martin Pool wrote:
>> def load(self):
> [...]
>> + $tool clone $repo_read_url/trunk ${work_basename}%(branch_name)s
>> + cd ${work_basename}%(branch_name)s
>> + """ % {'branch_name': self._branch_name})
>>
>> So it looks like you're doing variable substitution into this string through both ${} and %()s. That's not necessarily wrong and it seems syntactically valid, but I do wonder if it's good style. Is there a reason you can't feed the branch name in through the same mechanism that the rest of usertest apparently uses?
>
> Yes, they need to happen at different times. [snip]

OK, maybe a comment here would be worthwhile?

--
Martin <http://launchpad.net/~mbp/>

[Jelmer Vernooij (jelmer)]

Is this still in progress?

[lp:~spiv/bzr-usertest/network-suite]

125. By Andrew Bennetts on 2011-02-08

Merge trunk.

126. By Andrew Bennetts on 2011-02-15

Remove a touch of duplication.

127. By Andrew Bennetts on 2011-02-16

Merge fix-tests.

128. By Andrew Bennetts on 2011-02-16

Fix handling config var substitution for network suite.

Unmerged revisions

128. By Andrew Bennetts on 2011-02-16

Fix handling config var substitution for network suite.

127. By Andrew Bennetts on 2011-02-16

Merge fix-tests.

126. By Andrew Bennetts on 2011-02-15

Remove a touch of duplication.

125. By Andrew Bennetts on 2011-02-08

Merge trunk.

124. By Andrew Bennetts on 2008-11-03

Fix thinko.

123. By Andrew Bennetts on 2008-10-15

Extend script_network to cover the significant cases from http://bazaar-vcs.org/SmartPushAnalysis1.4

=== modified file '__init__.py'
--- __init__.py	2009-03-27 06:17:04 +0000
+++ __init__.py	2011-02-16 06:18:13 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -295,6 +295,7 @@
         user_params = params_dict
         if config_file is None:
             per_tree_params = None
+            dynamic_user_params = None
         else:
             config = ConfigParser.SafeConfigParser()
             try:
@@ -304,6 +305,7 @@
                 return 1
             config.readfp(cfg_fp)
             user_params.update(dict(config.items('DEFAULT')))
+            dynamic_user_params = dict(config.items('DYNAMIC'))
             per_tree_params = {}
             for tree in trees_list:
                 basename = os.path.basename(tree)
@@ -350,8 +352,8 @@
                 measures_list, data_file, dry_run=dry_run,
                 keep_dirs=keep_dirs, verbose=verbose, profiler=prof,
                 prof_out_template=prof_out_template,
-                dynamic_params=user_params, per_tree_params=per_tree_params,
-                strict=strict, url=url)
+                user_params=user_params, per_tree_params=per_tree_params,
+                dynamic_user_params=dynamic_user_params, strict=strict, url=url)
         finally:
             data_file.close()
         return result
@@ -369,13 +371,20 @@
     trees = dict(config.items('DEFAULT'))
     default_tree = trees.get("default")
     relpath = trees.get(tool_name, default_tree)
+    if relpath is None:
+        raise errors.BzrCommandError(
+            "no archive defined for tool '%s' in lookup file '%s'"
+            % (tool_name,ini_file))
     tree_path = osutils.pathjoin(basepath, relpath)
     tool_params = {}
     for sect in config.sections():
         if not sect.startswith("parameter:"):
             continue
         param_name = sect[len('parameter:'):].strip()
-        tool_params[param_name] = config.get(sect, tool_name)
+        try:
+            tool_params[param_name] = config.get(sect, tool_name)
+        except ConfigParser.NoOptionError:
+            tool_params[param_name] = config.get(sect, 'default')
     cfg_fp.close()
     return tree_path, tool_params
 
@@ -418,9 +427,14 @@
 class cmd_usertestcompare(Command):
     """Generate a comparison report on csv data produced by userteststats.
     
-    The CSV files must have names of the form $tool-$suite-$scenario.csv
-    (where the components do not contain dashes) and the suite name corresponds
-    to the usertest suite used to generate the data, e.g. "common" or "log".
+    The CSV files must have names of the form $tool-$suite-$scenario.csv:
+
+    * $tool is the name of the tool used in the run, like "bzr-1.12".  It 
+      may optionally have a version, separated by a dash.
+    * $suite is the usertest suite used to generate the data, e.g. "common"
+      or "log"; it must not contain a dash.
+    * $scenario is an arbitrary name for the scenario being tested, again 
+      containing no dashes.
     """
     hidden = True
     takes_args = ['csv_files+']

=== modified file 'archiveutil.py'
--- archiveutil.py	2009-04-02 12:10:24 +0000
+++ archiveutil.py	2011-02-16 06:18:13 +0000
@@ -81,7 +81,7 @@
         # need to specially construct a root and ensure all files go in there.
         members.sort()
         if not members[0].isdir():
-            root_dir == ''
+            root_dir = ''
             shared_root = False
         else:
             root_dir = members[0].name

=== modified file 'compare.py'
--- compare.py	2009-04-02 13:42:24 +0000
+++ compare.py	2011-02-16 06:18:13 +0000
@@ -78,11 +78,7 @@
 
     # Collect the additional info for the report: headings, etc.
     hdgs = order * column_count
-    # If we're comparing different tools (e.g. bzr vs hg), then it might be
-    # better to make the descriptions show both commands. For now, assume
-    # we're mostly benching one bzr release vs another so just the first
-    # tool is good enough.
-    action_descriptions = get_action_descriptions(suite, tools[0], labels)
+    action_descriptions = get_action_descriptions(suite, tools, labels)
 
     # Build the cross-file report
     if html:
@@ -108,24 +104,43 @@
     return result
 
 
-def get_action_descriptions(suite_name, tool, labels):
+def get_action_descriptions(suite_name, tools, labels):
     """Get the dictionary of action descriptions indexed by labels for a suite."""
     suite = suiterunner.get_suite_by_name(suite_name)
-    essential_params = {}
     descriptions = {}
     for script in suite.iter_scripts():
         script_id = script.name()
         if script_id .endswith("Task"):
             script_id = script_id[:-4]
-        real_tool = usertool.get_tool_by_fuzzy_name(tool)[0].name
-        cmds_by_labels = script.get_commands_by_label(real_tool,
-            essential_params)
+        cmds_by_labels = _get_cmds_for_labels(script, tools)
         for label in cmds_by_labels:
             compound_name = "%s:%s" % (script_id,label)
             descriptions[compound_name] = cmds_by_labels[label]
     return descriptions
 
 
+def _get_cmds_for_labels(script, tools):
+    result = {}
+    # Collect the cmds as lists indexed by labels
+    for tool in tools:
+        essential_params = {}
+        real_tool = usertool.get_tool_by_fuzzy_name(tool)[0].name
+        cmds = script.get_commands_by_label(real_tool, essential_params)
+        for label, cmd in cmds.items():
+            if label in result:
+                result[label].append(cmd)
+            else:
+                result[label] = [cmd]
+
+    # Now collapse the lists we can
+    for label, cmds in result.items():
+        # Split out the parameters from the command name
+        params = set([cmd.split(" ", 1)[-1] for cmd in cmds])
+        if len(params) == 1:
+            result[label] = "$tool %s" % (params.pop(),)
+    return result
+
+
 class ReportFormatter(object):
 
     def format(self, hdgs, labels, data, projects, action_descriptions):
@@ -165,6 +180,8 @@
             if c.find('.') != -1:
                 c = "%.1f" % float(c)
             s += c.rjust(10)
+        if isinstance(desc, list):
+            desc = "; ".join(desc)
         s += "    %s" % desc
         return s
 
@@ -190,7 +207,7 @@
         return "<tr>" + s + "</tr>"
 
     def _columns(self, label, cols, desc, columns_per_project):
-        s = '<td align="left">%s</td>' % label
+        s = '<td align="left" valign="top">%s</td>' % label
         for i, c in enumerate(cols):
             if i % columns_per_project == 0:
                 first = None
@@ -201,21 +218,26 @@
                 c = "%.1f" % value
                 if first is None:
                     first = value
-                elif abs(value - first) < 0.1:
+                elif abs(value - first) < 0.15:
                     # difference too small to highlight
                     pass
-                elif value > first * 1.05:
-                    colour = "red"
-                elif value > first:
-                    colour = "yellow"
+                elif value > first * 2.00:
+                    colour = "OrangeRed"
+                elif value > first * 1.33:
+                    colour = "Orange"
+                elif value > first * 1.06:
+                    colour = "Yellow"
                 elif value < first * 0.50:
                     colour = "Cyan"
                 elif value < first * 0.75:
                     colour = "SkyBlue"
                 elif value < first * 0.95:
                     colour = "LightGreen"
-            s += '<td align="right" bgcolor="%s">%s</td>' % (colour, c)
+            s += '<td align="right" valign="top" bgcolor="%s">%s</td>' % \
+                (colour, c)
         if desc is not None:
+            if isinstance(desc, list):
+                desc = "<br>".join(desc)
             s += '<td>&nbsp;</td><td align="left">%s</td>' % desc
         return "<tr>" + s + "</tr>"
 
@@ -226,19 +248,20 @@
         print "<html>\n<body>"
         print "<table>"
         print self._heading_columns("Projects:", project_hdgs, "")
-        print self._heading_columns("Action", hdgs, "Description")
+        print self._heading_columns("Action", hdgs, "Commands")
         for label in labels:
             desc = action_descriptions.get(label, "")
             print self._columns(label, data[label], desc, columns_per_project)
         print "</table>"
         print "<p></p>"
         print "<table>"
-        print "<th>Legend:</th>%s%s%s%s%s</tr>" % (
-            '<td bgcolor="red">slower &gt; 5%</td>',
-            '<td bgcolor="yellow">slower</td>',
-            '<td bgcolor="LightGreen">faster &gt; 5%</td>',
-            '<td bgcolor="SkyBlue">faster &gt; 25%</td>',
-            '<td bgcolor="Cyan">faster &gt; 50%</td>',
+        print "<th>Legend:</th>%s%s%s%s%s%s</tr>" % (
+            '<td bgcolor="OrangeRed">worse &gt; 2x</td>',
+            '<td bgcolor="Orange">worse &gt; 1.33x</td>',
+            '<td bgcolor="Yellow">worse &gt; 1.06x</td>',
+            '<td bgcolor="LightGreen">better &gt; 5%</td>',
+            '<td bgcolor="SkyBlue">better &gt; 25%</td>',
+            '<td bgcolor="Cyan">better &gt; 50%</td>',
             )
         print "</table>"
         print "</body>\n</html>"

=== modified file 'datadump.py'
--- datadump.py	2008-02-29 03:33:24 +0000
+++ datadump.py	2011-02-16 06:18:13 +0000
@@ -75,7 +75,7 @@
     file_writer = csv.writer(data_file)
     # Dump a header
     time_str = time.asctime()
-    file_count = unpack_stats.get('file_count', '??')
+    file_count = unpack_stats.get('other_count', '??')
     header = "suite %s on tree %s at %s (%s files)" % \
         (suite, tree, time_str, file_count)
     data_file.write("--run %d: %s\n" % (run_id,header))
@@ -85,6 +85,8 @@
     _nice_time_report(stdout, csv_data)
     # Collect and report the disk space used by each tool
     disk_usage_dict = _get_disk_usage_of_subdirs(work_root)
+    disk_usage_dict[':control-directory:'] = unpack_stats['control_size']
+    disk_usage_dict[':working-tree:'] = unpack_stats['other_size']
     disk_usage_data = _dict_to_csv(disk_usage_dict, "Directory", "MB",
         value_formatter=_disk_size_as_str)
     if disk_usage_data is not None:
@@ -192,7 +194,11 @@
     stdout.write("%s\t%s\t%s\n" % ("Old:New", "MB", "Directory"))
     for key in keys:
         new_size = disk_usage_dict[key]
-        ratio = new_size * 1.0 / baseline_dir_size
+        if key[0] == ':' and key[-1] == ':':
+            # special statistic
+            ratio = 0
+        else:
+            ratio = new_size * 1.0 / baseline_dir_size
         size_in_mbytes = _disk_size_as_str(new_size)
         stdout.write("%.3f\t%s\t%s\n" % (ratio,size_in_mbytes,key))
 

=== modified file 'dirutil.py'
--- dirutil.py	2009-02-23 03:46:54 +0000
+++ dirutil.py	2011-02-16 06:18:13 +0000
@@ -64,6 +64,13 @@
             error("%d problems removing %s - manual clean-up may be required" %
               (_cleanup_error_count,path))
 
+def dir_count(start):
+    """Get the number of files in a directory tree."""
+    total = 0L
+    for root, dirs, files in os.walk(start):
+        total += len(dirs) + len(files)
+    return total
+
 
 def dir_used_size(start):
     "Get bytes used by files in a directory."

=== added file 'scripts/script_commit.py'
--- scripts/script_commit.py	1970-01-01 00:00:00 +0000
+++ scripts/script_commit.py	2011-02-16 06:18:13 +0000
@@ -0,0 +1,34 @@
+# Copyright (C) 2007, 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Script covering commit operations in Bazaar."""
+
+from bzrlib.plugins.usertest.userscript import ScriptTask, ScriptSuite
+import script_common
+
+
+## Suite ##
+
+def script_suite():
+
+    suite = ScriptSuite()
+    # Setup
+    suite.add(script_common.SetupSuite())
+    # Work
+    suite.add(script_common.AddTask())
+    suite.add(script_common.ChangeTask())
+    suite.add(script_common.ChangeFileTask())
+    return suite

=== modified file 'scripts/script_common.py'
--- scripts/script_common.py	2009-03-25 23:59:10 +0000
+++ scripts/script_common.py	2011-02-16 06:18:13 +0000
@@ -24,6 +24,12 @@
 
 * 'additional' tasks are ones that other VCS tools might support
   but we're only interested in their speed on Bazaar.
+
+The following variables need to be set before calling this script:
+
+ * file - the file to use for file-specific logging
+
+This variable is used in the log, annotate and cat tasks.
 """
 
 from bzrlib.plugins.usertest.userscript import ScriptTask, ScriptSuite
@@ -72,6 +78,10 @@
     once_only = True
 
     def load(self):
+        # To trigger this, run a script called bzr-current
+        self.compile_for_versions(TOOL_BZR, "current", """
+            $tool upgrade --1.9
+            """)
         # To trigger this, run a script called bzr-btree
         self.compile_for_versions(TOOL_BZR, "btree", """
             $tool upgrade --1.9
@@ -80,29 +90,9 @@
         self.compile_for_versions(TOOL_BZR, "development", """
             $tool upgrade --development
             """)
-        # To trigger this, run a script called bzr-dev5plain
-        self.compile_for_versions(TOOL_BZR, "dev5plain", """
-            $tool upgrade --development5
-            """)
-        # To trigger this, run a script called bzr-dev5h16
-        self.compile_for_versions(TOOL_BZR, "dev5h16", """
-            $tool upgrade --development5-hash16
-            """)
-        # To trigger this, run a script called bzr-dev5h255
-        self.compile_for_versions(TOOL_BZR, "dev5h255", """
-            $tool upgrade --development5-hash255
-            """)
-        # To trigger this, run a script called bzr-gcnrr
-        self.compile_for_versions(TOOL_BZR, "gcnrr", """
-            $tool upgrade --gc-no-rich-root
-            """)
-        # To trigger this, run a script called bzr-gcchk16
-        self.compile_for_versions(TOOL_BZR, "gcchk16", """
-            $tool upgrade --gc-chk16
-            """)
-        # To trigger this, run a script called bzr-gcchk255
-        self.compile_for_versions(TOOL_BZR, "gcchk255", """
-            $tool upgrade --gc-chk255
+        # To trigger this, run a script called bzr-dev6
+        self.compile_for_versions(TOOL_BZR, "dev6", """
+            $tool upgrade --development6-rich-root
             """, exit_codes={'upgrade': [0, 3]})
         # To trigger this, run a script called bzr-gcchk255
         self.compile_for_versions(TOOL_BZR, "gcchk255big", """
@@ -124,24 +114,36 @@
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
             cd ..
-            $tool init-repo repo --${format}
-            $tool branch $work_basename repo/${work_basename}           ## unshared
-            cd repo
-            $tool branch $work_basename fix                             ## shared
-            $tool branch fix fix2 --no-tree                             ## sharedNoTree
-            cd $work_basename
-            """)
-        self.compile_for_tools([TOOL_GIT, TOOL_HG], """
-            cd ..
-            $tool clone $work_basename ${work_basename}-branchAndFix    ## unshared
-            cd ${work_basename}-branchAndFix
+            $tool init-repo project --${format}
+            $tool branch $work_basename project/trunk           ## unshared
+            cd project
+            $tool branch trunk fix                              ## shared
+            $tool branch fix fix2 --no-tree                     ## sharedNoTree
+            cd fix
+            """)
+        self.compile_for_tools([TOOL_HG], """
+            cd ..
+            mkdir project
+            $tool clone --pull $work_basename project/trunk     ## unshared
+            cd project
+            $tool clone trunk fix                               ## shared
+            $tool clone -U fix fix2                             ## sharedNoTree
+            cd fix
+            """)
+        self.compile_for_tools([TOOL_GIT], """
+            cd ..
+            mkdir project
+            $tool clone $work_basename project/trunk            ## unshared
+            cd project
+            $tool clone trunk fix                               ## shared
+            cd fix
             """)
 
 
 class AddTask(ScriptTask):
 
     def load(self):
-        self.compile_default("""
+        self.compile_for_tools([TOOL_BZR], """
             mkdir zzzDir
             echo "# junk" > zzzDir/zzzFile
             $tool add
@@ -149,6 +151,16 @@
             $tool diff
             $tool commit -m "testing add"
             """, exit_codes={'diff': 1})
+        # hg is the same except for the diff exit code
+        self.compile_for_tools([TOOL_HG], """
+            mkdir zzzDir
+            echo "# junk" > zzzDir/zzzFile
+            $tool add
+            $tool status
+            $tool diff
+            $tool commit -m "testing add"
+            """)
+        # git needs an extra option to diff as well
         self.compile_for_tools([TOOL_GIT], """
             mkdir zzzDir
             echo "# junk" > zzzDir/zzzFile
@@ -162,12 +174,20 @@
 class ChangeTask(ScriptTask):
 
     def load(self):
-        self.compile_default("""
+        self.compile_for_tools([TOOL_BZR], """
             echo "# more junk" >> zzzDir/zzzFile
             $tool status
             $tool diff
             $tool commit -m "testing change"
             """, exit_codes={'diff': 1})
+        # hg is the same except for the diff exit code
+        self.compile_for_tools([TOOL_HG], """
+            echo "# more junk" >> zzzDir/zzzFile
+            $tool status
+            $tool diff
+            $tool commit -m "testing change"
+            """)
+        # git needs an explicit add and different diff cli
         self.compile_for_tools([TOOL_GIT], """
             echo "# more junk" >> zzzDir/zzzFile
             $tool add
@@ -177,24 +197,54 @@
             """)
 
 
+class ChangeFileTask(ScriptTask):
+
+    def load(self):
+        self.compile_for_tools([TOOL_BZR], """
+            echo "# more junk" >> zzzDir/zzzFile
+            $tool status zzzDir/zzzFile
+            $tool diff zzzDir/zzzFile
+            $tool commit -m "testing change file" zzzDir/zzzFile
+            """, exit_codes={'diff': 1})
+        # hg is the same except for the diff exit code
+        self.compile_for_tools([TOOL_HG], """
+            echo "# more junk" >> zzzDir/zzzFile
+            $tool status zzzDir/zzzFile
+            $tool diff zzzDir/zzzFile
+            $tool commit -m "testing change file" zzzDir/zzzFile
+            """)
+        # git needs an explicit add and different diff cli
+        self.compile_for_tools([TOOL_GIT], """
+            echo "# more junk" >> zzzDir/zzzFile
+            $tool add zzzDir/zzzFile
+            $tool status
+            $tool diff --cached
+            $tool commit -m "testing change file"
+            """)
+
+
 class BranchAddChangeSuite(ScriptSuite):
 
     def load(self):
         self.add(BranchTask())
         self.add(AddTask())
         self.add(ChangeTask())
+        self.add(ChangeFileTask())
 
 
 ## Work Scripts - Additional ##
 
-class BundleTask(ScriptTask):
+class SendTask(ScriptTask):
 
     def load(self):
         # This can fail if there's no submit branch, which there isn't
         # if we're excluding the BranchTask during a run say
         self.compile_for_tools([TOOL_BZR], """
-            $tool send -o zzzBundle.path
+            $tool send -o zzzBundle.patch
             """, exit_codes={'send': [0, 3]})
+        self.compile_for_tools([TOOL_HG], """
+            $tool bundle zzzBundle.patch ../trunk               ## send
+            """)
 
 
 class RemoveTask(ScriptTask):
@@ -235,8 +285,13 @@
 class TagTask(ScriptTask):
 
     def load(self):
-        self.compile_default("""
-            $tool tag BETA-1
+        self.compile_for_tools([TOOL_BZR, TOOL_HG], """
+            $tool tag BETA-1
+            $tool tags
+            """)
+        self.compile_for_tools([TOOL_GIT], """
+            $tool tag BETA-1
+            $tool tag           ## tags
             """)
 
 
@@ -287,13 +342,32 @@
     def load(self):
         self.compile_default("""
             $tool log
-            $tool log zzzDir/zzzFile      ## oneFile
-            """)
-        self.compile_for_tools([TOOL_BZR], """
-            $tool log
-            $tool log zzzDir/zzzFile      ## oneFile
-            $tool log -n1                 ## mainline
-            $tool log -n1 zzzDir/zzzFile  ## mainlineOneFile
+            """)
+        self.compile_for_tools([TOOL_BZR], """
+            $tool log
+            $tool log -n0                      ## detailed
+            """)
+        self.compile_for_tools([TOOL_HG], """
+            $tool log
+            $tool log --follow                 ## detailed
+            """)
+
+
+class LogFileTask(ScriptTask):
+
+    run_if_defined = ['file']
+
+    def load(self):
+        self.compile_default("""
+            $tool log $file
+            """)
+        self.compile_for_tools([TOOL_BZR], """
+            $tool log $file
+            $tool log -n0 $file         ## detailed
+            """)
+        self.compile_for_tools([TOOL_HG], """
+            $tool log $file
+            $tool log --follow $file    ## detailed
             """)
 
 
@@ -308,9 +382,11 @@
 
 class AnnotateTask(ScriptTask):
 
+    run_if_defined = ['file']
+
     def load(self):
         self.compile_default("""
-            $tool annotate zzzDir/zzzFile
+            $tool annotate $file
             """)
 
 
@@ -355,9 +431,11 @@
 
 class FileContentTask(ScriptTask):
 
+    run_if_defined = ['file']
+
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool cat -r -1 zzzDir/zzzFile
+            $tool cat -r -1 $file
             """)
 
 
@@ -365,11 +443,20 @@
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool status -r -2..-1
-            $tool diff -r -2..-1
-            $tool ls -r -1 --non-recursive      ## listRoot
-            $tool ls -r -1                      ## listAll
+            $tool log -r -1
+            $tool status -c -1
+            $tool diff -c -1
+            $tool ls -r -1                   ## list
+            $tool ls -r -1 --recursive       ## listAll
             """, exit_codes={'diff': 1})
+        # Note: hg locate has no way of limiting recusion down
+        self.compile_for_tools([TOOL_HG], """
+            $tool tip                        ## log
+            $tool status -r tip
+            $tool diff -r tip
+            $tool locate -r tip              ## list
+            $tool locate -r tip              ## listAll
+            """)
 
 
 
@@ -461,14 +548,10 @@
     suite.add(SetupSuite())
     # Work
     suite.add(BranchAddChangeSuite())
-    suite.add(BundleTask())   # TODO: remove once default script = local
-    # Admin
-    suite.add(TagTask())
+    suite.add(SendTask())
     # Info
-    suite.add(HelpTask())
-    suite.add(ChangeInfoTask())
     suite.add(LogTask())
+    suite.add(LogFileTask())
     suite.add(AnnotateTask())
-    suite.add(TagsTask())
     suite.add(HistoryTask())
     return suite

=== modified file 'scripts/script_log.py'
--- scripts/script_log.py	2009-04-02 13:52:55 +0000
+++ scripts/script_log.py	2011-02-16 06:18:13 +0000
@@ -64,43 +64,43 @@
     def load(self):
         # Note: do not add log -v below - it belongs in the logplus suite
         self.compile_for_tools([TOOL_BZR], """
-            $tool log --short           ## mainline
-            $tool log --short $file     ## mainline-file
-            $tool log --long            ## merges
-            $tool log --long $file      ## merges-file
+            $tool log           ## mainline
+            $tool log $file     ## mainline-file
+            $tool log -n0            ## merges
+            $tool log -n0 $file      ## merges-file
             """)
 
 class LogRecentTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r-10.. --short           ## mainline
-            $tool log -r-10.. --short --forward ## mainline-forward
-            $tool log -r-10.. --short $file     ## mainline-file
-            $tool log -r-10.. --short -v        ## mainline-delta
-            $tool log -r-10.. --long            ## merges
-            $tool log -r-10.. --long $file      ## merges-file
-            $tool log -r-10.. --long -v         ## merges-delta
+            $tool log -r-10..           ## mainline
+            $tool log -r-10.. --forward ## mainline-forward
+            $tool log -r-10.. $file     ## mainline-file
+            $tool log -r-10.. -v        ## mainline-delta
+            $tool log -r-10.. -n0            ## merges
+            $tool log -r-10.. -n0 $file      ## merges-file
+            $tool log -r-10.. -n0 -v         ## merges-delta
             """)
 
 class LogTipTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r-1 --short           ## top
-            $tool log -r-1 --short -v        ## top-delta
-            $tool log -r-1 --long            ## merges
-            $tool log -r-1 --long -v         ## merges-delta
+            $tool log -r-1           ## top
+            $tool log -r-1 -v        ## top-delta
+            $tool log -r-1 -n0            ## merges
+            $tool log -r-1 -n0 -v         ## merges-delta
             """)
 
 class LogMainlineTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r-10 --short           ## top
-            $tool log -r-10 --short -v        ## top-delta
-            $tool log -r-10 --long            ## merges
-            $tool log -r-10 --long -v         ## merges-delta
+            $tool log -r-10           ## top
+            $tool log -r-10 -v        ## top-delta
+            $tool log -r-10 -n0            ## merges
+            $tool log -r-10 -n0 -v         ## merges-delta
             """)
 
 class LogMergeRevisionTask(ScriptTask):
@@ -109,30 +109,30 @@
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r$merge_revision --short           ## top
-            $tool log -r$merge_revision --short -v        ## top-delta
-            $tool log -r$merge_revision --long            ## merges
-            $tool log -r$merge_revision --long -v         ## merges-delta
+            $tool log -r$merge_revision           ## top
+            $tool log -r$merge_revision -v        ## top-delta
+            $tool log -r$merge_revision -n0            ## merges
+            $tool log -r$merge_revision -n0 -v         ## merges-delta
             """)
 
 class LogInitialTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r1 --short           ## top
-            $tool log -r1 --short -v        ## top-delta
-            $tool log -r1 --long            ## merges
-            $tool log -r1 --long -v         ## merges-delta
+            $tool log -r1           ## top
+            $tool log -r1 -v        ## top-delta
+            $tool log -r1 -n0            ## merges
+            $tool log -r1 -n0 -v         ## merges-delta
             """)
 
 class LogEarlyTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r..10 --short           ## mainline
-            $tool log -r..10 --short -v        ## mainline-delta
-            $tool log -r..10 --long            ## merges
-            $tool log -r..10 --long -v         ## merges-delta
+            $tool log -r..10           ## mainline
+            $tool log -r..10 -v        ## mainline-delta
+            $tool log -r..10 -n0            ## merges
+            $tool log -r..10 -n0 -v         ## merges-delta
             """)
 
 class LogEarlyFileTask(ScriptTask):
@@ -141,32 +141,32 @@
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -r..10 --short $early_file     ## mainline-file
-            $tool log -r..10 --long $early_file      ## merges-file
+            $tool log -r..10 $early_file     ## mainline-file
+            $tool log -r..10 -n0 $early_file      ## merges-file
             """)
 
 class LogIncrementalAllTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -l5 --short               ## mainline
-            $tool log -l5 --short $file         ## mainline-file
-            $tool log -l5 --short -v            ## mainline-delta
-            $tool log -l5 --long                ## merges
-            $tool log -l5 --long $file          ## merges-file
-            $tool log -l5 --long -v             ## merges-delta
+            $tool log -l5               ## mainline
+            $tool log -l5 $file         ## mainline-file
+            $tool log -l5 -v            ## mainline-delta
+            $tool log -l5 -n0                ## merges
+            $tool log -l5 -n0 $file          ## merges-file
+            $tool log -l5 -n0 -v             ## merges-delta
             """)
 
 class LogIncrementalRecentTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log -l5 -r-10.. --short       ## mainline
-            $tool log -l5 -r-10.. --short $file ## mainline-file
-            $tool log -l5 -r-10.. --short -v    ## mainline-delta
-            $tool log -l5 -r-10.. --long        ## merges
-            $tool log -l5 -r-10.. --long $file  ## merges-file
-            $tool log -l5 -r-10.. --long -v     ## merges-delta
+            $tool log -l5 -r-10..       ## mainline
+            $tool log -l5 -r-10.. $file ## mainline-file
+            $tool log -l5 -r-10.. -v    ## mainline-delta
+            $tool log -l5 -r-10.. -n0        ## merges
+            $tool log -l5 -r-10.. -n0 $file  ## merges-file
+            $tool log -l5 -r-10.. -n0 -v     ## merges-delta
             """)
 
 

=== modified file 'scripts/script_logplus.py'
--- scripts/script_logplus.py	2009-04-02 07:21:04 +0000
+++ scripts/script_logplus.py	2011-02-16 06:18:13 +0000
@@ -38,24 +38,24 @@
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log --short -v       ## mainline
-            $tool log --long -v        ## merges
+            $tool log -n1 -v       ## mainline
+            $tool log -n0 -v       ## merges
             """)
 
 class LogPatchesTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log --short -p       ## mainline
-            $tool log --long -p        ## merges
+            $tool log -n1 -p       ## mainline
+            $tool log -n0 -p       ## merges
             """)
 
 class LogDirectoryTask(ScriptTask):
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
-            $tool log --short $dir     ## mainline
-            $tool log --long $dir      ## merges
+            $tool log -n1 $dir     ## mainline
+            $tool log -n0 $dir     ## merges
             """)
 
 

=== modified file 'scripts/script_network.py'
--- scripts/script_network.py	2009-02-14 07:17:15 +0000
+++ scripts/script_network.py	2011-02-16 06:18:13 +0000
@@ -64,6 +64,7 @@
 ## Scripts ##
 
 class InitialPushTask(ScriptTask):
+    """Push into a new shared repository."""
 
     def load(self):
         self.compile_for_tools([TOOL_BZR], """
@@ -107,48 +108,99 @@
 
 class AnotherBranchTask(ScriptTask):
 
+    def __init__(self, branch_name='-anotherBranch'):
+        self._branch_name = branch_name
+        super(AnotherBranchTask, self).__init__()
+
+    def id(self):
+        return super(AnotherBranchTask, self).id() + self._branch_name
+
+    def name(self):
+        return super(AnotherBranchTask, self).name() + self._branch_name
+    
     def load(self):
-        self.compile_default("""
+        script = ("""
             cd ..
-            $tool clone $repo_read_url/trunk ${work_basename}-anotherBranch
-            cd ${work_basename}-anotherBranch
-            """)
+            $tool clone $repo_read_url/trunk ${work_basename}%(branch_name)s
+            cd ${work_basename}%(branch_name)s
+            """ % {'branch_name': self._branch_name})
+        self.compile_default(script)
         # Go up an extra level for Bazaar to get outside the shared repo
         self.compile_for_tools([TOOL_BZR], """
-            cd ..
-            cd ..
-            $tool clone $repo_read_url/trunk ${work_basename}-anotherBranch
-            cd ${work_basename}-anotherBranch
-            """)
+            cd ..""" + script)
 
 
 class AnotherPushTask(ScriptTask):
-
+    """Push a branch into an existing shared repository."""
+
+    def __init__(self, expect_diverged_error=False, label=''):
+        self._expect_diverged_error = expect_diverged_error
+        self._label = label
+        super(AnotherPushTask, self).__init__()
+
+    def id(self):
+        return super(AnotherPushTask, self).id() + self._label
+
+    def name(self):
+        return super(AnotherPushTask, self).name() + self._label
+    
     def load(self):
+        if self._expect_diverged_error:
+            exit_codes = {'bzrpush': 3}
+        else:
+            exit_codes = {}
         self.compile_default("""
             $tool push $repo_write_url/anotherBranch
             """)
         self.compile_for_tools([TOOL_BZR], """
-            $tool push --create-prefix $repo_write_url/anotherBranch
-            """)
+            $tool push --create-prefix $repo_write_url/anotherBranch ## bzrpush
+            """, exit_codes=exit_codes)
         # Hg doesn't support push over sftp out of the box
         self.compile_for_tools([TOOL_HG, TOOL_GIT], """
             scp -r . $repo_server:$repo_dir/anotherBranch
             """)
 
 
+class PushOverwriteTask(ScriptTask):
+    """Push a branch into an existing shared repository."""
+
+    def load(self):
+        self.compile_for_tools([TOOL_BZR], """
+            $tool push --overwrite $repo_write_url/anotherBranch
+            """)
+
+
+class DivergeTask(ScriptTask):
+    """Make a branch that diverges."""
+
+    def load(self):
+        self.compile_default("""
+            $tool push $repo_write_url/anotherBranch
+            """)
+        
 ## Suite ##
 
 def script_suite():
 
     suite = ScriptSuite()
+    # Initialise: make standalone 'trunk' locally
     suite.add(script_common.SetupSuite())
+    # Push branch into empty shared repo
     suite.add(InitialPushTask())
+    # Push one new revision onto existing remote branch
     suite.add(script_common.BranchTask())
     suite.add(script_common.AddTask())
     suite.add(PushChangesTask())
+    # Pull that one new revision back to local 'trunk'
     suite.add(RefreshMirrorTask())
+    # Push a new branch to shared repo with one new revision.
     suite.add(AnotherBranchTask())
     suite.add(script_common.ChangeTask())
     suite.add(AnotherPushTask())
+    # Push to a diverged branch, resulting in error.
+    suite.add(AnotherBranchTask(branch_name='-divergedBranch'))
+    suite.add(script_common.ChangeTask())
+    suite.add(AnotherPushTask(expect_diverged_error=True, label='-diverged'))
+    # Push to diverged branch, with overwrite.
+    suite.add(PushOverwriteTask())
     return suite

=== modified file 'statistics.py'
--- statistics.py	2009-02-23 03:46:54 +0000
+++ statistics.py	2011-02-16 06:18:13 +0000
@@ -52,9 +52,12 @@
         self.slow_counts = {}
         self.vslow_counts = {}
         self.vvslow_counts = {}
+        self.space_originals = {}
         self.space_totals = {}
         self.space_ratios = {}
         self.file_counts = {}
+        self.control_spaces = {}
+        self.working_spaces = {}
 
 
 def get_project_run(report_name):
@@ -99,8 +102,11 @@
         vslow_count = 0
         vvslow_count = 0
         space_ratio = 0
+        space_original = 0
         space_total = 0
         file_count = 0
+        control_space = 0
+        working_space = 0
         looking_for_times = True
         found_times = False
         looking_for_space = False
@@ -137,8 +143,15 @@
             elif found_space:
                 # accumulate the space usage data if on multiple lines
                 (dir_ratio,dir_total,dir) = line.split()
-                space_ratio += float(dir_ratio)
-                space_total += float(dir_total)
+                if dir.startswith(':control'):
+                    control_space = float(dir_total)
+                elif dir.startswith(':working'):
+                    working_space = float(dir_total)
+                else:
+                    space_ratio += float(dir_ratio)
+                    space_total += float(dir_total)
+                    if space_original == 0:
+                        space_original = space_total / space_ratio
             elif found_times:
                 (seconds,action) = line.split()
                 if not verbose:
@@ -173,18 +186,24 @@
             stats.slow_counts[project][run] = slow_count
             stats.vslow_counts[project][run] = vslow_count
             stats.vvslow_counts[project][run] = vvslow_count
+            stats.space_originals[project][run] = space_original
             stats.space_totals[project][run] = space_total
             stats.space_ratios[project][run] = space_ratio
             stats.file_counts[project][run] = file_count
+            stats.control_spaces[project][run] = control_space
+            stats.working_spaces[project][run] = working_space
         else:
             project_runs[project] = {run: total}
             stats.fast_counts[project] = {run: fast_count}
             stats.slow_counts[project] = {run: slow_count}
             stats.vslow_counts[project] = {run: vslow_count}
             stats.vvslow_counts[project] = {run: vvslow_count}
+            stats.space_originals[project] = {run: space_original}
             stats.space_totals[project] = {run: space_total}
             stats.space_ratios[project] = {run: space_ratio}
             stats.file_counts[project] = {run: file_count}
+            stats.control_spaces[project] = {run: control_space}
+            stats.working_spaces[project] = {run: working_space}
 
     return all_actions, times, project_runs, stats
 
@@ -228,6 +247,10 @@
     # Prepare statistics
     files_data = [str(stats.file_counts[p][best_run[p]]) for p in projects]
     files_label = "File count:"
+    working_data = [str(stats.working_spaces[p][best_run[p]]) for p in projects]
+    working_label = "Working space in MB:"
+    control_data = [str(stats.control_spaces[p][best_run[p]]) for p in projects]
+    control_label = "Control space in MB:"
     fast_data = [str(stats.fast_counts[p][best_run[p]]) for p in projects]
     fast_label = "Actions <= %d seconds:" % SLOW_THRESHHOLD
     slow_data = [str(stats.slow_counts[p][best_run[p]]) for p in projects]
@@ -237,19 +260,24 @@
     vvslow_data = [str(stats.vvslow_counts[p][best_run[p]]) for p in projects]
     vvslow_label = "Actions > %d seconds:" % VVSLOW_THRESHHOLD
     sp_ratio_data = [str(stats.space_ratios[p][best_run[p]]) for p in projects]
-    sp_ratio_label = "Used space vs original:"
+    sp_ratio_label = "Final space vs original:"
+    sp_original_data = [str(stats.space_originals[p][best_run[p]]) for p in projects]
+    sp_original_label = "Original space in MB:"
     sp_total_data = [str(stats.space_totals[p][best_run[p]]) for p in projects]
-    sp_total_label = "Total space in MB:"
+    sp_total_label = "Final space in MB:"
 
     # Dump the data
     print "Action," + ",".join(projects)
     print "%s,%s" % (files_label, ",".join(files_data))
+    print "%s,%s" % (working_label, ",".join(working_data))
+    print "%s,%s" % (control_label, ",".join(control_data))
+    print "%s,%s" % (sp_original_label, ",".join(sp_original_data))
+    print "%s,%s" % (sp_total_label, ",".join(sp_total_data))
+    print "%s,%s" % (sp_ratio_label, ",".join(sp_ratio_data))
     print "%s,%s" % (fast_label, ",".join(fast_data))
     print "%s,%s" % (slow_label, ",".join(slow_data))
     print "%s,%s" % (vslow_label, ",".join(vslow_data))
     print "%s,%s" % (vvslow_label, ",".join(vvslow_data))
-    print "%s,%s" % (sp_ratio_label, ",".join(sp_ratio_data))
-    print "%s,%s" % (sp_total_label, ",".join(sp_total_data))
     for action in actions:
         data = [str(times.get((p,best_run[p],action), "")) for p in projects]
         print "%s,%s" % (action, ",".join(data))

=== modified file 'suiterunner.py'
--- suiterunner.py	2009-04-02 07:21:04 +0000
+++ suiterunner.py	2011-02-16 06:18:13 +0000
@@ -18,13 +18,13 @@
 
 import os
 import random
-import shutil
 import string
 import subprocess
 import sys
 import time
 
-from bzrlib.trace import info, warning, error
+from bzrlib import osutils
+from bzrlib.trace import info, log_exception_quietly
 import archiveutil
 import datadump
 import dirutil
@@ -36,7 +36,8 @@
 
 def get_suite_names():
     # TODO: use reflection to look these up (walk sys.path)
-    return ['common', 'local', 'network', 'history', 'log', 'logplus', 'mega']
+    return ['common', 'local', 'network', 'history', 'log', 'logplus', 'mega',
+            'commit']
 
 
 def get_suite_by_name(name):
@@ -58,7 +59,7 @@
     try:
         module = __import__(module_name, globals(), locals())
     except ImportError, e:
-        # TODO: log exception properly
+        log_exception_quietly()
         info("failed to find module %s\nerror: %s" % (module_name, e))
         return None
     else:
@@ -66,7 +67,7 @@
             module = getattr(module, part)
     fn = getattr(module, 'script_suite', None)
     if fn is None:
-        # TODO: log exception properly
+        log_exception_quietly()
         info("failed to find script_suite() in %s" % module)
         return None
     return fn()
@@ -99,9 +100,57 @@
                 os.mkdir(dest)
         else:
             archiveutil.unpack_archive(tree, dest_dirs, verbose, unpack_stats)
+            sample_tool, sample_dir = dirs_by_tool.items()[0]
+            control_dir = _control_dir_for(sample_tool)
+            unpack_stats.update(_collect_archive_stats(sample_dir, control_dir))
     return (work_root,already_there,dirs_by_tool,run_id, unpack_stats)
 
 
+def _control_dir_for(tool):
+    real_tool, version_id = usertool.get_tool_by_fuzzy_name(tool)
+    if real_tool is not None:
+        return "." + real_tool.name
+    else:
+        raise AssertionError("unknown control directory for tool %s" % tool)
+
+
+def _collect_archive_stats(work_dir, control_dir):
+    """Collect statistics from an unpacked archive.
+
+    :param work_dir: name of directory to analyze
+    :param control_dir: name of control directory, e.g. .bzr, .hg
+    :return: a dictionary with keys of:
+      * total_count - the # of files in the work directory
+      * control_count - the # of files in the control directory
+      * other_count - the # of files in the other directories
+      * total_size - the size in bytes of the work directory
+      * control_size - the size in bytes of the control directory
+      * other_size - the size in bytes of the other directories
+    """
+    # TODO: It would be nice to work out the repo revision count
+    # as well, though the logic for that is obviously tool dependent.
+    result = {}
+    total_count = dirutil.dir_count(work_dir)
+    total_size = dirutil.dir_size(work_dir)
+    control_path = osutils.pathjoin(work_dir, control_dir)
+    if os.path.isdir(control_path):
+        control_count = dirutil.dir_count(control_path)
+        control_size = dirutil.dir_size(control_path)
+    else:
+        control_count = 0
+        control_size = 0
+    result = {
+        'total_count': total_count,
+        'control_count': control_count,
+        'other_count': total_count - control_count,
+        'total_size': total_size,
+        'control_size': control_size,
+        'other_size': total_size - control_size,
+        }
+    #info("archive stats are: %s" % (result,))
+    return result
+
+
 def _run_task_on_dirs(task, dirs_by_tool, measures, initial_params=None,
     profiler=None, prof_out_template=None, dry_run=False, tools=None,
     dynamic_params=None, per_tree_params=None, verbose=False, strict=False):
@@ -191,8 +240,9 @@
 
     def run_suite(self, suite, trees, tools, measures, data_file,
                   dry_run=False, keep_dirs=False, verbose=False,
-                  profiler=None, prof_out_template=None, dynamic_params=None,
-                  per_tree_params=None, strict=False, url=False):
+                  profiler=None, prof_out_template=None, user_params=None,
+                  per_tree_params=None, dynamic_user_params=None, strict=False,
+                  url=False):
         if url:
             tree_label = "url"
         else:
@@ -212,13 +262,13 @@
                 tree_label: tree,
                 'tree_id': usertestutil.tree_short_name(tree),
                 }
-            all_dynamic_params = {}
-            if dynamic_params:
-                all_dynamic_params.update(dynamic_params)
+            if user_params:
+                initial_params.update(user_params)
             if per_tree_params:
                 tree_params = per_tree_params.get(tree)
                 if tree_params:
-                    all_dynamic_params.update(tree_params)
+                    initial_params.update(tree_params)
+            dynamic_params = dynamic_user_params.copy()
 
             # Baseline the size of a tree - use last tool to max. cache usage
             if not dry_run:
@@ -238,14 +288,16 @@
                     if len(top_level_dirs) == 2 and '.bzr' in top_level_dirs:
                         top_level_dirs.remove('.bzr')
                         branch_dir = top_level_dirs[0]
-                        info("found shared repo with branch %s" % branch_dir)
-                        work_dir = os.path.join(work_dir, branch_dir)
+                        if (os.path.isdir(branch_dir)
+                            and '.bzr' in os.listdir(branch_dir)):
+                            info("found shared repo with branch %s" % branch_dir)
+                            work_dir = os.path.join(work_dir, branch_dir)
                 dirs_by_tool[tool] = work_dir
             temp_dirs = set()
             temp_dirs.add(work_root)
             csv_data = self.run_tests(suite, dirs_by_tool, measures,
                 initial_params, profiler, prof_out_template, dry_run, tools,
-                all_dynamic_params, verbose=verbose, strict=strict)
+                dynamic_params, verbose=verbose, strict=strict)
             os.chdir(original_dir)
             if not dry_run:
                 datadump.dump_summary(data_file, sys.stdout, suite, tree,

=== modified file 'tests/test_archiveutil.py'
--- tests/test_archiveutil.py	2009-03-18 17:24:05 +0000
+++ tests/test_archiveutil.py	2011-02-16 06:18:13 +0000
@@ -37,7 +37,7 @@
 class TestEmptyArchive(TestArchive):
 
     def _make_tarfile(self):
-        self.tarname = "tmp%d.tar.gz" % (random.uniform(9000,9999))
+        self.tarname = "empty.tar.gz"
         tar = tarfile.open(self.tarname, "w:gz")
         tar.close()
 
@@ -49,36 +49,41 @@
 class TestArchiveWithOneRoot(TestArchive):
 
     def _make_tarfile(self):
-        self.root_dir = "root%d" % (random.uniform(10,99))
+        self.root_dir = "root"
         os.mkdir(self.root_dir)
-        self.addCleanup(shutil.rmtree, self.root_dir)
-        self.tarname = "tmp%d.tar.gz" % (random.uniform(9000,9999))
+        self.tarname = "abc-in-root.tar.gz"
+        for item in ['a', 'b', 'c']:
+            filename = os.path.join(self.root_dir, item)
+            f = open(filename, "w")
+            try:
+                f.write("%s rocks\n" % item)
+            finally:
+                f.close()
         tar = tarfile.open(self.tarname, "w:gz")
         try:
-            for item in ['a', 'b', 'c']:
-                filename = os.path.join(self.root_dir,item)
-                f = open(filename, "w")
-                try:
-                    f.write("%s rocks\n" % item)
-                finally:
-                    f.close()
-                tar.add(filename)
+            tar.add(self.root_dir)
         finally:
             tar.close()
 
+    def assertPathExists(self, path):
+        self.assertTrue(os.path.exists(path), "%r does not exist" % (path,))
+
+    def assertPathExistsInRoot(self, path):
+        self.assertTrue(os.path.exists(os.path.join(self.root_dir,path)),
+            "%r does not exist in root_dir %r" % (path, self.root_dir))
+
     def test_dir_there(self):
         work_roots = archiveutil.unpack_archive(self.tarname)
         self.assertEqual([], work_roots)
         for item in ['a', 'b', 'c']:
-            self.assertTrue(os.path.exists(os.path.join(self.root_dir,item)))
+            self.assertPathExistsInRoot(item)
 
     def test_dir_not_there(self):
         shutil.rmtree(self.root_dir)
         work_roots = archiveutil.unpack_archive(self.tarname)
         self.assertEqual([self.root_dir], work_roots)
         for item in ['a', 'b', 'c']:
-            self.assertTrue(os.path.exists(os.path.join(self.root_dir,item)))
-
+            self.assertPathExistsInRoot(item)
 
     def test_multiple_destinations(self):
         shutil.rmtree(self.root_dir)
@@ -87,7 +92,7 @@
         self.assertEqual(dests, work_roots)
         for dest in dests:
             for item in ['a', 'b', 'c']:
-                self.assertTrue(os.path.exists(os.path.join(dest,item)))
+                self.assertPathExists(os.path.join(dest, item))
 
 
 class TestArchiveWithNoSharedRoot(TestArchive):

=== modified file 'userscript.py'
--- userscript.py	2009-04-02 13:42:24 +0000
+++ userscript.py	2011-02-16 06:18:13 +0000
@@ -23,7 +23,7 @@
 import unittest
 
 from bzrlib.errors import BzrError
-from bzrlib.trace import info
+from bzrlib.trace import info, note
 from bzrlib.tests import TestUtil
 
 import usermeasure
@@ -73,8 +73,37 @@
         self.default_script = None
         self.scripts_by_tool = {}
         self.title = None
+        # Indexed by (tool, version) or tool or 'default', then label
         self.exit_codes = {}
 
+    def _set_exit_codes(self, tool, codes_by_label, version=None):
+        """Set the map of expected exit codes for a tool and version."""
+        if codes_by_label is None:
+            return
+        #note("saving exit-codes %s for tool=%s, version=%s"
+        #    % (codes_by_label, tool, version))
+        if version is None:
+            key = tool
+        else:
+            key = (tool, version)
+        if key not in self.exit_codes:
+            self.exit_codes[key] = codes_by_label
+        else:
+            self.exit_codes[key].update(codes_by_label)
+
+    def _expected_exit_code(self, tool, label, version=None):
+        """Get the expected exit code for a 'command'."""
+        # When looking up exit codes, if it's not found for a
+        # tool+version combination, fall back to the one defined for the tool
+        tv_key = (tool, version)
+        if tv_key in self.exit_codes:
+            return self.exit_codes[tv_key].get(label, 0)
+        elif tool in self.exit_codes:
+            return self.exit_codes[tool].get(label, 0)
+        elif 'default' in self.exit_codes:
+            return self.exit_codes['default'].get(label, 0)
+        return 0
+
     def _compile_template(self, template):
         if template is None:
             return None
@@ -92,15 +121,13 @@
     def compile_default(self, template, exit_codes=None):
         "Compile the default script to be used."
         self.default_script = self._compile_template(template)
-        if exit_codes:
-            self.exit_codes.update(exit_codes)
+        self._set_exit_codes('default', exit_codes)
 
     def compile_for_tools(self, tools_mask, template, exit_codes=None):
         "Compile the script to be used for just the tools named."
         for tool in tools_mask:
             self.compile_for_versions(tool, None, template)
-        if exit_codes:
-            self.exit_codes.update(exit_codes)
+            self._set_exit_codes(tool, exit_codes)
 
     def compile_for_versions(self, tool, version_pattern, template,
             exit_codes=None):
@@ -109,8 +136,7 @@
         templates_by_version = self.scripts_by_tool.get(tool, {})
         templates_by_version[version_pattern] = compiled_template
         self.scripts_by_tool[tool] = templates_by_version
-        if exit_codes:
-            self.exit_codes.update(exit_codes)
+        self._set_exit_codes(tool, exit_codes, version_pattern)
 
     def _get_raw_script_for(self, tool, params, version=None,
         missing_params_ok=False):
@@ -250,7 +276,7 @@
         return actions
 
     def get_commands_by_label(self, tool, params={}):
-        """Get the mapping fron labels to commands."""
+        """Get the mapping from labels to commands."""
         script, exceptions = self._get_raw_script_for(tool, params,
             missing_params_ok=True)
         if script is None:
@@ -314,10 +340,13 @@
                 (sout,serr) = process.communicate()
                 exit_code = process.returncode
                 if strict:
-                    if self.exit_codes:
-                        expected_exit_code = self.exit_codes.get(label, 0)
-                    else:
-                        expected_exit_code = 0
+                    real_tool,version_id = usertool.get_tool_by_fuzzy_name(tool)
+                    if real_tool is not None:
+                        real_tool = real_tool.name
+                    expected_exit_code = self._expected_exit_code(real_tool,
+                        label, version=version_id)
+                    #note("expected-exit-code is %s for tool=%s, label=%s, version=%s"
+                    #    % (expected_exit_code, real_tool, label, version_id))
                     if (isinstance(expected_exit_code, int)
                         and expected_exit_code != exit_code or
                         isinstance(expected_exit_code, list)