Skip to content

Commit

Permalink
Fix: debian-changelog-line-too-long by git log wrapping to 72ch
Browse files Browse the repository at this point in the history 
Signed-off-by: Miroslav Safr <Miroslav.Safr@gmail.com>
  • Loading branch information
@safrm
safrm committed Mar 3, 2014
1 parent 573fd50 commit 7443481
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
40 changes: 20 additions & 20 deletions rpmmake-changelog
View file
Expand Up @@ -30,7 +30,7 @@ while [ $# -gt 0 ]; do
BASENAME=$1 #clone directory has different name than project
;;
-t|--tags) shift
TAGS_COUNT=$1
TAGS_COUNT=$1
;;
-a | --append-line) shift
APPEND_LINE=$1
Expand All @@ -40,12 +40,12 @@ while [ $# -gt 0 ]; do
;;
-V | --version) echo "$RPMMAKE_CHL ${VERSION} ${VERSION_DATE}"
exit 0
;;
-h | --help ) usage
;;
-h | --help ) usage
exit 0
;;
;;
* ) PWD_DIR=$PWD; cd $1 #from different directory
;;
;;
esac
shift
done
Expand All @@ -69,39 +69,39 @@ HIGHER_TAG_HASH=
for TAG in $TAGS
do
#not tagged changes
TAG_HASH=`git rev-list $TAG | head -n 1`
TAG_HASH=`git rev-list $TAG | head -n 1`
if [ -z "$FIRST_TAG" ]; then
FIRST_TAG=$TAG
echo "first tag: $FIRST_TAG - $TAG_HASH"
echo "first tag: $FIRST_TAG - $TAG_HASH"
HEAD_VERSION_COMMITS=`git log $TAG_HASH..HEAD --pretty=format:'- %s' 2> /dev/null`
HEAD_VERSION_TAG=`git describe --tags --dirty=* 2> /dev/null`
LAST_COMMIT_DATE=`git log -1 --pretty=format:'%ad' | awk '{print $1,$2,$3,$5}'`
LAST_COMMIT_AUTHOR=`git log -1 --pretty=format:'%an <%ae>'`
if [ ! -z "$HEAD_VERSION_COMMITS" ]; then
if [ ! -z "$HEAD_VERSION_COMMITS" ]; then
if [ -z "$RPM_VERSION" ]; then
#we use last tag + git hash
echo "* $LAST_COMMIT_DATE $LAST_COMMIT_AUTHOR - $HEAD_VERSION_TAG" >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:'- %s' 2> /dev/null >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:'- %w(72,1,2)%s' 2> /dev/null >> $CHANGES_FILE
echo "\n" >> $CHANGES_FILE
else
#we use given version
echo "* $LAST_COMMIT_DATE $LAST_COMMIT_AUTHOR - $RPM_VERSION" >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:'- %s' 2> /dev/null >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:'- %w(72,1,2)%s' 2> /dev/null >> $CHANGES_FILE
fi
fi
fi
if [ ! -z "$HIGHER_TAG_HASH" ]; then
#tag changes for each tag
TAG_COMMIT_DATE=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%ad' | awk '{print $1,$2,$3,$5}'`
TAG_COMMIT_DATE=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%ad' | awk '{print $1,$2,$3,$5}'`
TAG_COMMIT_AUTHOR=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%an <%ae>'`
if [ ! -z "$HEAD_VERSION_COMMITS" -a "x$HIGHER_TAG" = "x$DEB_VERSION" ]; then
:
else
#we don't repeat highest version 2x
echo "* $TAG_COMMIT_DATE $TAG_COMMIT_AUTHOR - $HIGHER_TAG" >> $CHANGES_FILE
echo "* $TAG_COMMIT_DATE $TAG_COMMIT_AUTHOR - $HIGHER_TAG" >> $CHANGES_FILE
fi
git log $TAG_HASH..$HIGHER_TAG_HASH --pretty=format:'- %s' >> $CHANGES_FILE
echo "\n" >> $CHANGES_FILE
git log $TAG_HASH..$HIGHER_TAG_HASH --pretty=format:'- %w(72,1,2)%s' >> $CHANGES_FILE
echo "\n" >> $CHANGES_FILE
fi
HIGHER_TAG=$TAG
HIGHER_TAG_HASH=$TAG_HASH
Expand All @@ -111,7 +111,7 @@ done
if [ `echo "$TAGS" | wc -l` -lt $TAGS_COUNT ]; then
BEFORE_FIRST_TAG_COMMITS=`git log $TAG_HASH --pretty=format:'- %s' 2> /dev/null`
if [ ! -z "$BEFORE_FIRST_TAG_COMMITS" ]; then
TAG_COMMIT_DATE=`git log $TAG_HASH -1 --pretty=format:'%ad' | awk '{print $1,$2,$3,$5}'`
TAG_COMMIT_DATE=`git log $TAG_HASH -1 --pretty=format:'%ad' | awk '{print $1,$2,$3,$5}'`
TAG_COMMIT_AUTHOR=`git log $TAG_HASH -1 --pretty=format:'%an <%ae>'`
#when there are no tags
if [ -z "$TAGS" ]; then
Expand All @@ -122,13 +122,13 @@ if [ `echo "$TAGS" | wc -l` -lt $TAGS_COUNT ]; then
RPM_VERSION=0.0.0
fi
echo "* `date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> - $RPM_VERSION" >> $CHANGES_FILE
else
echo "* $TAG_COMMIT_DATE $TAG_COMMIT_AUTHOR - $TAG" >> $CHANGES_FILE
else
echo "* $TAG_COMMIT_DATE $TAG_COMMIT_AUTHOR - $TAG" >> $CHANGES_FILE
fi
git log $TAG_HASH --pretty=format:'- %s' >> $CHANGES_FILE
echo "\n" >> $CHANGES_FILE
git log $TAG_HASH --pretty=format:'- %w(72,1,2)%s' >> $CHANGES_FILE
echo "\n" >> $CHANGES_FILE
fi
fi
fi
#extra line
if [ ! -z "$APPEND_LINE" ]; then
echo $APPEND_LINE >> $CHANGES_FILE
Expand Down
40 changes: 20 additions & 20 deletions rpmmake-debchangelog
View file
Expand Up @@ -31,7 +31,7 @@ while [ $# -gt 0 ]; do
CUSTOM_BASENAME=$1 #clone directory has different name than project
;;
-t|--tags) shift
TAGS_COUNT=$1
TAGS_COUNT=$1
;;
-d | --distro) shift
DISTRO=$1
Expand All @@ -44,12 +44,12 @@ while [ $# -gt 0 ]; do
;;
-V | --version) echo "$RPMMAKE_DCHL ${VERSION} ${VERSION_DATE}"
exit 0
;;
-h | --help ) usage
;;
-h | --help ) usage
exit 0
;;
;;
* ) PWD_DIR=$PWD; cd $1 #from different directory
;;
;;
esac
shift
done
Expand Down Expand Up @@ -81,40 +81,40 @@ HIGHER_TAG_HASH=
for TAG in $TAGS
do
#not tagged changes
TAG_HASH=`git rev-list $TAG | head -n 1`
TAG_HASH=`git rev-list $TAG | head -n 1`
if [ -z "$FIRST_TAG" ]; then
FIRST_TAG=$TAG
echo "first tag: $FIRST_TAG - $TAG_HASH"
echo "first tag: $FIRST_TAG - $TAG_HASH"
HEAD_VERSION_COMMITS=`git log $TAG_HASH..HEAD --pretty=format:'- %s' 2> /dev/null`
#this we need in 1.0.1-2 format
HEAD_VERSION_TAG=`git describe --tags 2> /dev/null | sed 's/-[^-]\+$//'`
HEAD_VERSION_TAG=`git describe --tags 2> /dev/null | sed 's/-[^-]\+$//'`
LAST_COMMIT_DATE=`git log -1 --pretty=format:'%ad' --date=rfc`
LAST_COMMIT_AUTHOR=`git log -1 --pretty=format:'%an <%ae>'`
if [ ! -z "$HEAD_VERSION_COMMITS" ]; then
if [ -z "$DEB_VERSION" ]; then
#we use last tag + git hash
echo "$BASENAME ($HEAD_VERSION_TAG) $DISTRO; urgency=low" >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:' * %s' 2> /dev/null >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:' * %w(72,1,2)%s' 2> /dev/null >> $CHANGES_FILE
echo "\n -- $LAST_COMMIT_AUTHOR $LAST_COMMIT_DATE\n" >> $CHANGES_FILE
else
#we use given version
echo "$BASENAME ($DEB_VERSION) $DISTRO; urgency=low" >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:' * %s' 2> /dev/null >> $CHANGES_FILE
git log $TAG_HASH..HEAD --pretty=format:' * %w(72,1,2)%s' 2> /dev/null >> $CHANGES_FILE
echo "\n -- $LAST_COMMIT_AUTHOR $LAST_COMMIT_DATE\n" >> $CHANGES_FILE
fi
fi
fi
if [ ! -z "$HIGHER_TAG_HASH" ]; then
#tag changes for each tag
TAG_COMMIT_DATE=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%ad' --date=rfc`
TAG_COMMIT_DATE=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%ad' --date=rfc`
TAG_COMMIT_AUTHOR=`git log $HIGHER_TAG_HASH -1 --pretty=format:'%an <%ae>'`
if [ ! -z "$HEAD_VERSION_COMMITS" -a "x$HIGHER_TAG" = "x$DEB_VERSION" ]; then
:
else
echo "$BASENAME ($HIGHER_TAG) $DISTRO; urgency=low" >> $CHANGES_FILE
echo "$BASENAME ($HIGHER_TAG) $DISTRO; urgency=low" >> $CHANGES_FILE
fi
git log $TAG_HASH..$HIGHER_TAG_HASH --pretty=format:' * %s' >> $CHANGES_FILE
echo "\n -- $TAG_COMMIT_AUTHOR $TAG_COMMIT_DATE\n" >> $CHANGES_FILE
git log $TAG_HASH..$HIGHER_TAG_HASH --pretty=format:' * %w(72,1,2)%s' >> $CHANGES_FILE
echo "\n -- $TAG_COMMIT_AUTHOR $TAG_COMMIT_DATE\n" >> $CHANGES_FILE
fi
HIGHER_TAG=$TAG
HIGHER_TAG_HASH=$TAG_HASH
Expand All @@ -124,23 +124,23 @@ done
if [ `echo "$TAGS" | wc -l` -lt $TAGS_COUNT ]; then
BEFORE_FIRST_TAG_COMMITS=`git log $TAG_HASH --pretty=format:'- %s' 2> /dev/null`
if [ ! -z "$BEFORE_FIRST_TAG_COMMITS" ]; then
TAG_COMMIT_DATE=`git log $TAG_HASH -1 --pretty=format:'%ad' --date=rfc`
TAG_COMMIT_DATE=`git log $TAG_HASH -1 --pretty=format:'%ad' --date=rfc`
TAG_COMMIT_AUTHOR=`git log $TAG_HASH -1 --pretty=format:'%an <%ae>'`
#when there are no tags
if [ -z "$TAGS" ]; then
echo "There are no tags."
if [ -z "$DEB_VERSION" ]; then
DEB_VERSION=0.0.0
fi
echo "$BASENAME ($DEB_VERSION) $DISTRO; urgency=low" >> $CHANGES_FILE
echo "$BASENAME ($DEB_VERSION) $DISTRO; urgency=low" >> $CHANGES_FILE
#simulate new tag for printout
TAG_COMMIT_AUTHOR="`git config user.name` <`git config user.email`>"
TAG_COMMIT_DATE=`date -R`
else
echo "$BASENAME ($TAG) $DISTRO; urgency=low" >> $CHANGES_FILE
else
echo "$BASENAME ($TAG) $DISTRO; urgency=low" >> $CHANGES_FILE
fi
git log $TAG_HASH --pretty=format:' * %s' >> $CHANGES_FILE
echo "\n -- $TAG_COMMIT_AUTHOR $TAG_COMMIT_DATE\n" >> $CHANGES_FILE
git log $TAG_HASH --pretty=format:' * %w(72,1,2)%s' >> $CHANGES_FILE
echo "\n -- $TAG_COMMIT_AUTHOR $TAG_COMMIT_DATE\n" >> $CHANGES_FILE
fi
fi

Expand Down

0 comments on commit 7443481

Please sign in to comment.