Add got_revision support for apply_issue.

apply_issue.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Applies an issue from Rietveld.
 """
 
 import getpass
+import json
 import logging
 import optparse
 import os
 import subprocess
 import sys
 import urllib2
 
 import breakpad  # pylint: disable=W0611
 
+import annotated_gclient
 import checkout
 import fix_encoding
 import gclient_utils
 import rietveld
 import scm
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class Unbuffered(object):
@@ skipping 31 matching lines @@
       '--root_dir',
       default=os.getcwd(),
       help='Root directory to apply the patch')
   parser.add_option(
       '-s',
       '--server',
       default='http://codereview.chromium.org',
       help='Rietveld server')
   parser.add_option('--no-auth', action='store_true',
                     help='Do not attempt authenticated requests.')
+  parser.add_option('--revision-mapping', default='{}',
+                    help='When running gclient, annotate the got_revisions '
+                         'using the revision-mapping.')
   options, args = parser.parse_args()
   logging.basicConfig(
       format='%(levelname)5s %(module)11s(%(lineno)4d): %(message)s',
       level=[logging.WARNING, logging.INFO, logging.DEBUG][
           min(2, options.verbose)])
   if args:
     parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))
   if not options.issue:
     parser.error('Require --issue')
   options.server = options.server.rstrip('/')
   if not options.server:
     parser.error('Require a valid server')
 
+  options.revision_mapping = json.loads(options.revision_mapping)
+
   if options.password == '-':
     print('Reading password')
     options.password = sys.stdin.readline().strip()
 
   print('Connecting to %s' % options.server)
   # Always try un-authenticated first.
   # TODO(maruel): Use OAuth2 properly so we don't hit rate-limiting on login
   # attempts.
   # Bad except clauses order (HTTPError is an ancestor class of
   # ClientLoginError)
@@ skipping 78 matching lines @@
   if 'DEPS' in map(os.path.basename, patchset.filenames):
     gclient_root = gclient_utils.FindGclientRoot(full_dir)
     if gclient_root and scm_type:
       print(
           'A DEPS file was updated inside a gclient checkout, running gclient '
           'sync.')
       base_rev = 'BASE' if scm_type == 'svn' else 'HEAD'
       gclient_path = os.path.join(BASE_DIR, 'gclient')
       if sys.platform == 'win32':
         gclient_path += '.bat'
-      return subprocess.call(
-          [
+      with annotated_gclient.temp_filename(suffix='gclient') as f:
+        cmd = [
             gclient_path, 'sync',
             '--revision', base_rev,
             '--nohooks',
             '--delete_unversioned_trees',
-          ],
-          cwd=gclient_root)
+            ]
+        if options.revision_mapping:
+          cmd.extend(['--output-json', f])
+
+        retcode = subprocess.call(cmd, cwd=gclient_root)
+
+        if retcode == 0 and options.revision_mapping:
+          revisions = annotated_gclient.parse_got_revision(
+              f, options.revision_mapping)
+          annotated_gclient.emit_buildprops(revisions)
+
+        return retcode
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())