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

git_cl.py

Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index 244259df3d5b8876c9e353b4d066dcabdba79ba3..a1889cef4b9cf8fbabb732af3a1dea136aa3aa9b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -39,6 +39,7 @@ 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()
@@ -987,6 +988,10 @@ def CMDpresubmit(parser, args):
              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."""
@@ -998,6 +1003,8 @@ def GerritUpload(options, args, cl):
     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)