From c51cc8d365fad3be529776e9dce34ac115664451 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 14 Aug 2011 21:30:08 +0200 Subject: Only commit if needed --- commitpkg | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/commitpkg b/commitpkg index be40344..4d5054b 100755 --- a/commitpkg +++ b/commitpkg @@ -108,29 +108,31 @@ if [ "$1" = "-a" ]; then shift 2 fi -echo -n 'committing changes to trunk...' -msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel) +if [ -n "$(svn status -q)" ]; then + echo -n 'committing changes to trunk...' + msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel) -" -if [ -n "$1" ]; then - svn commit -q -m "${msgtemplate}${1}" || abort -else - msgfile="$(mktemp)" - echo "$msgtemplate" > "$msgfile" - if [ -n "$SVN_EDITOR" ]; then - $SVN_EDITOR "$msgfile" - elif [ -n "$VISUAL" ]; then - $VISUAL "$msgfile" - elif [ -n "$EDITOR" ]; then - $EDITOR "$msgfile" + " + if [ -n "$1" ]; then + svn commit -q -m "${msgtemplate}${1}" || abort else - vi "$msgfile" + msgfile="$(mktemp)" + echo "$msgtemplate" > "$msgfile" + if [ -n "$SVN_EDITOR" ]; then + $SVN_EDITOR "$msgfile" + elif [ -n "$VISUAL" ]; then + $VISUAL "$msgfile" + elif [ -n "$EDITOR" ]; then + $EDITOR "$msgfile" + else + vi "$msgfile" + fi + [ -s "$msgfile" ] || abort + svn commit -q -F "$msgfile" || abort + unlink "$msgfile" fi - [ -s "$msgfile" ] || abort - svn commit -q -F "$msgfile" || abort - unlink "$msgfile" + echo 'done' fi -echo 'done' declare -a uploads -- cgit v1.2.3-70-g09d2