Update upload.py at b7cdf3e63c5e.

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 71 matching lines @@
 # upload.py).
 AUTH_ACCOUNT_TYPE = "GOOGLE"
 
 # URL of the default review server. As for AUTH_ACCOUNT_TYPE, this line could be
 # changed by the review server (see handler for upload.py).
 DEFAULT_REVIEW_SERVER = "codereview.appspot.com"
 
 # Max size of patch or base file.
 MAX_UPLOAD_SIZE = 900 * 1024
 
+
 # Constants for version control names.  Used by GuessVCSName.
 VCS_GIT = "Git"
 VCS_MERCURIAL = "Mercurial"
 VCS_SUBVERSION = "Subversion"
 VCS_PERFORCE = "Perforce"
 VCS_CVS = "CVS"
 VCS_UNKNOWN = "Unknown"
 
-VCS_ABBREVIATIONS = {
-  VCS_MERCURIAL.lower(): VCS_MERCURIAL,
-  "hg": VCS_MERCURIAL,
-  VCS_SUBVERSION.lower(): VCS_SUBVERSION,
-  "svn": VCS_SUBVERSION,
-  VCS_PERFORCE.lower(): VCS_PERFORCE,
-  "p4": VCS_PERFORCE,
-  VCS_GIT.lower(): VCS_GIT,
-  VCS_CVS.lower(): VCS_CVS,
-}
+VCS = [
+{
+    'name': VCS_MERCURIAL,
+    'aliases': ['hg', 'mercurial'],
+}, {
+    'name': VCS_SUBVERSION,
+    'aliases': ['svn', 'subversion'],
+}, {
+    'name': VCS_PERFORCE,
+    'aliases': ['p4', 'perforce'],
+}, {
+    'name': VCS_GIT,
+    'aliases': ['git'],
+}, {
+    'name': VCS_CVS,
+    'aliases': ['cvs'],
+}]
+
+VCS_SHORT_NAMES = []    # hg, svn, ...
+VCS_ABBREVIATIONS = {}  # alias: name, ...
+for vcs in VCS:
+  VCS_SHORT_NAMES.append(min(vcs['aliases'], key=len))
+  VCS_ABBREVIATIONS.update((alias, vcs['name']) for alias in vcs['aliases'])
+
 
 # OAuth 2.0-Related Constants
 LOCALHOST_IP = '127.0.0.1'
 DEFAULT_OAUTH2_PORT = 8001
 ACCESS_TOKEN_PARAM = 'access_token'
 ERROR_PARAM = 'error'
 OAUTH_DEFAULT_ERROR_MESSAGE = 'OAuth 2.0 error occurred.'
 OAUTH_PATH = '/get-access-token'
 OAUTH_PATH_PORT_TEMPLATE = OAUTH_PATH + '?port=%(port)d'
 AUTH_HANDLER_RESPONSE = """\
@@ skipping 519 matching lines @@
                       "rev1:rev2 range to review already committed changeset.")
 group.add_option("--send_mail", action="store_true",
                  dest="send_mail", default=False,
                  help="Send notification email to reviewers.")
 group.add_option("-p", "--send_patch", action="store_true",
                  dest="send_patch", default=False,
                  help="Same as --send_mail, but include diff as an "
                       "attachment, and prepend email subject with 'PATCH:'.")
 group.add_option("--vcs", action="store", dest="vcs",
                  metavar="VCS", default=None,
-                 help=("Version control system (optional, usually upload.py "
-                       "already guesses the right VCS)."))
+                 help=("Explicitly specify version control system (%s)"
+                       % ", ".join(VCS_SHORT_NAMES)))
 group.add_option("--emulate_svn_auto_props", action="store_true",
                  dest="emulate_svn_auto_props", default=False,
                  help=("Emulate Subversion's auto properties feature."))
 # Git-specific
 group = parser.add_option_group("Git-specific options")
 group.add_option("--git_similarity", action="store", dest="git_similarity",
                  metavar="SIM", type="int", default=50,
                  help=("Set the minimum similarity index for detecting renames "
                        "and copies. See `git diff -C`. (default 50)."))
 group.add_option("--git_no_find_copies", action="store_false", default=True,
@@ skipping 929 matching lines @@
     # 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):
+  def GetFileContent(self, file_hash):
     """Returns the content of a file identified by its git hash."""
     data, retcode = RunShellWithReturnCode(["git", "show", file_hash],
-                                            universal_newlines=not is_binary)
+                                            universal_newlines=False)

[iannucci, 2013/09/19 17:25:20]

isn't universal_newlines=False the default?

[chrisphan, 2013/09/19 17:45:09]

universal_newlines is False on default for popen, but default to True in
RunShellWithReturnCode

     if retcode:
       ErrorExit("Got error status from 'git show %s'" % file_hash)
     return data
 
   def GetBaseFile(self, filename):
     hash_before, hash_after = self.hashes.get(filename, (None,None))
     base_content = None
     new_content = None
     status = None
 
     if filename in self.renames:
       status = "A +"  # Match svn attribute name for renames.
       if filename not in self.hashes:
         # If a rename doesn't change the content, we never get a hash.
         base_content = RunShell(
             ["git", "show", "HEAD:" + filename], silent_ok=True)
     elif not hash_before:
       status = "A"
       base_content = ""
     elif not hash_after:
       status = "D"
     else:
       status = "M"
 
-    is_image = self.IsImage(filename)
-    is_binary = self.IsBinaryData(base_content) or is_image
-
     # Grab the before/after content if we need it.
     # Grab the base content if we don't have it already.
     if base_content is None and hash_before:
-      base_content = self.GetFileContent(hash_before, is_binary)
+      base_content = self.GetFileContent(hash_before)
+
+    is_binary = self.IsImage(filename)
+    if base_content:
+      is_binary = is_binary or self.IsBinaryData(base_content)
+
     # Only include the "after" file if it's an image; otherwise it
     # it is reconstructed from the diff.
-    if is_image and hash_after:
-      new_content = self.GetFileContent(hash_after, is_binary)
-
+    if hash_after:
+      new_content = self.GetFileContent(hash_after)
+      is_binary = is_binary or self.IsBinaryData(new_content)
+      if not is_binary:
+        new_content = None
     return (base_content, new_content, is_binary, status)
 
 
 class CVSVCS(VersionControlSystem):
   """Implementation of the VersionControlSystem interface for CVS."""
 
   def __init__(self, options):
     super(CVSVCS, self).__init__(options)
 
   def GetGUID(self):
@@ skipping 983 matching lines @@
     os.environ['LC_ALL'] = 'C'
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()