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

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 807 matching lines @@
   output = OptionallyDoPresubmitChecks(change_info, False, args)
   if not output.should_continue():
     return 1
   no_watchlists = (FilterFlag(args, "--no_watchlists") or
                    FilterFlag(args, "--no-watchlists"))
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
-  # Replace -m or --message with -t.
-  args = map(lambda a: '-t' if (a == '-m' or a == '--message') else a, args)
-  
+  # Replace -m with -t and --message with --title, but make sure to
+  # preserve anything after the -m/--message.
+  found_deprecated_arg = [False]
+  def replace_message(a):
+    if a.startswith('-m'):
+      found_deprecated_arg[0] = True
+      return '-t' + a[2:]
+    elif a.startswith('--message'):
+      found_deprecated_arg[0] = True
+      return '--title' + a[9:]
+    return a
+  args = map(replace_message, args)
+  if found_deprecated_arg[0]:
+    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')
 
   upload_arg = ["upload.py", "-y"]
   upload_arg.append("--server=%s" % change_info.rietveld)
 
   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))
 
@@ skipping 600 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:]))