Abort if a patch set title is provided for a Gerrit server

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."""
 
 from distutils.version import LooseVersion
@@ skipping 1609 matching lines @@
   print
 
   if not dependents:
     print 'There are no dependent local branches for %s' % root_branch
     return 0
 
   print ('This command will checkout all dependent branches and run '
          '"git cl upload".')
   ask_for_data('[Press enter to continue or ctrl-C to quit]')
 
-  # Add a default patchset title to all upload calls.
-  args.extend(['-t', 'Updated patchset dependency'])
+  # Add a default patchset title to all upload calls in Rietveld.
+  if not settings.GetIsGerrit():
+    args.extend(['-t', 'Updated patchset dependency'])
+
   # Record all dependents that failed to upload.
   failures = {}
   # Go through all dependents, checkout the branch and upload.
   try:
     for dependent_branch in dependents:
       print
       print '--------------------------------------'
       print 'Running "git cl upload" from %s:' % dependent_branch
       RunGit(['checkout', '-q', dependent_branch])
       print
@@ skipping 361 matching lines @@
   # It is probably not worthwhile to support different workflows.
   gerrit_remote = 'origin'
 
   remote, remote_branch = cl.GetRemoteBranch()
   branch = GetTargetRef(remote, remote_branch, options.target_branch,
                         pending_prefix='')
 
   change_desc = ChangeDescription(
       options.message or CreateDescriptionFromLog(args))
   if not change_desc.description:
-    print "Description is empty; aborting."
+    print "\nDescription is empty. Aborting..."
+    return 1
+
+  if options.title:
+    print "\nPatch titles (-t) are not supported in Gerrit. Aborting..."
     return 1
 
   if options.squash:
     # Try to get the message from a previous upload.
     shadow_branch = 'refs/heads/git_cl_uploads/' + cl.GetBranch()
     message = RunGitSilent(['show', '--format=%s\n\n%b', '-s', shadow_branch])
     if not message:
       if not options.force:
         change_desc.prompt()
 
@@ skipping 320 matching lines @@
   Can also set the above globally by using the --global flag.
   """
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('--bypass-watchlists', action='store_true',
                     dest='bypass_watchlists',
                     help='bypass watchlists auto CC-ing reviewers')
   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 patchset')
-  parser.add_option('-t', dest='title', help='title for patchset')
+  parser.add_option('-t', dest='title',
+                    help='title for patchset (Rietveld only)')
   parser.add_option('-r', '--reviewers',
                     action='append', default=[],
                     help='reviewer email addresses')
   parser.add_option('--cc',
                     action='append', default=[],
                     help='cc email addresses')
   parser.add_option('-s', '--send-mail', action='store_true',
                     help='send email to reviewer immediately')
   parser.add_option('--emulate_svn_auto_props',
                     '--emulate-svn-auto-props',
@@ skipping 1350 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)