Move GenerateDiff into a common function.

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
@@ skipping 81 matching lines @@
     if not self.options.email:
       # Assumes the svn credential is an email address.
       self.options.email = scm.SVN.GetEmail(self.checkout_root)
 
   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.
     """
-    previous_cwd = os.getcwd()
-    os.chdir(self.checkout_root)
     if not self.options.files:
-      self.options.files = [f[1] for f in scm.SVN.CaptureStatus(None)]
-    # Directories will return None so filter them out.
-    diff = filter(None, [scm.SVN.DiffItem(f) for f in self.options.files])
-    os.chdir(previous_cwd)
-    return "".join(diff)
+      previous_cwd = os.getcwd()
+      os.chdir(self.checkout_root)
+      excluded = ['!', '?', 'X', ' ', '~']
+      self.options.files = [
+          f[1] for f in scm.SVN.CaptureStatus(self.checkout_root)
+          if f[0][0] not in excluded
+      ]
+      os.chdir(previous_cwd)
+    return scm.SVN.GenerateDiff(self.options.files, full_move=True)
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.checkout_root
 
   def GetBots(self):
     try:
       import gcl
       return gcl.GetCachedFile('PRESUBMIT.py', use_root=True)
     except ImportError:
       try:
         return gclient_utils.FileRead(os.path.join(self.checkout_root,
                                                    'PRESUBMIT.py'))
-      except OSError:
+      except (IOError, OSError):
         return None
 
 
 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 = os.path.abspath(
         gclient_utils.CheckCall(['git', 'rev-parse', '--show-cdup']).strip())
     if not self.options.diff:
       self.options.diff = self._GenerateDiff()
     if not self.options.name:
       self.options.name = self._GetPatchName()
     if not self.options.email:
       self.options.email = scm.GIT.GetEmail('.')
 
   def _GenerateDiff(self):
     """Get the diff we'll send to the try server. We ignore the files list."""
-    branch = gclient_utils.CheckCall(['git', 'cl', 'upstream']).strip()
-    diff = gclient_utils.CheckCall(['git', 'diff-tree', '-p', '--no-prefix',
-                                    branch, 'HEAD']).splitlines(True)
-    for i in range(len(diff)):
-      # In the case of added files, replace /dev/null with the path to the
-      # file being added.
-      if diff[i].startswith('--- /dev/null'):
-        diff[i] = '--- %s' % diff[i+1][4:]
-    return ''.join(diff)
+    return scm.GIT.GenerateDiff(self.checkout_root)
 
   def _GetPatchName(self):
     """Construct a name for this patch."""
     # TODO: perhaps include the hash of the current commit, to distinguish
     # patches?
     branch = gclient_utils.CheckCall(['git', 'symbolic-ref', 'HEAD']).strip()
     if not branch.startswith('refs/heads/'):
       # TODO(maruel): Find a better type.
       raise NoTryServerAccess("Couldn't figure out branch name")
     branch = branch[len('refs/heads/'):]
     return branch
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.checkout_root
 
   def GetBots(self):
     try:
       return gclient_utils.FileRead(os.path.join(self.checkout_root,
                                                  'PRESUBMIT.py'))
-    except OSError:
+    except (IOError, OSError):
       return None
 
 
 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 317 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))