Fix gcl.py to handle new command line argument format of upload.py. gcl.py

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)
+  
+
   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))
 
   upload_arg.extend(args)
 
   desc_file = None
   try:
     if change_info.issue:
       # Uploading a new patchset.
       upload_arg.append("--issue=%d" % change_info.issue)
 
-      if not any(i.startswith('--message') or i.startswith('-m') for i in args):
+      if not any(i.startswith('--title') or i.startswith('-t') for i in args):
         upload_arg.append('--title= ')
     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:
@@ skipping 581 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:]))