commit 0ba7f967e14bc92f825ca55c5b210455019ed233
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jan 11 22:13:58 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jan 11 22:13:58 2011 +0000
tree f656ca854c1840c808c0b26dec4b564c742750dd
parent c76e675fb5b32f4baf9ee41b3f8cd68aba72bc07

Add support for post-dcommit/post-push hooks.

Patch contributed by sadrul@chromium.org

Review URL: http://codereview.chromium.org/5972005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@71097 0039d316-1c4b-4281-b951-d872f2087c98

git_cl/git_cl.py

diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
index b88f27c..46d178a 100644
--- a/git_cl/git_cl.py
+++ b/git_cl/git_cl.py
@@ -29,6 +29,7 @@
 
 DEFAULT_SERVER = 'http://codereview.appspot.com'
 PREDCOMMIT_HOOK = '.git/hooks/pre-cl-dcommit'
+POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 PREUPLOAD_HOOK = '.git/hooks/pre-cl-upload'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
@@ -973,6 +974,7 @@
   # 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()])
@@ -988,7 +990,7 @@
       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()])
@@ -1008,6 +1010,12 @@
            '(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