git cl for Gerrit: make --squash generate Change-Id directly.

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 46 matching lines @@
 import subcommand
 import subprocess2
 import watchlists
 
 __version__ = '1.0'
 
 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/UsingGit'
-CHANGE_ID = 'Change-Id:'
 REFS_THAT_ALIAS_TO_OTHER_REFS = {
     'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
     'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
 }
 
 # Valid extensions for files we want to lint.
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
 DEFAULT_LINT_IGNORE_REGEX = r"$^"
 
 # Shortcut since it quickly becomes redundant.
@@ skipping 2124 matching lines @@
     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=%B', '-s', shadow_branch])
     if not message:
       if not options.force:
         change_desc.prompt()
-
-      if CHANGE_ID not in change_desc.description:
-        # Run the commit-msg hook without modifying the head commit by writing
-        # the commit message to a temporary file and running the hook over it,
-        # then reading the file back in.
-        commit_msg_hook = os.path.join(settings.GetRoot(), '.git', 'hooks',
-                                       'commit-msg')
-        file_handle, msg_file = tempfile.mkstemp(text=True,
-                                                 prefix='commit_msg')
-        logging.debug("%s %s", file_handle, msg_file)
-        try:
-          try:
-            try:
-              fileobj = os.fdopen(file_handle, 'w')
-            except OSError:
-              # if fdopen fails, file_handle remains open.
-              # See https://docs.python.org/2/library/os.html#os.fdopen.
-              os.close(file_handle)
-              raise
-            with fileobj:
-              # This will close the file_handle.
-              fileobj.write(change_desc.description)
-            logging.debug("%s %s finish editing", file_handle, msg_file)
-          finally:
-            RunCommand([commit_msg_hook, msg_file])
-            change_desc.set_description(gclient_utils.FileRead(msg_file))
-        finally:
-          os.remove(msg_file)
-
       if not change_desc.description:
         print "Description is empty; aborting."
         return 1
-
       message = change_desc.description
+      change_ids = git_footers.get_footer_change_id(message)
+      if len(change_ids) > 1:
+        DieWithError('too many Change-Id footers in %s branch' % shadow_branch)
+      if not change_ids:
+        message = git_footers.add_footer_change_id(
+            message, GenerateGerritChangeId(message))
+        change_desc.set_description(message)
 
     remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
     if remote is '.':
       # If our upstream branch is local, we base our squashed commit on its
       # squashed version.
       parent = ('refs/heads/git_cl_uploads/' +
                 scm.GIT.ShortBranchName(upstream_branch))
 
       # Verify that the upstream branch has been uploaded too, otherwise Gerrit
       # will create additional CLs when uploading.
@@ skipping 1729 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)