| | 1 | From f82a2263762a955518e2efb7616f7d58a300819c Mon Sep 17 00:00:00 2001 |
| | 2 | From: Jamie Madill <jmadill@chromium.org> |
| | 3 | Date: Wed, 27 Nov 2013 13:20:27 -0500 |
| | 4 | Subject: [PATCH] Honor commit-msg hook for 'new' and 'edit'. |
| | 5 | |
| | 6 | The commit-msg hook is important for gerrit users, where it |
| | 7 | generates a Change-Id. |
| | 8 | |
| | 9 | Change-Id: Ic1fde9e13e5e903ac8807be37feb7a88a9844dce |
| | 10 | --- |
| | 11 | |
| | 12 | diff --git a/stgit/commands/new.py b/stgit/commands/new.py |
| | 13 | index d5c5382..3328042 100644 |
| | 14 | --- a/stgit/commands/new.py |
| | 15 | +++ b/stgit/commands/new.py |
| | 16 | @@ -20,6 +20,7 @@ |
| | 17 | from stgit.commands import common |
| | 18 | from stgit.lib import git as gitlib, transaction |
| | 19 | from stgit.config import config |
| | 20 | +from stgit.lib import edit |
| | 21 | |
| | 22 | help = 'Create a new, empty patch' |
| | 23 | kind = 'patch' |
| | 24 | @@ -69,6 +70,9 @@ |
| | 25 | author = gitlib.Person.author(), committer = gitlib.Person.committer()) |
| | 26 | cd = common.update_commit_data(cd, options) |
| | 27 | |
| | 28 | + # run the commit-msg hook |
| | 29 | + cd = cd.set_message(edit.run_commit_msg_hook(stack.repository, cd.message)) |
| | 30 | + |
| | 31 | if options.save_template: |
| | 32 | options.save_template(cd.message) |
| | 33 | return utils.STGIT_SUCCESS |
| | 34 | diff --git a/stgit/lib/edit.py b/stgit/lib/edit.py |
| | 35 | index c8d29f6..5993754 100644 |
| | 36 | --- a/stgit/lib/edit.py |
| | 37 | +++ b/stgit/lib/edit.py |
| | 38 | @@ -3,6 +3,31 @@ |
| | 39 | from stgit import utils |
| | 40 | from stgit.commands import common |
| | 41 | from stgit.lib import git |
| | 42 | +from stgit import run |
| | 43 | +from tempfile import NamedTemporaryFile |
| | 44 | +import os |
| | 45 | + |
| | 46 | +def run_commit_msg_hook(repo, message): |
| | 47 | + """Run the commit-msg git hook manually when editing a patch. |
| | 48 | + |
| | 49 | + Return the edited commit message, or the original message if there |
| | 50 | + is no commit-msg hook.""" |
| | 51 | + |
| | 52 | + hook_path = os.path.join(repo.directory, 'hooks', 'commit-msg') |
| | 53 | + |
| | 54 | + if not os.access(hook_path, os.X_OK): |
| | 55 | + return message |
| | 56 | + |
| | 57 | + # message hook exists, make a temporary file and run on the temp file |
| | 58 | + tf = NamedTemporaryFile("w", delete=False) |
| | 59 | + tf.write(message) |
| | 60 | + tf.close() |
| | 61 | + |
| | 62 | + run.Run('bash', hook_path, tf.name).run() |
| | 63 | + new_msg = open(tf.name, 'r').read() |
| | 64 | + os.remove(tf.name) |
| | 65 | + |
| | 66 | + return new_msg |
| | 67 | |
| | 68 | def update_patch_description(repo, cd, text, contains_diff): |
| | 69 | """Update the given L{CommitData<stgit.lib.git.CommitData>} with the |
| | 70 | @@ -19,7 +44,7 @@ |
| | 71 | (git.Date.maybe(authdate), 'set_date')]: |
| | 72 | if val != None: |
| | 73 | a = getattr(a, setter)(val) |
| | 74 | - cd = cd.set_message(message).set_author(a) |
| | 75 | + cd = cd.set_message(run_commit_msg_hook(repo, message)).set_author(a) |
| | 76 | failed_diff = None |
| | 77 | if diff: |
| | 78 | tree = repo.apply(cd.parent.data.tree, diff, quiet = False) |
