tools: Update to use 'hasher'

The old 'parser' module used to extract diffs from their surrounding
mbox fluff before hashing this. Seeing as this was only used in the
context of an actual git repo, avoid all of that rigmarole by just using
'git diff', which produces a plain diff, rather than 'git show'.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Tested-by: Tom Rini <trini@konsulko.com>
Closes-bug: #63

diff --git a/tools/patchwork-update-commits b/tools/patchwork-update-commits
index d0f63a93e85d3996ac77bd5bddc8024c07a50d39..61952c08b5337b67c0c6b1b4e57c1bc5a4d6b367 100755 (executable)
--- a/tools/patchwork-update-commits
+++ b/tools/patchwork-update-commits
@@ -29,6 +29,6 @@ fi
 
 git rev-list --reverse "$@" |
 while read commit; do
-    hash=$(git show "$commit" | python $pwpath/parser.py -#)
+    hash=$(git diff "$commit~..$commit" | python $pwpath/hasher.py)
     $pwpath/bin/pwclient update -s Accepted -c "$commit" -h "$hash"
 done

diff --git a/tools/post-receive.hook b/tools/post-receive.hook
index 2fd037f3594c1652637933b8ef2ddac69713ae4e..42de90a3a7c2ded0d1cdae383d2379418ab8d955 100755 (executable)
--- a/tools/post-receive.hook
+++ b/tools/post-receive.hook
@@ -37,7 +37,7 @@ trap "do_exit=1" INT
 
 get_patchwork_hash() {
     local hash
-    hash=$(git show -C $1 | python $PWDIR/parser.py --hash)
+    hash=$(git diff "$1~..$1" | python $PWDIR/hasher.py)
     echo $hash
     test -n "$hash"
 }