Update upload.py to chromium@53dd8c978c1b

third_party/upload.py

 #!/usr/bin/env python
 # coding: utf-8
 #
 # Copyright 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 1284 matching lines @@
     # this by overriding the environment (but there is still a problem if the
     # git config key "diff.external" is used).
     env = os.environ.copy()
     if 'GIT_EXTERNAL_DIFF' in env: del env['GIT_EXTERNAL_DIFF']
     # -M/-C will not print the diff for the deleted file when a file is renamed.
     # This is confusing because the original file will not be shown on the
     # review when a file is renamed. So first get the diff of all deleted files,
     # then the diff of everything except deleted files with rename and copy
     # support enabled.
     cmd = [
-        "git", "diff", "--no-color", "--no-ext-diff", "--full-index", "--ignore-submodules"
+        "git", "diff", "--no-color", "--no-ext-diff", "--full-index",
+        "--ignore-submodules",
     ]
-    diff = RunShell(cmd + ["--diff-filter=D"] + extra_args, env=env,
-        silent_ok=True)
-    diff += RunShell(cmd + ["-C", "--diff-filter=ACMRT"] + extra_args, env=env,
-        silent_ok=True)
+    diff = RunShell(
+        cmd + ["--diff-filter=D"] + extra_args, env=env, silent_ok=True)
+    diff += RunShell(
+        cmd + ["--find-copies-harder", "--diff-filter=ACMRT"] + extra_args,
+        env=env, silent_ok=True)
+    # The CL could be only file deletion or not. So accept silent diff for both
+    # commands then check for an empty diff manually.
     if not diff:
       ErrorExit("No output from %s" % (cmd + extra_args))
     return diff
 
   def GetUnknownFiles(self):
     status = RunShell(["git", "ls-files", "--exclude-standard", "--others"],
                       silent_ok=True)
     return status.splitlines()
 
   def GetFileContent(self, file_hash, is_binary):
@@ skipping 1023 matching lines @@
     os.environ['LC_ALL'] = 'C'
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()