diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-08-14 21:30:08 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-08-14 21:30:08 +0200 |
commit | c51cc8d365fad3be529776e9dce34ac115664451 (patch) | |
tree | 222038e2f358c98fba79466ae1c52838cd873933 | |
parent | e64c1d33eb38cbc1fababb0bbaeaa0ff94d0534a (diff) | |
download | devtools32-c51cc8d365fad3be529776e9dce34ac115664451.tar.xz |
Only commit if needed
-rwxr-xr-x | commitpkg | 40 |
1 files changed, 21 insertions, 19 deletions
@@ -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 |