Mercurial > hg > forks > geeqie
changeset 2649:1636031e5f27
Fixing changelog generation
author | Klaus Ethgen <Klaus@Ethgen.de> |
---|---|
date | Sun, 29 Oct 2017 13:39:18 +0100 |
parents | e083bab50112 |
children | 7ebdebe64f75 |
files | .gitignore .mailmap gen_changelog.sh |
diffstat | 3 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitignore Sat Oct 28 18:17:06 2017 +0100 +++ b/.gitignore Sun Oct 29 13:39:18 2017 +0100 @@ -84,3 +84,5 @@ # That two files are autocreated(!) /src/gq-marshal.[ch] +ChangeLog.html +README.html
--- a/.mailmap Sat Oct 28 18:17:06 2017 +0100 +++ b/.mailmap Sun Oct 29 13:39:18 2017 +0100 @@ -1,6 +1,6 @@ <xsdg@xsdg.org> <xsdg@google.com> -<cclark@mcb.net> <colin.clark@cclark.uk> -Colin Clark <cclark@mcb.net> +<colin.clark@cclark.uk> <cclark@mcb.net> +Colin Clark <colin.clark@cclark.uk> <johne@verizon.net> John Ellis <gqview@users.sf.net> <zas@norz.org> Laurent Monin <geeqie@norz.org> <mschwendt@fedoraproject.org> <mschwendt@gmail.com>
--- a/gen_changelog.sh Sat Oct 28 18:17:06 2017 +0100 +++ b/gen_changelog.sh Sun Oct 29 13:39:18 2017 +0100 @@ -12,7 +12,7 @@ [ ! -x "$(command -v git)" ] && exit 0 tail -6614 ChangeLog > ChangeLog.$$.old && \ -LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ +LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ cat ChangeLog.$$.old >> ChangeLog.$$.new && \ mv -f ChangeLog ChangeLog.bak && \ mv -f ChangeLog.$$.new ChangeLog @@ -20,11 +20,18 @@ rm -f ChangeLog.$$.old -echo "<textarea rows='6615' cols='100'" >ChangeLog.$$.old.html && \ -tail -6618 ChangeLog >> ChangeLog.$$.old.html && \ -echo "</textarea" >>ChangeLog.$$.old.html && \ -LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --date=format:'%Y-%m-%d' --no-follow --pretty=format:"<li><a href=\"http://github.com/BestImageViewer/Geeqie/commit/%H\">view commit </a></li> <para>Author: %an<br>Date: %ad<br><textarea rows=4 cols=100>%s %n%n%b</textarea><br><br></para>" > ChangeLog.$$.new.html && \ -cat ChangeLog.$$.old.html >> ChangeLog.$$.new.html +echo "<textarea rows='6614' cols='100'>" >ChangeLog.$$.old.html && \ +tail -6613 ChangeLog >> ChangeLog.$$.old.html && \ +echo "</textarea>" >>ChangeLog.$$.old.html && \ +echo "<html>" > ChangeLog.$$.new.html && \ +echo "<body>" >> ChangeLog.$$.new.html && \ +echo "<ul>" >> ChangeLog.$$.new.html && \ +LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --date=format:'%Y-%m-%d' --no-follow --use-mailmap --pretty=format:"<li><a href=\"http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commit;h=%H\">view commit </a></li><p>Author: %aN<br>Date: %ad<br><textarea rows=4 cols=100>%s %n%n%b</textarea><br><br></p>" 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD >> ChangeLog.$$.new.html && \ +echo "" >> ChangeLog.$$.new.html && \ +cat ChangeLog.$$.old.html >> ChangeLog.$$.new.html && \ +echo "</ul>" >> ChangeLog.$$.new.html && \ +echo "</body>" >> ChangeLog.$$.new.html && \ +echo "</html>" >> ChangeLog.$$.new.html [ -e ChangeLog.html ] && mv -f ChangeLog.html ChangeLog.html.bak mv -f ChangeLog.$$.new.html ChangeLog.html