When converting -m/--message to -t, make sure to handle the case --message=foo

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 json
@@ skipping 948 matching lines @@
 def RietveldUpload(options, args, cl):
   """upload the patch to rietveld."""
   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')
 
   change_desc = None
 
   if cl.GetIssue():
-    if options.message:
-      upload_args.extend(['--message', options.message])
+    if options.title:
+      upload_args.extend(['--title', options.title])
+    elif options.message:
+      # TODO(rogerta): for now, the -m option will also set the --title option
+      # for upload.py.  Soon this will be changed to set the --message option.
+      # Will wait until people are used to typing -t instead of -m.
+      upload_args.extend(['--title', options.message])
     upload_args.extend(['--issue', cl.GetIssue()])
     print ("This branch is associated with issue %s. "
            "Adding patch to that issue." % cl.GetIssue())
   else:
+    if options.title:
+      upload_args.extend(['--title', options.title])
     message = options.message or CreateDescriptionFromLog(args)
     change_desc = ChangeDescription(message, options.reviewers)
     if not options.force:
       change_desc.Prompt()
     change_desc.ParseDescription()
 
     if change_desc.IsEmpty():
       print "Description is empty; aborting."
       return 1
 
@@ skipping 51 matching lines @@
   return 0
 
 
 @usage('[args to "git diff"]')
 def CMDupload(parser, args):
   """upload the current changelist to codereview"""
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
-  parser.add_option('-m', dest='message', help='message for patch')
+  parser.add_option('-m', dest='message', help='message for patchset')
+  parser.add_option('-t', dest='title', help='title for patchset')
   parser.add_option('-r', '--reviewers',
                     help='reviewer email addresses')
   parser.add_option('--cc',
                     help='cc email addresses')
   parser.add_option('--send-mail', action='store_true',
                     help='send email to reviewer immediately')
   parser.add_option("--emulate_svn_auto_props", action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option("--desc_from_logs", action="store_true",
                     dest="from_logs",
                     help="""Squashes git commit logs into change description and
                             uses message as subject""")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
   if settings.GetIsGerrit():
     parser.add_option('--target_branch', dest='target_branch', default='master',
                       help='target branch to upload')
   (options, args) = parser.parse_args(args)
 
+  # Print warning if the user used the -m/--message argument.  This will soon
+  # change to -t/--title.
+  if options.message:
+    print >> sys.stderr, (
+        '\nWARNING: Use -t or --title to set the title of the patchset.\n'
+        'In the near future, -m or --message will send a message instead.\n'
+        'See http://goo.gl/JGg0Z for details.\n')
+    
   # Make sure index is up-to-date before running diff-index.
   RunGit(['update-index', '--refresh', '-q'], error_ok=True)
   if RunGit(['diff-index', 'HEAD']):
     print 'Cannot upload with a dirty tree.  You must commit locally first.'
     return 1
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
@@ skipping 458 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:]))