Re-land of have apply_patch.py/checkout.py stage git patches instead of committing them

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
@@ skipping 67 matching lines @@
       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.')
   parser.add_option('-f', '--force', action='store_true',
                     help='Really run apply_issue, even if .update.flag '
                          'is detected.')
-  parser.add_option('-b', '--base_ref', help='Base git ref to patch on top of, '
-                    'used for verification.')
+  parser.add_option('-b', '--base_ref', help='DEPRECATED do not use.')
   parser.add_option('--whitelist', action='append', default=[],
                     help='Patch only specified file(s).')
   parser.add_option('--blacklist', action='append', default=[],
                     help='Don\'t patch specified file(s).')
   parser.add_option('-d', '--ignore_deps', action='store_true',
                     help='Don\'t run gclient sync on DEPS changes.')
   options, args = parser.parse_args()
 
   if options.whitelist and options.blacklist:
     parser.error('Cannot specify both --whitelist and --blacklist')
@@ skipping 98 matching lines @@
   if options.blacklist:
     patchset.patches = [patch for patch in patchset.patches
                         if patch.filename not in options.blacklist]
   for patch in patchset.patches:
     print(patch)
   full_dir = os.path.abspath(options.root_dir)
   scm_type = scm.determine_scm(full_dir)
   if scm_type == 'svn':
     scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None)
   elif scm_type == 'git':
-    scm_obj = checkout.GitCheckout(full_dir, None, None, None, None,
-                                   base_ref=options.base_ref,)
+    scm_obj = checkout.GitCheckout(full_dir, None, None, None, None)
   elif scm_type == None:
     scm_obj = checkout.RawCheckout(full_dir, None, None)
   else:
     parser.error('Couldn\'t determine the scm')
 
   # TODO(maruel): HACK, remove me.
   # When run a build slave, make sure buildbot knows that the checkout was
   # modified.
   if options.root_dir == 'src' and getpass.getuser() == 'chrome-bot':
     # See sourcedirIsPatched() in:
     # http://src.chromium.org/viewvc/chrome/trunk/tools/build/scripts/slave/
     #    chromium_commands.py?view=markup
     open('.buildbot-patched', 'w').close()
 
   print('\nApplying the patch.')
   try:
-    scm_obj.apply_patch(
-        patchset, verbose=True,
-        email=properties.get('owner_email', 'chrome-bot@chromium.org'),
-        name=properties.get('owner', 'chrome-bot'))
+    scm_obj.apply_patch(patchset, verbose=True)
   except checkout.PatchApplicationFailed, e:
     print(str(e))
     print('CWD=%s' % os.getcwd())
     print('Checkout path=%s' % scm_obj.project_path)
     return 1
 
   if ('DEPS' in map(os.path.basename, patchset.filenames)
       and not options.ignore_deps):
     gclient_root = gclient_utils.FindGclientRoot(full_dir)
     if gclient_root and scm_type:
@@ skipping 21 matching lines @@
               f, options.revision_mapping)
           annotated_gclient.emit_buildprops(revisions)
 
         return retcode
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())