Pass --no-renames to git diff

scm.py

 # Copyright (c) 2012 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 cStringIO
 import glob
 import logging
 import os
@@ skipping 95 matching lines @@
   def CaptureStatus(files, cwd, upstream_branch):
     """Returns git status.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
     if upstream_branch is None:
       upstream_branch = GIT.GetUpstreamBranch(cwd)
       if upstream_branch is None:
         raise gclient_utils.Error('Cannot determine upstream branch')
-    command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
+    command = ['diff', '--name-status', '--no-renames',
+               '-r', '%s...' % upstream_branch]
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
     status = GIT.Capture(command, cwd).rstrip()
     results = []
     if status:
       for statusline in status.splitlines():
@@ skipping 212 matching lines @@
   def GenerateDiff(cwd, branch=None, branch_head='HEAD', full_move=False,
                    files=None):
     """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.GetUpstreamBranch(cwd)
     command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
                branch + "..." + branch_head]
-    if not full_move:
+    if full_move:
+      command.append('--no-renames')
+    else:
       command.append('-C')
     # TODO(maruel): --binary support.
     if files:
       command.append('--')
       command.extend(files)
     diff = GIT.Capture(command, cwd=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'):
@@ skipping 727 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise