Add commit position to bisect result output.

tools/auto_bisect/bisect_perf_regression.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 2510 matching lines @@
     confidence_status = 'Successful with %(level)s confidence%(warning)s.'
     if results_dict['confidence'] >= HIGH_CONFIDENCE:
       level = 'high'
     else:
       level = 'low'
     warning = ' and warnings'
     if not self.warnings:
       warning = ''
     return confidence_status % {'level': level, 'warning': warning}
 
-  def _GetViewVCLinkFromDepotAndHash(self, cl, depot):
-    info = self.source_control.QueryRevisionInfo(cl,
+  def _GetViewVCLinkFromDepotAndHash(self, revision_id, depot):
+    """Gets link to the repository browser."""
+    info = self.source_control.QueryRevisionInfo(revision_id,
         self.depot_registry.GetDepotDir(depot))
     if depot and DEPOT_DEPS_NAME[depot].has_key('viewvc'):
       try:
         # Format is "git-svn-id: svn://....@123456 <other data>"
         svn_line = [i for i in info['body'].splitlines() if 'git-svn-id:' in i]
         svn_revision = svn_line[0].split('@')
         svn_revision = svn_revision[1].split(' ')[0]
         return DEPOT_DEPS_NAME[depot]['viewvc'] + svn_revision
       except IndexError:
         return ''
@@ skipping 14 matching lines @@
         'author': info['author'],
         'email_info': email_info,
         'commit_info': commit_info,
         'cl': cl,
         'cl_date': info['date']
     }
 
   def _PrintTestedCommitsHeader(self):
     if self.opts.bisect_mode == BISECT_MODE_MEAN:
       _PrintTableRow(
-          [20, 70, 14, 12, 13],
-          ['Depot', 'Commit SHA', 'Mean', 'Std. Error', 'State'])
+          [20, 12, 70, 14, 12, 13],
+          ['Depot', 'Position', 'SHA', 'Mean', 'Std. Error', 'State'])
     elif self.opts.bisect_mode == BISECT_MODE_STD_DEV:
       _PrintTableRow(
-          [20, 70, 14, 12, 13],
-          ['Depot', 'Commit SHA', 'Std. Error', 'Mean', 'State'])
+          [20, 12, 70, 14, 12, 13],
+          ['Depot', 'Position', 'SHA', 'Std. Error', 'Mean', 'State'])
     elif self.opts.bisect_mode == BISECT_MODE_RETURN_CODE:
       _PrintTableRow(
-          [20, 70, 14, 13],
-          ['Depot', 'Commit SHA', 'Return Code', 'State'])
+          [20, 12, 70, 14, 13],
+          ['Depot', 'Position', 'SHA', 'Return Code', 'State'])
     else:
       assert False, 'Invalid bisect_mode specified.'
 
-  def _PrintTestedCommitsEntry(self, current_data, cl_link, state_str):
+  def _PrintTestedCommitsEntry(self, current_data, commit_position, cl_link,
+                               state_str):
     if self.opts.bisect_mode == BISECT_MODE_MEAN:
       std_error = '+-%.02f' % current_data['value']['std_err']
       mean = '%.02f' % current_data['value']['mean']
       _PrintTableRow(
-          [20, 70, 12, 14, 13],
-          [current_data['depot'], cl_link, mean, std_error, state_str])
+          [20, 12, 70, 12, 14, 13],
+          [current_data['depot'], commit_position, cl_link, mean, std_error,
+           state_str])
     elif self.opts.bisect_mode == BISECT_MODE_STD_DEV:
       std_error = '+-%.02f' % current_data['value']['std_err']
       mean = '%.02f' % current_data['value']['mean']
       _PrintTableRow(
-          [20, 70, 12, 14, 13],
-          [current_data['depot'], cl_link, std_error, mean, state_str])
+          [20, 12, 70, 12, 14, 13],
+          [current_data['depot'], commit_position, cl_link, std_error, mean,
+           state_str])
     elif self.opts.bisect_mode == BISECT_MODE_RETURN_CODE:
       mean = '%d' % current_data['value']['mean']
       _PrintTableRow(
-          [20, 70, 14, 13],
-          [current_data['depot'], cl_link, mean, state_str])
+          [20, 12, 70, 14, 13],
+          [current_data['depot'], commit_position, cl_link, mean,
+           state_str])
 
   def _PrintTestedCommitsTable(
       self, revision_data_sorted, first_working_revision, last_broken_revision,
       confidence, final_step=True):
     print
     if final_step:
       print '===== TESTED COMMITS ====='
     else:
       print '===== PARTIAL RESULTS ====='
     self._PrintTestedCommitsHeader()
@@ skipping 19 matching lines @@
 
         # If confidence is too low, don't bother outputting good/bad.
         if not confidence:
           state_str = ''
         state_str = state_str.center(13, ' ')
 
         cl_link = self._GetViewVCLinkFromDepotAndHash(current_id,
             current_data['depot'])
         if not cl_link:
           cl_link = current_id
-        self._PrintTestedCommitsEntry(current_data, cl_link, state_str)
+        commit_position = self.source_control.GetCommitPosition(current_id)
+        commit_position = str(commit_position)
+        if not commit_position:
+          commit_position = ''
+        self._PrintTestedCommitsEntry(current_data, commit_position, cl_link,
+                                      state_str)
 
   def _PrintReproSteps(self):
     """Prints out a section of the results explaining how to run the test.
 
     This message includes the command used to run the test.
     """
     command = '$ ' + self.opts.command
     if bisect_utils.IsTelemetryCommand(self.opts.command):
       command += ('\nAlso consider passing --profiler=list to see available '
                   'profilers.')
@@ skipping 519 matching lines @@
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())