Extract filenames from diffs better.

trychange.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 """
 
@@ skipping 460 matching lines @@
   raise NoTryServerAccess("Could not guess version control system. "
                           "Are you in a working copy directory?")
 
 
 def GetMungedDiff(path_diff, diff):
   # Munge paths to match svn.
   changed_files = []
   for i in range(len(diff)):
     if diff[i].startswith('--- ') or diff[i].startswith('+++ '):
       new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
-      changed_files.append(('M', new_file.split('\t')[0]))
+      if diff[i].startswith('--- '):

[M-A Ruel, 2011/09/27 15:00:45]

Maybe time to?

import patch
patchset = (call function yet implemented to split diff)

[Alexei Svitkine (slow), 2011/09/27 15:05:13]

Maybe next time. ;)

+        file_path = new_file.split('\t')[0].strip()
+        if file_path.startswith('a/'):
+          file_path = file_path[2:]
+        changed_files.append(('M', file_path))
       diff[i] = diff[i][0:4] + new_file
   return (diff, changed_files)
 
 
 def TryChange(argv,
               change,
               file_list,
               swallow_exception,
               prog=None,
               extra_epilog=None):
@@ skipping 303 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, [], False))