From 3537a7b32dd527c7a13219165aa0ddec80f60fa9 Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Fri, 15 Aug 2014 10:51:58 -0700 Subject: [PATCH] Issue 4051: Improve make-countdown-announcement.sh. * Check for tracker issues missing OWNER or SUMMARY fields. * Convert tabs to spaces in tracker issue summaries. * Add lilypond-issues.csv to .gitignore. * Add Heikki to mailmap. * Update documentation. * Fix typos. --- .gitignore | 1 + Documentation/contributor/issues.itexi | 4 +-- .../auxiliar/make-countdown-announcement.sh | 25 +++++++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3097acfe26..7096f9b3b6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ config.status.lineno configure gcstat*.scm lily-[0-9a-f][0-9a-f][0-9a-f]* +lilypond-issues.csv lsr-unsafe.txt nohup.out out diff --git a/Documentation/contributor/issues.itexi b/Documentation/contributor/issues.itexi index 7cf14faea8..09b049f53c 100644 --- a/Documentation/contributor/issues.itexi +++ b/Documentation/contributor/issues.itexi @@ -891,8 +891,8 @@ deadline date, and optionally your name. Follow the instructions provided: @example -cd $LILYPOND_BUILD_DIR -../scripts/auxiliar/make-countdown-announcement.sh "Jan 1, 2001" James +cd $LILYPOND_GIT +scripts/auxiliar/make-countdown-announcement.sh "Jan 1, 2001" James @end example The script produces an announcement that is easily readable in all diff --git a/scripts/auxiliar/make-countdown-announcement.sh b/scripts/auxiliar/make-countdown-announcement.sh index fe1747f731..4639987665 100755 --- a/scripts/auxiliar/make-countdown-announcement.sh +++ b/scripts/auxiliar/make-countdown-announcement.sh @@ -15,10 +15,10 @@ CSV_FILE=lilypond-issues.csv # comma-separated values TSV_FILE=lilypond-issues.tsv # tab-separated values -URL_BASE="http://code.google.com/p/lilypond/issues" +URL_BASE="https://code.google.com/p/lilypond/issues" QUERY_STR="q=Patch%3Apush%2Ccountdown%2Creview%2Cnew%2Cwaiting&colspec=Patch%20Owner%20ID%20Summary&sort=patch" DEADLINE=$1 -PATCH_MEISTER=${2:-"The Patch Mister"} +PATCH_MEISTER=${2:-"The Patch Meister"} MAILMAP=' "adam.spiers","Adam Spiers" "aleksandr.andreev","Aleksandr Andreev" @@ -40,6 +40,7 @@ MAILMAP=' "graham@percival-music.ca","Graham Percival" "hanwenn","Han-Wen Nienhuys" "hjunes","Heikki Junes" +"ht.lilypond.development","Heikki Tauriainen" "ianhulin44","Ian Hulin" "idragosani","Brett McCoy" "jameselihubailey","James E. Bailey" @@ -161,6 +162,7 @@ fi sed '{ 1d /^$/d +s/\t/ /g s/^"// s/","/\t/g s/",*$// @@ -168,6 +170,25 @@ s/""/"/g }' $CSV_FILE | cut -sf1-4 > $TSV_FILE +ISSUES_WITH_MISSING_FIELDS=`sed -n '/\t\t\|\t$/p' $TSV_FILE | + awk -F"\t" '{ print $3 }'` + +if [ "$ISSUES_WITH_MISSING_FIELDS" ]; then + COUNT=`wc --lines <(echo "$ISSUES_WITH_MISSING_FIELDS") | sed 's/ .*//'` + LINKS_WITH_MISSING_FIELDS=`echo "$ISSUES_WITH_MISSING_FIELDS" | + sed "s!^! $URL_BASE/detail?id=!"` + if [ $COUNT -eq 1 ]; then + echo -e "\nError: The following issue is missing an OWNER or SUMMARY:" >&2 + else + echo -e "\nError: Each of the following issues is missing an OWNER or SUMMARY:" >&2 + fi + echo "$LINKS_WITH_MISSING_FIELDS" >&2 + echo "Please add the missing information in the tracker and start over." >&2 + remove-if-exists $TSV_FILE + exit 1 +fi + + EMAILS_USED=`awk -F"\t" '{ print $2 }' $TSV_FILE | sort --unique` KNOWN_EMAILS=` IFS=$'\n' -- 2.39.2