Add support for post-dcommit hooks

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 199 matching lines @@
       self.tree_status_url = self._GetConfig('rietveld.tree-status-url',
                                              error_ok=error_ok,
                                              error_message=error_message)
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
       self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
+  def GetRenamedBranch(self, cmd, branch):
+    rename = self._GetConfig('rietveld.rename-after-%s' % cmd,
+                                 error_ok=True)

[M-A Ruel, 2010/12/22 20:28:21]

align either at ( or at +4 from previous line.

[sadrul, 2010/12/22 20:39:50]

Done.

+    if rename:
+      rename = rename.replace('%s', branch)
+    return rename
+
   def _GetConfig(self, param, **kwargs):
     self.LazyUpdateIfNeeded()
     return RunGit(['config', param], **kwargs).strip()
 
 
 settings = Settings()
 
 
 did_migrate_check = False
 def CheckForMigration():
@@ skipping 734 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.
+  success = False

[M-A Ruel, 2010/12/22 20:28:21]

You could use instead;

retcode = 0

and check for retcode at line 1006.

[sadrul, 2010/12/22 20:39:50]

I set retcode = 1 here so that the branch doesn't get renamed in case the
'merge' or 'commit' commands fail (is that possible?) in the try block before
either 'push' or 'dcommit' happens.

   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])
+      success = True
       logging.debug(output)
     else:
       # dcommit the merge branch.
       output = RunGit(['svn', 'dcommit', '--no-rebase'])
+      success = True
+
   finally:
     # And then swap back to the original branch and clean up.
     RunGit(['checkout', '-q', cl.GetBranch()])
     RunGit(['branch', '-D', MERGE_BRANCH])
 
+    if success:
+      rename = settings.GetRenamedBranch(cmd, cl.GetBranch())
+      if rename:
+        RunGit(['branch', '-m', cl.GetBranch(), rename])
+
   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)
@@ skipping 240 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:]))