submit_try: create the diff file using git, rather than relying on trychange.py

tools/submit_try

 #!/usr/bin/python
 
 # Copyright (c) 2013 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.
 
 
 """
 submit_try: Submit a try request.
 
 This is a thin wrapper around the try request utilities in depot_tools which
 adds some validation and supports both git and svn.
 """
 
 
 import httplib
 import json
 import os
 import re
+import shutil
 import subprocess
 import svn
 import sys
+import tempfile
 
 import buildbot_globals
 
 
 # Alias which can be used to run a try on every builder.
 ALL_BUILDERS = 'all'
 # Alias which can be used to run a try on all compile builders.
 COMPILE_BUILDERS = 'compile'
 # Alias which can be used to run a try on all builders that are run in the CQ.
 CQ_BUILDERS = 'cq'
@@ skipping 230 matching lines @@
     if args.revision:
       try_args.extend(['-r', args.revision])
     print ' '.join(try_args)
     proc = subprocess.Popen(try_args, stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     if proc.wait() != 0:
       raise Exception('Failed to submit try request: %s' % (
           proc.communicate()[0]))
     print proc.communicate()[0]
   else:
-    # First, find depot_tools. This is needed to import trychange.
-    sys.path.append(FindDepotTools())
-    import trychange
-    try_args = ['--use_svn',
-                '--svn_repo', GetTryRepo(),
-                '--root', GetCheckoutRoot(is_svn),
-                '--bot', botlist,
-                '--patchlevel', '0']
-    if args.revision:
-      try_args.extend(['-r', args.revision])
-    trychange.TryChange(try_args, None, False)
+    # Create the diff file.
+    cmd = ['git.bat' if os.name == 'nt' else 'git', 'diff', 'origin/master']
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if proc.wait() != 0:
+      raise Exception('Failed to capture git diff!')
+
+    temp_dir = tempfile.mkdtemp()
+    try:
+      diff_file = os.path.join(temp_dir, 'patch.diff')
+      with open(diff_file, 'wb') as f:
+        f.write(proc.communicate()[0])
+  
+      # Find depot_tools. This is needed to import trychange.
+      sys.path.append(FindDepotTools())
+      import trychange
+      try_args = ['--use_svn',
+                  '--svn_repo', GetTryRepo(),
+                  '--root', GetCheckoutRoot(is_svn),
+                  '--bot', botlist,
+                  '--diff', diff_file,
+                  ]
+      if args.revision:
+        try_args.extend(['-r', args.revision])
+
+      # Submit the try request.
+      trychange.TryChange(try_args, None, False)
+    finally:
+      shutil.rmtree(temp_dir)
 
 
 def main():
   # Retrieve the list of active try builders from the build master.
   trybots = RetrieveTrybotList(json_filename='trybots')
 
   # Determine if we're in an SVN checkout.
   is_svn = os.path.isdir('.svn')
 
   # Parse and validate the command-line arguments.
   args = ValidateArgs(sys.argv[1:], trybots=trybots, is_svn=is_svn)
 
   # Submit the try request.
   SubmitTryRequest(args, is_svn=is_svn)
 
 
 if __name__ == '__main__':
   sys.exit(main())