Update upload.py to r690 and include fix for "support for git mv in rietveld"

third_party/upload.py

 #!/usr/bin/env python
 #
 # 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 1196 matching lines @@
       if ":" in self.options.revision:
         extra_args = self.options.revision.split(":", 1) + extra_args
       else:
         extra_args = [self.options.revision] + extra_args
 
     # --no-ext-diff is broken in some versions of Git, so try to work around
     # 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']
-    return RunShell(["git", "diff", "--no-ext-diff", "--full-index", "-M"]
-                    + extra_args, env=env)
+    # -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-ext-diff", "--full-index"]
+    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)
+    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):
     """Returns the content of a file identified by its git hash."""
     data, retcode = RunShellWithReturnCode(["git", "show", file_hash],
                                             universal_newlines=not is_binary)
@@ skipping 635 matching lines @@
   except OSError, (errno, message):
     if errno != 2:  # ENOENT -- they don't have git installed.
       raise
 
   # detect CVS repos use `cvs status && $? == 0` rules
   try:
     out, returncode = RunShellWithReturnCode(["cvs", "status"])
     if returncode == 0:
       return (VCS_CVS, None)
   except OSError, (errno, message):
-    if error != 2:
+    if errno != 2:
       raise
 
   return (VCS_UNKNOWN, None)
 
 
 def GuessVCS(options):
   """Helper to guess the version control system.
 
   This verifies any user-specified VersionControlSystem (by command line
   or environment variable).  If the user didn't specify one, this examines
@@ skipping 316 matching lines @@
   try:
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()