Revert 119066 until we have consensus.

gcl.py

 #!/usr/bin/env python
 # 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 267 matching lines @@
   """
   # Kept for unit test support. This is for the old format, it's deprecated.
   SEPARATOR = "\n-----\n"
 
   def __init__(self, name, issue, patchset, description, files, local_root,
                rietveld_url, needs_upload):
     self.name = name
     self.issue = int(issue)
     self.patchset = int(patchset)
     self._description = None
+    self._subject = None
     self._reviewers = None
     self._set_description(description)
     if files is None:
       files = []
     self._files = files
     self.patch = None
     self._local_root = local_root
     self.needs_upload = needs_upload
     self.rietveld = gclient_utils.UpgradeToHttps(
         rietveld_url or GetCodeReviewSetting('CODE_REVIEW_SERVER'))
     self._rpc_server = None
 
   def _get_description(self):
     return self._description
 
   def _set_description(self, description):
     # TODO(dpranke): Cloned from git_cl.py. These should be shared.
     if not description:
       self._description = description
       return
 
     parsed_lines = []
     reviewers_re = re.compile(REVIEWERS_REGEX)
     reviewers = ''
+    subject = ''
     for l in description.splitlines():
+      if not subject:
+        subject = l
       matched_reviewers = reviewers_re.match(l)
       if matched_reviewers:
         reviewers = matched_reviewers.group(1).split(',')
       parsed_lines.append(l)
+
+    if len(subject) > 100:
+      subject = subject[:97] + '...'
+
+    self._subject = subject
     self._reviewers = reviewers
     self._description = '\n'.join(parsed_lines)
 
   description = property(_get_description, _set_description)
 
   @property
   def reviewers(self):
     return self._reviewers
 
+  @property
+  def subject(self):
+    return self._subject
+
   def NeedsUpload(self):
     return self.needs_upload
 
   def GetFileNames(self):
     """Returns the list of file names included in this change."""
     return [f[1] for f in self._files]
 
   def GetFiles(self):
     """Returns the list of files included in this change with their status."""
     return self._files
@@ skipping 503 matching lines @@
   reviewers = change_info.reviewers or output.reviewers
   if (reviewers and
       not any(arg.startswith('-r') or arg.startswith('--reviewer') for
               arg in args)):
     upload_arg.append('--reviewers=%s' % ','.join(reviewers))
 
   upload_arg.extend(args)
 
   desc_file = None
   try:
-    if change_info.issue:
-      # Uploading a new patchset.
+    if change_info.issue:  # Uploading a new patchset.
+      found_message = False
+      for arg in args:
+        if arg.startswith("--message") or arg.startswith("-m"):
+          found_message = True
+          break
+
+      if not found_message:
+        upload_arg.append("--message=''")
+
       upload_arg.append("--issue=%d" % change_info.issue)
-    else:
-      # First time we upload.
+    else: # First time we upload.
       handle, desc_file = tempfile.mkstemp(text=True)
       os.write(handle, change_info.description)
       os.close(handle)
 
       # Watchlist processing -- CC people interested in this changeset
       # http://dev.chromium.org/developers/contributing-code/watchlists
       if not no_watchlists:
         import watchlists
         watchlist = watchlists.Watchlists(change_info.GetLocalRoot())
         watchers = watchlist.GetWatchersForPaths(change_info.GetFileNames())
 
       cc_list = GetCodeReviewSetting("CC_LIST")
       if not no_watchlists and watchers:
         # Filter out all empty elements and join by ','
         cc_list = ','.join(filter(None, [cc_list] + watchers))
       if cc_list:
         upload_arg.append("--cc=" + cc_list)
-      upload_arg.append("--file=%s" % desc_file)
+      upload_arg.append("--description_file=%s" % desc_file)
+      if change_info.subject:
+        upload_arg.append("--message=" + change_info.subject)
 
       if GetCodeReviewSetting("PRIVATE") == "True":
         upload_arg.append("--private")
 
     # If we have a lot of files with long paths, then we won't be able to fit
     # the command to "svn diff".  Instead, we generate the diff manually for
     # each file and concatenate them before passing it to upload.py.
     if change_info.patch is None:
       change_info.patch = GenerateDiff(change_info.GetFileNames())
 
@@ skipping 558 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))