Modify git-try so that when files are added, it munges...

git-try

 #!/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.
 
 import getpass
 import optparse
 import os
 import subprocess
 import tempfile
@@ skipping 44 matching lines @@
 def GetRietveldIssueNumber():
   return Backquote(['git', 'config',
                     'branch.%s.rietveldissue' % GetBranchName()])
 
 
 def GetRietveldPatchsetNumber():
   return Backquote(['git', 'config',
                     'branch.%s.rietveldpatchset' % GetBranchName()])
 
 
-def GetMungedDiff(branch):
+def GetMungedDiff(branch, prefix='src/'):
   """Get the diff we'll send to the try server.  We munge paths to match svn."""
   # Make the following changes:
-  # - Prepend "src/" to paths as svn is expecting
+  # - Prepend "src/" (or some other prefix) to paths as svn is expecting
   # - In the case of added files, replace /dev/null with the path to the file
   #   being added.
   output = []
   if not branch:
     # Try to guess the upstream branch.
     branch = Backquote(['git', 'cl', 'upstream'])
   diff = subprocess.Popen(['git', 'diff-tree', '-p', '--no-prefix',
                            branch, 'HEAD'],
                           stdout=subprocess.PIPE).stdout.readlines()
   for i in range(len(diff)):
     line = diff[i]
     if line.startswith('--- /dev/null'):
-      line = '--- %s' % diff[i+1][4:]
+      line = '--- %s' % prefix + diff[i+1][4:]
     elif line.startswith('--- ') or line.startswith('+++ '):
-      line = line[0:4] + 'src/' + line[4:]
+      line = line[0:4] + prefix + line[4:]
     output.append(line)
 
   munged_diff = ''.join(output)
   if len(munged_diff.strip()) == 0:
     raise Exception("Patch was empty, did you give the right remote branch?")
 
   return munged_diff
 
 
 def ValidEmail(email):
@@ skipping 75 matching lines @@
   if options.revision:
     args.extend(['-r', options.revision])
   if GetRietveldPatchsetNumber():
     args.extend([
         '--issue', GetRietveldIssueNumber(),
         '--patchset', GetRietveldPatchsetNumber(),
     ])
 
   print sendmsg
   TryChange(args=args)