Revert "Add --no-commit option to apply_issue for use with git on the bots."

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 logging
@@ skipping 47 matching lines @@
   parser.add_option(
       '-r',
       '--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-commit', action='store_true',
-      help='Do not try to commit patch to SCM (git only)')
   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('/')
@@ skipping 52 matching lines @@
     print(
         'Failed to fetch the patch for issue %d, patchset %d.\n'
         'Try visiting %s/%d') % (
             options.issue, options.patchset,
             options.server, options.issue)
     return 1
   for patch in patchset.patches:
     print(patch)
   full_dir = os.path.abspath(options.root_dir)
   scm_type = scm.determine_scm(full_dir)
-
-  # FIXME: re-enable --no-commit.
   if scm_type == 'svn':
     scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None)
   elif scm_type == 'git':
     scm_obj = checkout.GitCheckoutBase(full_dir, None, None)
-  elif scm_type is 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/
@@ skipping 26 matching lines @@
             '--nohooks',
             '--delete_unversioned_trees',
           ],
           cwd=gclient_root)
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())