Revert 119066 until we have consensus.

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import logging
@@ skipping 621 matching lines @@
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url', False)
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
-  def __init__(self, log_desc, reviewers):
+  def __init__(self, subject, log_desc, reviewers):
+    self.subject = subject
     self.log_desc = log_desc
     self.reviewers = reviewers
     self.description = self.log_desc
 
-  def Prompt(self):
-    content = """# Enter a description of the change.
+  def Update(self):
+    initial_text = """# Enter a description of the change.
 # This will displayed on the codereview site.
 # The first line will also be used as the subject of the review.
 """
-    content += self.description
+    initial_text += self.description
     if ('\nR=' not in self.description and
         '\nTBR=' not in self.description and
         self.reviewers):
-      content += '\nR=' + self.reviewers
+      initial_text += '\nR=' + self.reviewers
     if '\nBUG=' not in self.description:
-      content += '\nBUG='
+      initial_text += '\nBUG='
     if '\nTEST=' not in self.description:
-      content += '\nTEST='
-    content = content.rstrip('\n') + '\n'
-    content = gclient_utils.RunEditor(content, True)
+      initial_text += '\nTEST='
+    initial_text = initial_text.rstrip('\n') + '\n'
+    content = gclient_utils.RunEditor(initial_text, True)
     if not content:
       DieWithError('Running editor failed')
     content = re.compile(r'^#.*$', re.MULTILINE).sub('', content).strip()
     if not content:
       DieWithError('No CL description, aborting')
-    self.description = content.strip('\n') + '\n'
+    self._ParseDescription(content)
 
-  def ParseDescription(self):
-    """Updates the list of reviewers."""
+  def _ParseDescription(self, description):
+    """Updates the list of reviewers and subject from the description."""
+    if not description:
+      self.description = description
+      return
+
+    self.description = description.strip('\n') + '\n'
+    self.subject = description.split('\n', 1)[0]
     # Retrieves all reviewer lines
     regexp = re.compile(r'^\s*(TBR|R)=(.+)$', re.MULTILINE)
-    reviewers = ','.join(
+    self.reviewers = ','.join(
         i.group(2).strip() for i in regexp.finditer(self.description))
-    if reviewers:
-      self.reviewers = reviewers
 
   def IsEmpty(self):
     return not self.description
 
 
 def FindCodereviewSettingsFile(filename='codereview.settings'):
   """Finds the given file starting in the cwd and going up.
 
   Only looks up to the top of the repository unless an
   'inherit-review-settings-ok' file exists in the root of the repository.
@@ skipping 225 matching lines @@
   env = os.environ.copy()
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
   subprocess2.call(
       ['git', 'diff', '--no-ext-diff', '--stat', '-M'] + args, env=env)
 
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
   upload_args.extend(['--server', cl.GetRietveldServer()])
   if options.emulate_svn_auto_props:
     upload_args.append('--emulate_svn_auto_props')
+  if options.from_logs and not options.message:
+    print 'Must set message for subject line if using desc_from_logs'
+    return 1
 
   change_desc = None
 
   if cl.GetIssue():
     if options.message:
       upload_args.extend(['--message', options.message])
     upload_args.extend(['--issue', cl.GetIssue()])
     print ("This branch is associated with issue %s. "
            "Adding patch to that issue." % cl.GetIssue())
   else:
-    message = options.message or CreateDescriptionFromLog(args)
-    change_desc = ChangeDescription(message, options.reviewers)
-    if not options.force:
-      change_desc.Prompt()
-    change_desc.ParseDescription()
+    log_desc = CreateDescriptionFromLog(args)
+    change_desc = ChangeDescription(options.message, log_desc,
+                                    options.reviewers)
+    if not options.from_logs:
+      change_desc.Update()
 
     if change_desc.IsEmpty():
       print "Description is empty; aborting."
       return 1
 
-    upload_args.extend(['--message', change_desc.description])
+    upload_args.extend(['--message', change_desc.subject])
+    upload_args.extend(['--description', change_desc.description])
     if change_desc.reviewers:
       upload_args.extend(['--reviewers', change_desc.reviewers])
     if options.send_mail:
       if not change_desc.reviewers:
         DieWithError("Must specify reviewers to send email.")
       upload_args.append('--send_mail')
     cc = ','.join(filter(None, (cl.GetCCList(), options.cc)))
     if cc:
       upload_args.extend(['--cc', cc])
 
@@ skipping 465 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))