Add the capability to filter out files on try job with regexp.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 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.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 import datetime
 import errno
 import getpass
 import logging
 import optparse
 import os
 import posixpath
+import re
 import shutil
 import sys
 import tempfile
 import urllib
 
 try:
   import breakpad
 except ImportError:
   pass
 
@@ skipping 140 matching lines @@
 
   def GenerateDiff(self):
     """Returns a string containing the diff for the given file list.
 
     The files in the list should either be absolute paths or relative to the
     given root.
     """
     if not self.files:
       previous_cwd = os.getcwd()
       os.chdir(self.checkout_root)
+
       excluded = ['!', '?', 'X', ' ', '~']
+      def Excluded(f):
+        if f[0][0] in excluded:
+          return True
+        for r in self.options.exclude:
+          if re.search(r, f[1]):
+            logging.info('Ignoring "%s"' % f[1])
+            return True
+        return False
+
       self.files = [

[bradn, 2010/01/12 04:39:12]

I think the style guide wants the braces tighter:
[blah for bleh in yuck
 if foo]

           f[1] for f in scm.SVN.CaptureStatus(self.checkout_root)
-          if f[0][0] not in excluded
+          if not Excluded(f)
       ]
       os.chdir(previous_cwd)
     return scm.SVN.GenerateDiff(self.files, self.checkout_root, full_move=True,
                                 revision=self.diff_against)
 
 
 class GIT(SCM):
   """Gathers the options and diff for a git checkout."""
   def __init__(self, *args, **kwargs):
     SCM.__init__(self, *args, **kwargs)
     self.checkout_root = scm.GIT.GetCheckoutRoot(self.checkout_root)
     if not self.options.name:
       self.options.name = scm.GIT.GetPatchName(self.checkout_root)
     if not self.options.email:
       self.options.email = scm.GIT.GetEmail(self.checkout_root)
     logging.info("GIT(%s)" % self.checkout_root)
 
   def ReadRootFile(self, filename):
     try:
       # A git checkout is always a full checkout.
       data = gclient_utils.FileRead(os.path.join(self.checkout_root, filename))
       logging.debug('%s:\n%s' % (filename, data))
       return data
     except (IOError, OSError):
       logging.debug('%s:\nNone' % filename)
       return None
 
   def GenerateDiff(self):
-    # For now, ignores self.files
-    return scm.GIT.GenerateDiff(self.checkout_root, full_move=True,
+    if not self.files:
+      self.files = scm.GIT.GetDifferentFiles(self.checkout_root,
+                                             branch=self.diff_against)
+
+    def NotExcluded(f):
+      for r in self.options.exclude:
+        if re.search(r, f):
+          logging.info('Ignoring "%s"' % f)
+          return False
+      return True
+
+    self.files = filter(NotExcluded, self.files)
+    return scm.GIT.GenerateDiff(self.checkout_root, files=self.files,
+                                full_move=True,
                                 branch=self.diff_against)
 
 
 def _ParseSendChangeOptions(options):
   """Parse common options passed to _SendChangeHTTP and _SendChangeSVN."""
   values = {}
   if options.email:
     values['email'] = options.email
   values['user'] = options.user
   values['name'] = options.name
@@ skipping 261 matching lines @@
                    help="Used as -pN parameter to patch")
   group.add_option("-s", "--sub_rep", action="append", default=[],
                    help="Subcheckout to use in addition. This is mainly "
                         "useful for gclient-style checkouts. Use @rev or "
                         "@branch or @branch1..branch2 to specify the "
                         "revision/branch to diff against.")
   # Mostly chromium-specific
   try:
     group.add_option("--webkit", action="append_const",
                      const="third_party/WebKit",
-                     dest="sub_rep",
+                     dest="PATH",
                      help="Shorthand for -s third_party/WebKit")
   except optparse.OptionError:
     # append_const is not supported on 2.4. Too bad.
     pass
   group.add_option("--no_gclient", action="store_true",
                    help="Disable automatic search for gclient checkout.")
+  group.add_option("-E", "--exclude", action="append",
+                   default=['ChangeLog'], metavar='REGEXP',
+                   help="Regexp patterns to exclude files. Default: %default")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
                    action="store_const",
                    const=_SendChangeHTTP,
                    dest="send_patch",
                    help="Use HTTP to talk to the try server [default]")
   group.add_option("-H", "--host",
                    help="Host address")
@@ skipping 133 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))