Allow special java statements (for example imports) to be as long as neccessary.

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 21 matching lines @@
 import rietveld
 import scm
 import subprocess2
 import watchlists
 
 
 DEFAULT_SERVER = 'https://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingNewGit'
+CHANGE_ID_STR = 'Change-Id:'
 
 
 # Initialized in main()
 settings = None
 
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
 
@@ skipping 928 matching lines @@
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
 
   cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
              may_prompt=False, verbose=options.verbose,
              author=None)
   return 0
 
+def AddChangeIdToCommitMessage(message):
+  git_command = ['commit', '-a', '--amend', '-m %s' % message]
+  RunGit(git_command)
+  print "git-cl: Added Change-Id to commit message."
 
 def GerritUpload(options, args, cl):
   """upload the current branch to gerrit."""
   # We assume the remote called "origin" is the one we want.
   # It is probably not worthwhile to support different workflows.
   remote = 'origin'
   branch = 'master'
   if options.target_branch:
     branch = options.target_branch
 
   log_desc = options.message or CreateDescriptionFromLog(args)
+  if not re.search(CHANGE_ID_STR, log_desc):
+    AddChangeIdToCommitMessage(log_desc)
   if options.reviewers:
     log_desc += '\nR=' + options.reviewers
   change_desc = ChangeDescription(log_desc, options.reviewers)
   change_desc.ParseDescription()
   if change_desc.IsEmpty():
     print "Description is empty; aborting."
     return 1
 
   receive_options = []
   cc = cl.GetCCList().split(',')
@@ skipping 747 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:]))