Add gerrit Change-Id to commit messages if they do not have one.

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
+import re
 import StringIO
 import stat
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.auto_stub import TestCase
 
 import git_cl
@@ skipping 367 matching lines @@
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
            '-C50', '-l100000', 'master...'],),
          '+dat'),
         ]
 
   @staticmethod
   def _gerrit_upload_calls(description, reviewers):
     calls = [
         ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
-         description),
+         description)
+        ]
+    if not re.search(git_cl.CHANGE_ID_STR, description):
+      calls += [
+          ((['git', 'commit', '-a', '--amend', '-m %s' % description],),
+           '')
+          ]
+    calls += [
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
     receive_pack = '--receive-pack=git receive-pack '
     receive_pack += '--cc=joe@example.com'  # from watch list
     if reviewers:
       receive_pack += ' '
       receive_pack += ' '.join(['--reviewer=' + email for email in reviewers])
     receive_pack += ''
     calls += [
         ((['git', 'push', receive_pack, 'origin', 'HEAD:refs/for/master'],),
          '')
         ]
     return calls
 
-  def _run_gerrit_reviewer_test(
+  def _run_gerrit_upload_test(
       self,
       upload_args,
       description,
       reviewers):
-    """Generic gerrit reviewer test framework."""
+    """Generic gerrit upload test framework."""
     self.calls = self._gerrit_base_calls()
     self.calls += self._gerrit_upload_calls(description, reviewers)
     git_cl.main(['upload'] + upload_args)
 
-  def test_gerrit_no_reviewer(self):
-    self._run_gerrit_reviewer_test(
+  def test_gerrit_upload_without_change_id(self):
+    self._run_gerrit_upload_test(
         [],
         'desc\n\nBUG=\n',
         [])
 
+  def test_gerrit_no_reviewer(self):
+    self._run_gerrit_upload_test(
+        [],
+        'desc\n\nBUG=\nChange-Id:123456789\n',
+        [])
+
   def test_gerrit_reviewers_cmd_line(self):
-    self._run_gerrit_reviewer_test(
+    self._run_gerrit_upload_test(
         ['-r', 'foo@example.com'],
-        'desc\n\nBUG=\n',
+        'desc\n\nBUG=\nChange-Id:123456789',
         ['foo@example.com'])
 
   def test_gerrit_reviewer_multiple(self):
-    self._run_gerrit_reviewer_test(
+    self._run_gerrit_upload_test(
         [],
-        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n',
+        'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
+        'Change-Id:123456789\n',
         ['reviewer@example.com', 'another@example.com'])
 
 
   def test_config_gerrit_download_hook(self):
     self.mock(git_cl, 'FindCodereviewSettingsFile', CodereviewSettingsFileMock)
     def ParseCodereviewSettingsContent(content):
       keyvals = {}
       keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org'
       keyvals['GERRIT_HOST'] = 'gerrit.chromium.org'
       keyvals['GERRIT_PORT'] = '29418'
@@ skipping 42 matching lines @@
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
 
 if __name__ == '__main__':
   unittest.main()