diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-02 19:46:12 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-02 19:52:31 +0000 |
commit | 333ca78f192d129e600889dc2b0381cd829b00fb (patch) | |
tree | c1b55fa4e21f0c7aa3e8903a4e46b048d3e4738f | |
parent | ae40500269059a24caaf390ebbc45de458960657 (diff) |
update commit-msg hook to the one from gerrit 2.7
the main change is that the worker code was rewritten in awk instead of
perl.
Change-Id: I57b8c887eec00c4baf92f96d366a5e91efb07dee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rwxr-xr-x | git-hooks/gerrit_commit_msg_hook | 147 |
1 files changed, 109 insertions, 38 deletions
diff --git a/git-hooks/gerrit_commit_msg_hook b/git-hooks/gerrit_commit_msg_hook index f841e09..9e69c52 100755 --- a/git-hooks/gerrit_commit_msg_hook +++ b/git-hooks/gerrit_commit_msg_hook @@ -1,10 +1,9 @@ #!/bin/sh -# From Gerrit Code Review V2.2.1-NQT-012 +# From Gerrit Code Review V2.7-117 # # Part of Gerrit Code Review (http://code.google.com/p/gerrit/) # # Copyright (C) 2009 The Android Open Source Project -# Copyright (C) 2015 The Qt Company Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,6 +18,8 @@ # limitations under the License. # +unset GREP_OPTIONS + CHANGE_ID_AFTER="Bug|Issue|Task-number" MSG="$1" @@ -38,56 +39,126 @@ add_ChangeId() { return fi + # Does Change-Id: already exist? if so, exit (no change). if grep -i '^Change-Id:' "$MSG" >/dev/null then return fi id=`_gen_ChangeId` - perl -e ' - $MSG = shift; - $id = shift; - $CHANGE_ID_AFTER = shift; - - undef $/; - open(I, $MSG); $_ = <I>; close I; - s|^diff --git a/.*||ms; - s|^#.*$||mg; - exit unless $_; - - @message = split /\n/; - $haveFooter = 0; - $startFooter = @message; - for($line = @message - 1; $line >= 1; $line--) { - $_ = $message[$line]; - - if (/^[a-zA-Z0-9-]+:/ && !m,^[a-z0-9-]+://,) { - $haveFooter++; - next; - } - next if /^[ []/; - $startFooter = $line if ($haveFooter && /^\r?$/); - last; + T="$MSG.tmp.$$" + AWK=awk + if [ -x /usr/xpg4/bin/awk ]; then + # Solaris AWK is just too broken + AWK=/usr/xpg4/bin/awk + fi + + # How this works: + # - parse the commit message as (textLine+ blankLine*)* + # - assume textLine+ to be a footer until proven otherwise + # - exception: the first block is not footer (as it is the title) + # - read textLine+ into a variable + # - then count blankLines + # - once the next textLine appears, print textLine+ blankLine* as these + # aren't footer + # - in END, the last textLine+ block is available for footer parsing + $AWK ' + BEGIN { + # while we start with the assumption that textLine+ + # is a footer, the first block is not. + isFooter = 0 + footerComment = 0 + blankLines = 0 + } + + # Skip lines starting with "#" without any spaces before it. + /^#/ { next } + + # Skip the line starting with the diff command and everything after it, + # up to the end of the file, assuming it is only patch data. + # If more than one line before the diff was empty, strip all but one. + /^diff --git a/ { + blankLines = 0 + while (getline) { } + next + } + + # Count blank lines outside footer comments + /^$/ && (footerComment == 0) { + blankLines++ + next + } + + # Catch footer comment + /^\[[a-zA-Z0-9-]+:/ && (isFooter == 1) { + footerComment = 1 + } + + /]$/ && (footerComment == 1) { + footerComment = 2 + } + + # We have a non-blank line after blank lines. Handle this. + (blankLines > 0) { + print lines + for (i = 0; i < blankLines; i++) { + print "" } - @footer = @message[$startFooter+1..@message]; - @message = @message[0..$startFooter]; - push(@footer, "") unless @footer; + lines = "" + blankLines = 0 + isFooter = 1 + footerComment = 0 + } - for ($line = 0; $line < @footer; $line++) { - $_ = $footer[$line]; - next if /^($CHANGE_ID_AFTER):/i; - last; + # Detect that the current block is not the footer + (footerComment == 0) && (!/^\[?[a-zA-Z0-9-]+:/ || /^[a-zA-Z0-9-]+:\/\//) { + isFooter = 0 + } + + { + # We need this information about the current last comment line + if (footerComment == 2) { + footerComment = 0 + } + if (lines != "") { + lines = lines "\n"; } - splice(@footer, $line, 0, "Change-Id: I$id"); + lines = lines $0 + } - $_ = join("\n", @message, @footer); - open(O, ">$MSG"); print O; close O; - ' "$MSG" "$id" "$CHANGE_ID_AFTER" + # Footer handling: + # If the last block is considered a footer, splice in the Change-Id at the + # right place. + # Look for the right place to inject Change-Id by considering + # CHANGE_ID_AFTER. Keys listed in it (case insensitive) come first, + # then Change-Id, then everything else (eg. Signed-off-by:). + # + # Otherwise just print the last block, a new line and the Change-Id as a + # block of its own. + END { + unprinted = 1 + if (isFooter == 0) { + print lines "\n" + lines = "" + } + changeIdAfter = "^(" tolower("'"$CHANGE_ID_AFTER"'") "):" + numlines = split(lines, footer, "\n") + for (line = 1; line <= numlines; line++) { + if (unprinted && match(tolower(footer[line]), changeIdAfter) != 1) { + unprinted = 0 + print "Change-Id: I'"$id"'" + } + print footer[line] + } + if (unprinted) { + print "Change-Id: I'"$id"'" + } + }' "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T" } _gen_ChangeIdInput() { echo "tree `git write-tree`" - if parent=`git rev-parse HEAD^0 2>/dev/null` + if parent=`git rev-parse "HEAD^0" 2>/dev/null` then echo "parent $parent" fi |