Add black/whitelisting to 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
@@ skipping 69 matching lines @@
   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('--whitelist', action='append',

[M-A Ruel, 2014/05/06 18:49:08]

I recommend using default=[] on both, otherwise option.whitelist is None when no
argument is provided, which is occasionally annoying.

[Ryan Tseng, 2014/05/06 19:31:53]

Done.

+                    help='Patch only specified file(s).')
+  parser.add_option('--blacklist', action='append',
+                    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')
+
   if options.password and options.private_key_file:
     parser.error('-k and -w options are incompatible')
   if options.email and options.email_file:
     parser.error('-e and -E options are incompatible')
 
   if (os.path.isfile(os.path.join(os.getcwd(), 'update.flag'))
       and not options.force):
     print 'update.flag file found: bot_update has run and checkout is already '
     print 'in a consistent state. No actions will be performed in this step.'
     return 0
@@ skipping 102 matching lines @@
     # 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'))
+        name=properties.get('owner', 'chrome-bot'),
+        whitelist=options.whitelist,
+        blacklist=options.blacklist)
   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())