couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Davis <paul.joseph.da...@gmail.com>
Subject Re: git commit: Automate maintenance of the THANKS file
Date Sun, 17 Jun 2012 19:29:27 GMT
I'm not sure I like this so much. Playing around with it, its a bit
prone to screw ups. It also breaks if AUTHORS.gz exists before you
pull in new commits. We could solve that by forcing it to build every
time but that's a bit of a hack for not much gain.

Its also got Benoit in there twice since he made commits with slightly
different author/committer names which also seems awkward.

On Sun, Jun 17, 2012 at 1:29 PM,  <jan@apache.org> wrote:
> Updated Branches:
>  refs/heads/master 9514ed3f5 -> 7646794ea
>
>
> Automate maintenance of the THANKS file
>
> THANKS now is automatically maintained for you. It uses git author
> data to append people who submitted patches in the past.
>
> For non-commit THANKS, you can still manually edit this file.
>
> This commit removes from the THANKS file the people that appear
> as git commit authors since we started committing them after
> commit 6c976bd. These removed entries get automatically re-
> added by `make`.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7646794e
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7646794e
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7646794e
>
> Branch: refs/heads/master
> Commit: 7646794ea7a30d41a64c873d8b27ae830397d94a
> Parents: 9514ed3
> Author: Jan Lehnardt <jan@apache.org>
> Authored: Sun Jun 17 20:06:21 2012 +0200
> Committer: Jan Lehnardt <jan@apache.org>
> Committed: Sun Jun 17 20:11:31 2012 +0200
>
> ----------------------------------------------------------------------
>  Makefile.am |   10 +++++++++-
>  THANKS      |   13 +++++--------
>  2 files changed, 14 insertions(+), 9 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/7646794e/Makefile.am
> ----------------------------------------------------------------------
> diff --git a/Makefile.am b/Makefile.am
> index 9dd22b8..1cbd865 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -79,7 +79,15 @@ README.gz: $(top_srcdir)/README
>        -gzip -9 < $< > $@
>
>  THANKS.gz: $(top_srcdir)/THANKS
> -       -gzip -9 < $< > $@
> +       sed -e 's/^#.*//' $< > $<.tmp # strip comments
> +       sed -e '/^$$/d' $<.tmp > $<.tmp2  # strip empty lines
> +       git shortlog -se 6c976bd..HEAD \
> +        | grep -v @apache.org \
> +        | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
> +        >> $<.tmp2 # inject git authors
> +       echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $<.tmp2
> +       -gzip -9 < $<.tmp2 > $@ # zip
> +       rm $<.tmp $<.tmp2 # cleanup
>
>  check: dev check-js
>        $(top_builddir)/test/etap/run $(top_srcdir)/test/etap
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/7646794e/THANKS
> ----------------------------------------------------------------------
> diff --git a/THANKS b/THANKS
> index f0dccb8..1e065f8 100644
> --- a/THANKS
> +++ b/THANKS
> @@ -66,7 +66,6 @@ suggesting improvements or submitting changes. Some of these people
are:
>  * Lim Yue Chuan <shasderias@gmail.com>
>  * David Davis <xantus@xantus.org>
>  * Klaus Trainer <klaus.trainer@web.de>
> - * Dale Harvey <dale@arandomurl.com>
>  * Juuso Väänänen <juuso@vaananen.org>
>  * Jeff Zellner <jeff.zellner@gmail.com>
>  * Benjamin Young <byoung@bigbluehat.com>
> @@ -92,12 +91,10 @@ suggesting improvements or submitting changes. Some of these people
are:
>  * Simon Leblanc <sim.leblanc+apache@gmail.com>
>  * Rogutės Sparnuotos <rogutes@googlemail.com>
>  * Gavin McDonald <gmcdonald@apache.org>
> - * Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
> - * Magnus Hoff <maghoff@gmail.com>
> - * Alexander Dorofeev <aka.spin@gmail.com>
> - * Anthony S Baker <anthony.s.baker@gmail.com>
> - * Ewan McDougall <info@mrloop.com>
> - * Adam Lofts <Adam.Lofts@gmail.com>
>
> -For a list of authors see the `AUTHORS` file.
> +# Dear committer who merges a commit from a non-committer:
> +# You don't have to manually maintain the THANKS file anymore (yay!).
> +# Non-committer authors get automatically appended to THANKS and
> +# moved into THANKS.gz by `make`. This note will be stripped as well.
> +# Authors from commit 6c976bd and onwards are auto-inserted.
>
>

Mime
View raw message