Add file exclusion to trunk patch creation in push-to-trunk.

tools/push-to-trunk/git_recipes.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 114 matching lines @@
       args += ["-aF", Quoted(file_name)]
     if message:
       args += ["-am", Quoted(message)]
     self.Git(MakeArgs(args))
 
   def GitPresubmit(self):
     self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"")
 
   def GitDCommit(self):
     self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None)
 

[Michael Achenbach, 2014/03/12 15:35:06]

I hope this approach has no potential for omitting any required files. I could
not find an innate "exclude" feature in git diff.

-  def GitDiff(self, loc1, loc2):
-    return self.Git(MakeArgs(["diff", loc1, loc2]))
+  def GitDiff(self, loc1, loc2, exclude=None):
+    exclude = exclude or []
+    files = self.Git(MakeArgs(["diff", "--name-only", loc1, loc2]))
+    files = filter(lambda f: f not in exclude, files.strip().splitlines())
+    return self.Git(MakeArgs(["diff", loc1, loc2] + files))
 
   def GitPull(self):
     self.Git("pull")
 
   def GitSVNFetch(self):
     self.Git("svn fetch")
 
   @Strip
   def GitSVNLog(self):
     return self.Git("svn log -1 --oneline")
 
   @Strip
   def GitSVNFindGitHash(self, revision, branch=""):
     assert revision
     return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch]))
 
   @Strip
   def GitSVNFindSVNRev(self, git_hash, branch=""):
     return self.Git(MakeArgs(["svn find-rev", git_hash, branch]))
 
   def GitSVNDCommit(self):
     return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None)
 
   def GitSVNTag(self, version):
     self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)),
              retry_on=lambda x: x is None)