fix some bench rebase tool problems.

experimental/benchtools/rebase.py

-#!/usr/bin/python2.7
+#!/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.
-   Usage:
-     Copy script to a separate dir outside Skia repo. The script will create a
-         skia dir on the first run to host the repo, and will create/delete temp
-         dirs as needed.
-     ./rebase.py --githash <githash prefix to use for getting bench data>
+
+    Requires gsutil to access gs://chromium-skia-gm and Rietveld credentials.
+
+    Usage:
+      Copy script to a separate dir outside Skia repo. The script will create a
+          skia dir on the first run to host the repo, and will create/delete
+          temp dirs as needed.
+      ./rebase.py --githash <githash prefix to use for getting bench data>
 """
 
+
 import argparse
 import filecmp
 import os
 import re
 import shutil
 import subprocess
 import time
 import urllib2
 
 
@@ skipping 34 matching lines @@
   proc = subprocess.Popen(['gsutil', 'ls',
       '/'.join([GS_PREFIX, p, 'bench_' + h + '_data_skp_*'])],
           stdout=subprocess.PIPE)
   out, err = proc.communicate()
   if err or not out:
     return []
   return [i for i in out.strip().split('\n') if not filter_file(i)]
 
 def download_gs_files(p, h, gs_dir):
   print 'Downloading raw bench files from Google Storage...'
-  proc = subprocess.Popen(['gsutil', '-q', 'cp',
+  proc = subprocess.Popen(['gsutil', 'cp', '-q',
       '/'.join([GS_PREFIX, p, 'bench_' + h + '_data_skp_*']),
           '%s/%s' % (gs_dir, p)],
           stdout=subprocess.PIPE)
   out, err = proc.communicate()
   if err:
     clean_dir(gs_dir)
     return False
   files = 0
   for f in os.listdir(os.path.join(gs_dir, p)):
     if filter_file(f):
@@ skipping 45 matching lines @@
   commit_msg = """bench rebase after %s
 
       TBR=robertphillips@google.com
 
       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', exp_dir, '-t', 'origin/master']] +
-          [['cp', '../%s/%s' % (exp_dir, f), 'expectations/bench'] for f in
+           ['git', 'checkout', '-b', branch, '-t', 'origin/master']] +
+          [['cp', '%s/%s' % (exp_dir, f), 'expectations/bench'] for f in
            update_li] +
           [['git', 'add'] + ['expectations/bench/%s' % i for i in update_li],
            ['git', 'commit', '-m', commit_msg],
            upload,
            ['git', 'checkout', 'master'],
-           ['git', 'branch', '-D', exp_dir],
+           ['git', 'branch', '-D', branch],
           ])
   status = True
   for cmd in cmds:
     print 'Running ' + ' '.join(cmd)
     if subprocess.call(cmd):
       print 'FAILED. Please check if skia git repo is present.'
       subprocess.call(['git', 'checkout', 'master'])
       status = False
       break
   os.chdir(old_cwd)
@@ skipping 18 matching lines @@
                       help='Whether to commit changes automatically.')
   args = parser.parse_args()
 
   repo_dir = os.path.join(d, 'skia')
   if not os.path.exists(repo_dir):
     os.makedirs(repo_dir)
   if not checkout_or_update_skia(repo_dir):
     print 'ERROR setting up Skia repo at %s' % repo_dir
     return 1
 
-  for item in os.listdir(os.path.join(d, 'skia/expectations/bench')):
-    PLATFORMS.append(
-        item.replace('bench_expectations_', '').replace('.txt', ''))
-
   file_in_repo = os.path.join(d, 'skia/experimental/benchtools/rebase.py')
   if not filecmp.cmp(__file__, file_in_repo):
     shutil.copy(file_in_repo, __file__)
     print 'Updated this script from repo; please run again.'
     return
 
+  for item in os.listdir(os.path.join(d, 'skia/expectations/bench')):
+    PLATFORMS.append(
+        item.replace('bench_expectations_', '').replace('.txt', ''))
+
   if not args.githash or len(args.githash) < 7:
     raise Exception('Please provide --githash with a longer prefix (7+).')
   commit = False
   if args.commit:
     commit = True
   rebase_hash = args.githash[:7]
   hashes = get_git_hashes()
   short_hashes = [h[:7] for h in hashes]
   if rebase_hash not in short_hashes:
     raise Exception('Provided --githash not found in recent history!')
@@ skipping 29 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()