From a853bed1930762158d90db980971903afc5ed64e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 24 Mar 2014 08:04:00 +0100 Subject: [PATCH] Reduce number of files send for propose_translation If a single file has changed, all other .pot files are send as well since they have a new timestamp. Check for files that only have a new timestamp and revert their change so that they do not get committed at all. Also, handle Project-Id-Version the same way as the timestamp. Change-Id: I49488d01a7bb9242508ec7d378240449124608de --- .../slave_scripts/propose_translation_update.sh | 16 +++++++++++++--- .../propose_translation_update_manuals.sh | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh index 32b026d068..bbfee0ba1f 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh @@ -59,9 +59,19 @@ fi # Add all changed files to git git add $PROJECT/locale/* -# Don't send a review if the only things which have changed are the creation -# date or comments. -if [ `git diff --cached | egrep -v "(POT-Creation-Date|^[\+\-]#|^\+{3}|^\-{3})" | egrep -c "^[\-\+]"` -gt 0 ] +# Don't send files where the only things that have changed are the +# creation date, the version number or comment lines. +for f in `git diff --cached --name-only` +do + if [ `git diff --cached $f |egrep -v "(POT-Creation-Date|Project-Id-Version|^\+{3}|^\-{3}|^[-+]#)" | egrep -c "^[\-\+]"` -eq 0 ] + then + git reset -q $f + git checkout -- $f + fi +done + +# Don't send a review if nothing has changed. +if [ `git diff --cached |wc -l` -gt 0 ] then # Commit and review git commit -F- <