Add support for post-dcommit hooks

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
@@ skipping 11 matching lines @@
 try:
   # Add the parent directory in case it's a depot_tools checkout.
   depot_tools_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
   sys.path.append(depot_tools_path)
   import breakpad
 except ImportError:
   pass
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 PREDCOMMIT_HOOK = '.git/hooks/pre-cl-dcommit'
+POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'

[M-A Ruel, 2011/01/10 19:22:08]

I think you should remove POSTDCOMMIT_HOOK and POSTPUSH_HOO since they are not
used.

[sadrul, 2011/01/10 19:27:50]

Done.

+POSTDCOMMIT_HOOK = POSTUPSTREAM_HOOK_PATTERN % 'dcommit'
+POSTPUSH_HOOK = POSTUPSTREAM_HOOK_PATTERN % 'push'
 PREUPLOAD_HOOK = '.git/hooks/pre-cl-upload'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
 def DieWithError(message):
   print >>sys.stderr, message
   sys.exit(1)
 
 
 def Popen(cmd, **kwargs):
   """Wrapper for subprocess.Popen() that logs and watch for cygwin issues"""
@@ skipping 924 matching lines @@
   # We might be in a directory that's present in this branch but not in the
   # trunk.  Move up to the top of the tree so that git commands that expect a
   # valid CWD won't fail after we check out the merge branch.
   rel_base_path = RunGit(['rev-parse', '--show-cdup']).strip()
   if rel_base_path:
     os.chdir(rel_base_path)
 
   # Stuff our change into the merge branch.
   # We wrap in a try...finally block so if anything goes wrong,
   # we clean up the branches.
+  retcode = -1
   try:
     RunGit(['checkout', '-q', '-b', MERGE_BRANCH, base_branch])
     RunGit(['merge', '--squash', cl.GetBranchRef()])
     if options.contributor:
       RunGit(['commit', '--author', options.contributor, '-m', description])
     else:
       RunGit(['commit', '-m', description])
     if cmd == 'push':
       # push the merge branch.
       remote, branch = cl.FetchUpstreamTuple()
       retcode, output = RunGitWithCode(
           ['push', '--porcelain', remote, 'HEAD:%s' % branch])
       logging.debug(output)
     else:
       # dcommit the merge branch.
-      output = RunGit(['svn', 'dcommit', '--no-rebase'])
+      retcode, output = RunGitWithCode(['svn', 'dcommit', '--no-rebase'])
   finally:
     # And then swap back to the original branch and clean up.
     RunGit(['checkout', '-q', cl.GetBranch()])
     RunGit(['branch', '-D', MERGE_BRANCH])
 
   if cl.GetIssue():
     if cmd == 'dcommit' and 'Committed r' in output:
       revision = re.match('.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
     elif cmd == 'push' and retcode == 0:
       revision = output.splitlines()[1].split('\t')[2].split('..')[1]
     else:
       return 1
     viewvc_url = settings.GetViewVCUrl()
     if viewvc_url and revision:
       cl.description += ('\n\nCommitted: ' + viewvc_url + revision)
     print ('Closing issue '
            '(you may be prompted for your codereview password)...')
     cl.CloseIssue()
     cl.SetIssue(0)
+
+  if retcode == 0:
+    hook = POSTUPSTREAM_HOOK_PATTERN % cmd
+    if os.path.isfile(hook):
+      RunHook(hook, upstream_branch=base_branch, error_ok=True)
+
   return 0
 
 
 @usage('[upstream branch to apply against]')
 def CMDdcommit(parser, args):
   """commit the current changelist via git-svn"""
   if not settings.GetIsGitSvn():
     print('This doesn\'t appear to be an SVN repository.')
     print('Are you sure you didn\'t mean \'git cl push\'?')
     raw_input('[Press enter to dcommit or ctrl-C to quit]')
@@ skipping 226 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              '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__':
   sys.exit(main(sys.argv[1:]))