git cl upload: commit subject is default patchset title

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 926 matching lines @@
         new_content: For text files, this is empty.  For binary files, this is
           the contents of the new file, since the diff output won't contain
           information to reconstruct the current file.
         is_binary: True iff the file is binary.
         status: The status of the file.
     """
 
     raise NotImplementedError(
         "abstract method -- subclass %s must override" % self.__class__)
 
-
   def GetBaseFiles(self, diff):
     """Helper that calls GetBase file for each file in the patch.
 
     Returns:
       A dictionary that maps from filename to GetBaseFile's tuple.  Filenames
       are retrieved based on lines that start with "Index:" or
       "Property changes on:".
     """
     files = {}
     for line in diff.splitlines(True):
       if line.startswith('Index:') or line.startswith('Property changes on:'):
         unused, filename = line.split(':', 1)
         # On Windows if a file has property changes its filename uses '\'
         # instead of '/'.
         filename = filename.strip().replace('\\', '/')
         files[filename] = self.GetBaseFile(filename)
     return files
 
-
   def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options,
                       files):
     """Uploads the base files (and if necessary, the current ones as well)."""
 
     def UploadFile(filename, file_id, content, is_binary, status, is_base):
       """Uploads a file to the server."""
       file_too_large = False
       if is_base:
         type = "base"
       else:
@@ skipping 49 matching lines @@
             file_id, base_content, is_binary, status, True))
         threads.append(t)
       if new_content != None:
         t = thread_pool.apply_async(UploadFile, args=(filename,
             file_id, new_content, is_binary, status, False))
         threads.append(t)
 
     for t in threads:
       print t.get(timeout=60)
 
-
   def IsImage(self, filename):
     """Returns true if the filename has an image extension."""
     mimetype =  mimetypes.guess_type(filename)[0]
     if not mimetype:
       return False
     return (mimetype.startswith("image/") and
             not mimetype.startswith("image/svg"))
 
   def IsBinaryData(self, data):
     """Returns true if data contains a null byte."""
     # Derived from how Mercurial's heuristic, see
     # http://selenic.com/hg/file/848a6658069e/mercurial/util.py#l229
     return bool(data and "\0" in data)
 
+  def GetMostRecentCommitSummary(self):
+    """Returns a one line summary of the current commit."""
+    return ""
+
 
 class SubversionVCS(VersionControlSystem):
   """Implementation of the VersionControlSystem interface for Subversion."""
 
   def __init__(self, options):
     super(SubversionVCS, self).__init__(options)
     if self.options.revision:
       match = re.match(r"(\d+)(:(\d+))?", self.options.revision)
       if not match:
         ErrorExit("Invalid Subversion revision %s." % self.options.revision)
@@ skipping 443 matching lines @@
 
     # Only include the "after" file if it's an image; otherwise it
     # it is reconstructed from the diff.
     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)
 
+  def GetMostRecentCommitSummary(self):
+    return RunShell(["git", "log", "-1", "--format=%s"], silent_ok=True).strip()
+
 
 class CVSVCS(VersionControlSystem):
   """Implementation of the VersionControlSystem interface for CVS."""
 
   def __init__(self, options):
     super(CVSVCS, self).__init__(options)
 
   def GetGUID(self):
     """For now we don't know how to get repository ID for CVS"""
     return
@@ skipping 904 matching lines @@
 
   # Process --message, --title and --file.
   message = options.message or ""
   title = options.title or ""
   if options.file:
     if options.message:
       ErrorExit("Can't specify both message and message file options")
     file = open(options.file, 'r')
     message = file.read()
     file.close()
-  if options.issue:
-    prompt = "Title describing this patch set: "
-  else:
-    prompt = "New issue subject: "
-  title = (
-      title or message.split('\n', 1)[0].strip() or raw_input(prompt).strip())
+  title = title or message.split('\n', 1)[0].strip()
+  if not title:
+    if options.issue:
+      prompt = "Title describing this patch set"
+    else:
+      prompt = "New issue subject"
+    title_default = vcs.GetMostRecentCommitSummary()
+    if title_default:
+      prompt += " [%s]" % title_default
+    title = raw_input(prompt + ": ").strip() or title_default
   if not title and not options.issue:
     ErrorExit("A non-empty title is required for a new issue")
   # For existing issues, it's fine to give a patchset an empty name. Rietveld
   # doesn't accept that so use a whitespace.
   title = title or " "
   if len(title) > 100:
     title = title[:99] + '…'
   if title and not options.issue:
     message = message or title
 
@@ skipping 81 matching lines @@
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
   except auth.AuthenticationError as e:
     print >> sys.stderr, e
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()