Don't call settings.GetIsGerrit() before parser.parse_args()

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 1228 matching lines @@
                     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('-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')
+  parser.add_option('--target_branch',
+                    help='When uploading to gerrit, remote branch to ' +

[M-A Ruel, 2012/11/27 14:20:52]

Also no need for + and align the second line at the "=".

[ukai, 2012/11/28 02:25:19]

Done.

+                    'use for CL.  Default: master')
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
+  if options.target_branch and not settings.GetIsGerrit():
+    print >> sys.stderr, (

[M-A Ruel, 2012/11/27 14:20:52]

Use parser.error() instead

[ukai, 2012/11/28 02:25:19]

Done.

+        '\nWARNING: Use --target_branch for non gerrit repository.\n')
+
   # 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')
 
   if is_dirty_git_tree('upload'):
     return 1
@@ skipping 599 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:]))