Commit a7d677ca authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmlog: add toTAG support

parent d9ec9047
...@@ -11,7 +11,7 @@ load_mod spec rpm git etersoft ...@@ -11,7 +11,7 @@ load_mod spec rpm git etersoft
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
echog "rpmlog - update changelog" echog "rpmlog - update changelog"
echog "Usage: rpmlog [-r|-s|-v] [-l|-t] [SPEC] [TAG]" echog "Usage: rpmlog [-r|-s|-v] [-l|-t] [SPEC] [fromTAG] [toTAG]"
echo echo
echog "Options:" echog "Options:"
echog " -v increment version" echog " -v increment version"
...@@ -56,6 +56,12 @@ if [ -n "$1" ] ; then ...@@ -56,6 +56,12 @@ if [ -n "$1" ] ; then
shift shift
fi fi
TOTAG=HEAD
if [ -n "$1" ] ; then
TOTAG="$1"
shift
fi
if [ ! -r "$SPECNAME" ] ; then if [ ! -r "$SPECNAME" ] ; then
fatal "Spec $SPECNAME does not found" fatal "Spec $SPECNAME does not found"
fi fi
...@@ -65,13 +71,13 @@ fi ...@@ -65,13 +71,13 @@ fi
if [ -z "$FROMTAG" ] ; then if [ -z "$FROMTAG" ] ; then
build_rpms_name $SPECNAME build_rpms_name $SPECNAME
[ -n "$VERSION" ] || fatal "Can't get package version" [ -n "$VERSION" ] || fatal "Can't get package version"
[ -n "$RELEASE" ] || fatal "Can't get package releasr" [ -n "$RELEASE" ] || fatal "Can't get package release"
FROMTAG="$VERSION-$RELEASE" FROMTAG="$VERSION-$RELEASE"
fi fi
# TODO: найти параметр для упрощения истории. пока - sort? # TODO: найти параметр для упрощения истории. пока - sort?
# Делает первую букву маленькой, убирает точку в конце строки # Делает первую букву маленькой, убирает точку в конце строки
CHANGELOG="`git log $FROMTAG..HEAD --simplify-merges --dense --pretty="- %s" | sort -u | sed -e "s|\.\$||g" | sed -e "s|- \([A-Z]\)|- \l\1|g" | sed -e "s|%||g"`" CHANGELOG="`git log $FROMTAG..$TOTAG --simplify-merges --dense --pretty="- %s" | sort -u | sed -e "s|\.\$||g" | sed -e "s|- \([A-Z]\)|- \l\1|g" | sed -e "s|%||g"`"
[ -n "$CHANGELOG" ] || fatal "git log was failed" [ -n "$CHANGELOG" ] || fatal "git log was failed"
if [ -n "$TESTRUN" ] ; then if [ -n "$TESTRUN" ] ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment