Add full_move flag to GIT.GenerateDiff and Factor out FindGclientRootDir into gclient_utils.

scm.py

 # Copyright (c) 2006-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.
 
 """SCM-specific utility classes."""
 
 import os
 import re
 import shutil
 import subprocess
@@ skipping 159 matching lines @@
 
   @staticmethod
   def GetUpstream(cwd):
     """Gets the current branch's upstream branch."""
     remote, upstream_branch = GIT.FetchUpstreamTuple(cwd)
     if remote is not '.':
       upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
     return upstream_branch
 
   @staticmethod
-  def GenerateDiff(cwd, branch=None):
-    """Diffs against the upstream branch or optionally another branch."""
+  def GenerateDiff(cwd, branch=None, full_move=False):
+    """Diffs against the upstream branch or optionally another branch.
+
+    full_move means that move or copy operations should completely recreate the
+    files, usually in the prospect to apply the patch for a try job."""
     if not branch:
       branch = GIT.GetUpstream(cwd)
-    diff = GIT.Capture(['diff-tree', '-p', '--no-prefix', branch, 'HEAD'],
-                       cwd).splitlines(True)
+    command = ['diff-tree', '-p', '--no-prefix', branch, 'HEAD']
+    if not full_move:
+      command.append('-C')
+    diff = GIT.Capture(command, cwd).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)
 
   @staticmethod
   def GetPatchName(cwd):
     """Constructs a name for this patch."""
@@ skipping 321 matching lines @@
         output.endswith("is not under version control")):
       return ""
     else:
       return output
 
   @staticmethod
   def DiffItem(filename, full_move=False):
     """Diffs a single file.
 
     Be sure to be in the appropriate directory before calling to have the
-    expected relative path."""
+    expected relative path.
+    full_move means that move or copy operations should completely recreate the
+    files, usually in the prospect to apply the patch for a try job."""
     # Use svn info output instead of os.path.isdir because the latter fails
     # when the file is deleted.
     if SVN.CaptureInfo(filename).get("Node Kind") == "directory":
       return None
     # If the user specified a custom diff command in their svn config file,
     # then it'll be used when we do svn diff, which we don't want to happen
     # since we want the unified diff.  Using --diff-cmd=diff doesn't always
     # work, since they can have another diff executable in their path that
     # gives different line endings.  So we use a bogus temp directory as the
     # config directory, which gets around these problems.
@@ skipping 122 matching lines @@
     if not cur_dir_repo_root:
       return None
 
     while True:
       parent = os.path.dirname(directory)
       if (SVN.CaptureInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       directory = parent
     return directory