bench rebase tools: format commit message and title.

experimental/benchtools/rebase.py

 #!/usr/bin/env python
 # Copyright (c) 2014 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.
 
 
 """rebase.py: standalone script to batch update bench expectations.
 
     Requires gsutil to access gs://chromium-skia-gm and Rietveld credentials.
 
@@ skipping 108 matching lines @@
     os.chdir(repo_dir)
     if subprocess.call(['git', 'clone', '-q', '--depth=50', '--single-branch',
                         'https://skia.googlesource.com/skia.git', '.']):
       status = False
   subprocess.call(['git', 'checkout', 'master'])
   subprocess.call(['git', 'pull'])
   os.chdir(old_cwd)
   return status
 
 def git_commit_expectations(repo_dir, exp_dir, update_li, h, commit):
-  commit_msg = """bench rebase after %s
+  commit_msg = """manual bench rebase after %s
 
-      TBR=robertphillips@google.com
+TBR=robertphillips@google.com
 
-      Bypassing trybots:
-      NOTRY=true""" % h
+Bypassing trybots:
+NOTRY=true""" % h
   old_cwd = os.getcwd()
   os.chdir(repo_dir)
   upload = ['git', 'cl', 'upload', '-f', '--bypass-hooks',
             '--bypass-watchlists', '-m', commit_msg]
   branch = exp_dir.split('/')[-1]
   if commit:
     upload.append('--use-commit-queue')
   cmds = ([['git', 'checkout', 'master'],
            ['git', 'pull'],
            ['git', 'checkout', '-b', branch, '-t', 'origin/master']] +
@@ skipping 94 matching lines @@
     print 'ERROR uploading expectations using git.'
   elif not commit:
     print 'CL created. Please take a look at the link above.'
   else:
     print 'New bench baselines should be in CQ now.'
   delete_dirs([gs_dir, exp_dir])
 
 
 if __name__ == "__main__":
   main()