Fix various typos, error handling for GN auto-roller.

tools/gn/bin/roll_gn.py

 # Copyright 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.
 
 """An auto-roller for GN binaries into Chromium.
 
 This script is used to update the GN binaries that a Chromium
 checkout uses. In order to update the binaries, one must follow
 four steps in order:
 
@@ skipping 43 matching lines @@
 if not third_party_path in sys.path:
   sys.path.insert(0, third_party_path)
 
 import upload
 
 
 CHROMIUM_REPO = 'https://chromium.googlesource.com/chromium/src.git'
 
 CODE_REVIEW_SERVER = 'https://codereview.chromium.org'
 
+COMMITISH_DIGITS = 10
 
 class GNRoller(object):
   def __init__(self):
     self.chromium_src_dir = None
     self.buildtools_dir = None
     self.old_gn_commitish = None
     self.new_gn_commitish = None
     self.old_gn_version   = None
     self.new_gn_version = None
     self.reviewer = 'dpranke@chromium.org'
@@ skipping 78 matching lines @@
       return 1
 
     print('Uploading CL to build GN at {#%s} - %s' %
           (self.new_gn_version, self.new_gn_commitish))
     ret, out, err = self.Call('git cl upload -f')
     if ret:
       print('git-cl upload failed: %s' % out + err)
       return 1
 
     print('Starting try jobs')
-    self.Call('git-cl try -b linux_chromium_gn_upload '
-              '-b mac_chromium_gn_upload '
+    self.Call('git-cl try -m tryserver.chromium.linux '
+              '-b linux_chromium_gn_upload -r %s' % self.new_gn_commitish)
+    self.Call('git-cl try -m tryserver.chromium.mac '
+              '-b mac_chromium_gn_upload -r %s' % self.new_gn_commitish)
+    self.Call('git-cl try -m tryserver.chromium.win '
               '-b win8_chromium_gn_upload -r %s' % self.new_gn_commitish)
 
     return 0
 
   def MakeDummyDepsChange(self):
     with open('DEPS') as fp:
       deps_content = fp.read()
       new_deps = deps_content.replace("'buildtools_revision':",
                                       "'buildtools_revision':  ")
 
@@ skipping 105 matching lines @@
     try:
       desc_file.write(desc)
       desc_file.close()
       self.Call('git commit -a -F %s' % desc_file.name,
                 cwd=self.buildtools_dir)
       self.Call('git-cl upload -f --send-mail',
                 cwd=self.buildtools_dir)
     finally:
       os.remove(desc_file.name)
 
-    self.Call('git cl push', cwd=self.buildtools_dir)
+    ret, out, err = self.Call('git cl land', cwd=self.buildtools_dir)
+    if ret:
+        print("buildtools git cl land failed: %d" % ret)
+        if out:
+            print(out)
+        if err:
+            print(err)
+        return ret
 
     # Fetch the revision we just committed so that RollDEPS will find it.
-    self.Call('git cl fetch', cwd=self.buildtools_dir)
+    self.Call('git fetch', cwd=self.buildtools_dir)
 
     return 0
 
   def RollDEPS(self):
+    ret, _, _ = self.Call('git new-branch roll_gn_%s' % self.new_gn_version)
+    if ret:
+      print('Failed to create a new branch for roll_gn_%s' %
+            self.new_gn_version)
+      return 1
+
     _, out, _ = self.Call('git rev-parse origin/master',
                           cwd=self.buildtools_dir)
     new_buildtools_commitish = out.strip()
 
     new_deps_lines = []
     old_buildtools_commitish = ''
     with open(os.path.join(self.chromium_src_dir, 'DEPS')) as fp:
       for l in fp.readlines():
         m = re.match(".*'buildtools_revision':.*'(.+)',", l)
         if m:
@@ skipping 10 matching lines @@
     with open('DEPS', 'w') as fp:
       fp.write(''.join(new_deps_lines) + '\n')
 
     desc = self.GetDEPSRollDesc(old_buildtools_commitish,
                                 new_buildtools_commitish)
     desc_file = tempfile.NamedTemporaryFile(delete=False)
     try:
       desc_file.write(desc)
       desc_file.close()
       self.Call('git commit -a -F %s' % desc_file.name)
-      self.Call('git-cl upload -f --send-mail --commit-queue')
+      self.Call('git-cl upload -f --send-mail --use-commit-queue')
     finally:
       os.remove(desc_file.name)
     return 0
 
   def GetBuildtoolsDesc(self):
     gn_changes = self.GetGNChanges()
     return (
-      'Roll gn %s..%s (r%s:%s)\n'
+      'Roll gn %s..%s (r%s:r%s)\n'
       '\n'
       '%s'
       '\n'
       'TBR=%s\n' % (
-        self.old_gn_commitish,
-        self.new_gn_commitish,
+        self.old_gn_commitish[:COMMITISH_DIGITS],
+        self.new_gn_commitish[:COMMITISH_DIGITS],
         self.old_gn_version,
         self.new_gn_version,
         gn_changes,
         self.reviewer,
       ))
 
   def GetDEPSRollDesc(self, old_buildtools_commitish, new_buildtools_commitish):
     gn_changes = self.GetGNChanges()
 
     return (
       'Roll DEPS %s..%s\n'
       '\n'
-      '  in order to roll GN %s..%s (r%s:%s)\n'
+      '  In order to roll GN %s..%s (r%s:r%s) and pick up\n'
+      '  the following changes:\n'
       '\n'
       '%s'
       '\n'
       'TBR=%s\n'
       'CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel,'
       'mac_chromium_gn_dbg;'
       'tryserver.chromium.win:win8_chromium_gn_dbg,'
       'win_chromium_gn_x64_rel\n' % (
-        old_buildtools_commitish,
-        new_buildtools_commitish,
-        self.old_gn_commitish,
-        self.new_gn_commitish,
+        old_buildtools_commitish[:COMMITISH_DIGITS],
+        new_buildtools_commitish[:COMMITISH_DIGITS],
+        self.old_gn_commitish[:COMMITISH_DIGITS],
+        self.new_gn_commitish[:COMMITISH_DIGITS],
         self.old_gn_version,
         self.new_gn_version,
         gn_changes,
         self.reviewer,
       ))
 
   def GetGNChanges(self):
     _, out, _ = self.Call(
         "git log --pretty='  %h %s' " +
         "%s..%s tools/gn" % (self.old_gn_commitish, self.new_gn_commitish))
     return out
 
   def Call(self, cmd, cwd=None):
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True,
                             cwd=(cwd or self.chromium_src_dir))
     out, err = proc.communicate()
     return proc.returncode, out, err
 
 
 if __name__ == '__main__':
   roller = GNRoller()
   sys.exit(roller.Roll())