commitpkg: Provide a commit message template
Generate a message template when omitting the commit message (includes the same subject line that is used if a commit message is specified). Also, use two newlines to separate the subject line from the message body as it looks much clearer that way. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
parent
35fc83ce7d
commit
ee970f0bde
21
commitpkg
21
commitpkg
|
@ -109,11 +109,26 @@ if [ "$1" = "-a" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n 'committing changes to trunk...'
|
echo -n 'committing changes to trunk...'
|
||||||
|
msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)
|
||||||
|
|
||||||
|
"
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
svn commit -q -m "upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)
|
svn commit -q -m "${msgtemplate}${1}" || abort
|
||||||
$1" || abort
|
|
||||||
else
|
else
|
||||||
svn commit -q || abort
|
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
|
fi
|
||||||
echo 'done'
|
echo 'done'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue