Reland 77470: Don't ignore first argument in TryChange

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 898 matching lines @@
       return 1
     ErrorExit("You need to install trychange.py to use the try server.")
 
   trychange_args = []
   if change_info:
     trychange_args.extend(['--name', change_info.name])
     if change_info.issue:
       trychange_args.extend(["--issue", str(change_info.issue)])
     if change_info.patchset:
       trychange_args.extend(["--patchset", str(change_info.patchset)])
-    trychange_args.extend(args)
     file_list = change_info.GetFileNames()
   else:
-    trychange_args.extend(args)
     file_list = []
+  trychange_args.extend(args)
   return trychange.TryChange(
       trychange_args,
       file_list=file_list,
       swallow_exception=swallow_exception,
       prog='gcl try',
       extra_epilog='\n'
           'When called from gcl, use the format gcl try <change_name>.\n')
 
 
 @need_change_and_args
@@ skipping 465 matching lines @@
     if e.code != 500:
       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__":
   sys.exit(main(sys.argv[1:]))