From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Nov 2012 00:46:01 +0000 (+1100)
Subject: split messag_helper out
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=434a9861e22bd9218ff01e5b5efd60f6f54d2d13;p=next-scripts

split messag_helper out
---

diff --git a/build_msg b/build_msg
index 6cff217..f684d15 100755
--- a/build_msg
+++ b/build_msg
@@ -1,27 +1,9 @@
 #!/bin/bash
 
-log=../merge.log
-[ -f merge.log ] && log=merge.log
-control=../real_control
-[ -f real_control ] && control=real_control
-
-branch=""
-[ "$1" = "-t" ] && {
-        branch=$2
-        shift 2
-}
-
-[ "$branch" ] || {
-	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
-	branch=${branch%%/*}
-}
+subject="build failure after merge of the BRANCH tree"
+body="After merging the BRANCH tree, today's linux-next build ()%0A\
+failed like this:"
 
-contact=$(awk -F '	' '$3=="'"$branch"'" { print $1; }' $control)
-greeting=${contact%% *}
-greeting=${greeting#\"}
-[ "${contact%,*}" = "${contact}" ] || greeting="all"
+$(dirname $0)/message_helper "$@" "$subject" "$body"
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build failure after merge of the $branch tree&Body=Hi $greeting,%0A\
-%0A\
-After merging the $branch tree, today's linux-next build ()%0A\
-failed like this:"
+exit 0
diff --git a/build_warn b/build_warn
index c8108f2..c4d5ed6 100755
--- a/build_warn
+++ b/build_warn
@@ -1,27 +1,9 @@
 #!/bin/bash
 
-log=../merge.log
-[ -f merge.log ] && log=merge.log
-control=../real_control
-[ -f real_control ] && control=real_control
-
-branch=""
-[ "$1" = "-t" ] && {
-        branch=$2
-        shift 2
-}
-
-[ "$branch" ] || {
-	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
-	branch=${branch%%/*}
-}
+subject="build warning after merge of the BRANCH tree"
+body="After merging the BRANCH tree, today's linux-next build ()%0A\
+produced this warning:"
 
-contact=$(awk -F '	' '$3=="'"$branch"'" { print $1; }' $control)
-greeting=${contact%% *}
-greeting=${greeting#\"}
-[ "${contact%,*}" = "${contact}" ] || greeting="all"
+$(dirname $0)/message_helper "$@" "$subject" "$body"
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: build warning after merge of the $branch tree&Body=Hi $greeting,%0A\
-%0A\
-After merging the $branch tree, today's linux-next build ()%0A\
-produced this warning:"
+exit 0
diff --git a/merge_msg b/merge_msg
index e436cd5..626cf94 100755
--- a/merge_msg
+++ b/merge_msg
@@ -1,36 +1,29 @@
 #!/bin/bash
 
-log=../merge.log
-[ -f merge.log ] && log=merge.log
-control=../real_control
-[ -f real_control ] && control=real_control
-
 branch=""
 [ "$1" = "-t" ] && {
-        branch=$2
+        branch="-t $2"
         shift 2
 }
 
-[ "$branch" ] || {
-	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
-	branch=${branch%%/*}
-}
-
-contact=$(awk -F '	' '$3=="'"$branch"'" { print $1; }' $control)
-greeting=${contact%% *}
-greeting=${greeting#\"}
-[ "${contact%,*}" = "${contact}" ] || greeting="all"
-
 file="$*"
 
 gitk --merge -- $file &
 [ "$file" ] && gvim $file
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
-%0A\
-Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree.%0A\
+conf="a conflict"
+[ "$#" -gt 1 ] && {
+	file=${file// /, }
+	file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
+	conf="conflicts"
+}
+
+subject="manual merge of the BRANCH tree with the  tree"
+body="Today's linux-next merge of the BRANCH tree got $conf in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the BRANCH tree.%0A\
 %0A\
 I fixed it up (see below) and can carry the fix as necessary (no action%0A\
 is required)."
 
+$(dirname $0)/message_helper $branch "$subject" "$body"
+
 exit 0
diff --git a/message_helper b/message_helper
new file mode 100755
index 0000000..3d9e80c
--- /dev/null
+++ b/message_helper
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+log=../merge.log
+[ -f merge.log ] && log=merge.log
+control=../real_control
+[ -f real_control ] && control=real_control
+
+branch=""
+[ "$1" = "-t" ] && {
+        branch=$2
+        shift 2
+}
+
+[ "$branch" ] || {
+	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
+	branch=${branch%%/*}
+}
+
+contact=$(awk -F '	' '$3=="'"$branch"'" { print $1; }' $control)
+greeting=${contact%% *}
+greeting=${greeting#\"}
+[ "${contact%,*}" = "${contact}" ] || greeting="all"
+
+subject="${1//BRANCH/$branch}"
+body="${2//BRANCH/$branch}"
+
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: $subject&Body=Hi $greeting,%0A\
+%0A\
+$body"
+
+exit 0