[libvirt] [PATCH 0/5] AUTHORS: Cleanups and fixes
Comparing the generated AUTHORS file before and after these changes: AUTHORS | 51 +-------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) There would be plenty of room for additional deduplication, but that's how far I can get based on concrete data as opposed to relying on (more or less educated) guesses. Andrea Bolognani (5): AUTHORS: Remove unnecessary remark AUTHORS: Fix entries disagreeing with mailmap mailmap: Fix consolidation rules mailmap: Consolidate current and past maintainers AUTHORS: Avoid duplicated entries .mailmap | 16 +++++++++++++--- AUTHORS.in | 6 ++---- Makefile.am | 18 +++++++++++++----- 3 files changed, 28 insertions(+), 12 deletions(-) -- 2.17.1
While technically correct (you have to send patches for your name to appear on the list) the remark was clearly intended for a time before AUTHORS was partially generated from the git log. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Mirrors libvirt-dbus commit 6ae9e8c84ce2. AUTHORS.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/AUTHORS.in b/AUTHORS.in index 76355bab16..dbced5bf3f 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -92,8 +92,6 @@ Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com> #authorslist# -[....send patches to get your name here....] - The libvirt logo was designed by Diana Fong -- End -- 2.17.1
Based on which of the two files has been updated most recently, and what name is used for recent commits. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- AUTHORS.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.in b/AUTHORS.in index dbced5bf3f..6144fac64a 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -14,7 +14,7 @@ Christian Ehrhardt <christian.ehrhardt@canonical.com> Christophe Fergeau <cfergeau@redhat.com> Claudio Bley <claudio.bley@gmail.com> Cole Robinson <crobinso@redhat.com> -Daniel Berrange <berrange@redhat.com> +Daniel P. Berrangé <berrange@redhat.com> Daniel Veillard <veillard@redhat.com> Doug Goldstein <cardoe@gentoo.org> Eric Blake <eblake@redhat.com> -- 2.17.1
On Wed, Jul 04, 2018 at 02:47:44PM +0200, Andrea Bolognani wrote:
Based on which of the two files has been updated most recently, and what name is used for recent commits.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- AUTHORS.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Heh, thanks :-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
diff --git a/AUTHORS.in b/AUTHORS.in index dbced5bf3f..6144fac64a 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -14,7 +14,7 @@ Christian Ehrhardt <christian.ehrhardt@canonical.com> Christophe Fergeau <cfergeau@redhat.com> Claudio Bley <claudio.bley@gmail.com> Cole Robinson <crobinso@redhat.com> -Daniel Berrange <berrange@redhat.com> +Daniel P. Berrangé <berrange@redhat.com> Daniel Veillard <veillard@redhat.com> Doug Goldstein <cardoe@gentoo.org> Eric Blake <eblake@redhat.com>
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
The basic mailmap syntax works for simple cases, but sometimes it requires two entiries or doesn't work at all; switch to the more complex syntax in those cases. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .mailmap | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 47b4a71784..edea456268 100644 --- a/.mailmap +++ b/.mailmap @@ -20,7 +20,6 @@ <jfehlig@suse.com> <jfehlig@novell.com> <jfehlig@suse.com> <jfehlig@linux-ypgk.site> <jclift@redhat.com> <justin@salasaga.org> -<berrange@redhat.com> <dan@berrange.com> <soren@linux2go.dk> <soren@canonical.com> <cfergeau@redhat.com> <teuf@gnome.org> <wency@cn.fujitsu.com> <wency cn fujitsu com> @@ -56,9 +55,12 @@ Aurelien Rougemont <beorn@binaries.fr> Serge E. Hallyn <serge.hallyn@canonical.com> Henrik Persson E <henrik.e.persson@ericsson.com> Philipp Hahn <hahn@univention.de> -Marco Bozzolan <bozzolan@gmail.com> -Marco Bozzolan <redshift@gmx.com> Pritesh Kothari <pritesh.kothari@sun.com> Wang Yufei (James) <james.wangyufei@huawei.com> Deepak C Shetty <dpkshetty@gmail.com> + +# Non-trivial consolidation: +# see git documentation for information about the format Daniel P. Berrangé <berrange@redhat.com> +Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com> +Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com> -- 2.17.1
We can't do this in general, but for maintainers we have the data in AUTHORS.in to use as a source of truth. This gets rid of several duplicated lines in the generated AUTHORS file. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .mailmap | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.mailmap b/.mailmap index edea456268..913395b89c 100644 --- a/.mailmap +++ b/.mailmap @@ -38,6 +38,10 @@ <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com> <serge.hallyn@canonical.com> <serue@us.ibm.com> <pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM> +<cbosdonnat@suse.com> <cedric.bosdonnat@free.fr> +<mnestratov@virtuozzo.com> <mnestratov@parallels.com> +<nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com> +<jyang@redhat.com> <osier@yunify.com> # Name consolidation: # Preferred author spelling <preferred email> @@ -58,9 +62,13 @@ Philipp Hahn <hahn@univention.de> Pritesh Kothari <pritesh.kothari@sun.com> Wang Yufei (James) <james.wangyufei@huawei.com> Deepak C Shetty <dpkshetty@gmail.com> +Dave Allan <dallan@redhat.com> +Richard W.M. Jones <rjones@redhat.com> # Non-trivial consolidation: # see git documentation for information about the format Daniel P. Berrangé <berrange@redhat.com> Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com> +Michal Prívozník <mprivozn@redhat.com> +Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com> Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com> -- 2.17.1
Instead of simply dumping the list of authors as obtained from git, we can be a bit smarter and filter out maintainers so that their names don't appear twice. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Mirrors libvirt-dbus commit 5ef5bdaef84a. AUTHORS.in | 2 +- Makefile.am | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/AUTHORS.in b/AUTHORS.in index 6144fac64a..62afa56e27 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -90,7 +90,7 @@ Stefan de Konink <dekonink@kinkrsoftware.nl> Takahashi Tomohiro <takatom@jp.fujitsu.com> Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com> -#authorslist# +#contributorslist# The libvirt logo was designed by Diana Fong diff --git a/Makefile.am b/Makefile.am index af0b735b82..1926e21b7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,9 +109,17 @@ gen-ChangeLog: .PHONY: gen-AUTHORS gen-AUTHORS: - $(AM_V_GEN)if test -d $(srcdir)/.git; then \ - out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ - perl -p -e "s/#authorslist#// and print '$$out'" \ - < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ - mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + $(AM_V_GEN)\ + if test -d $(srcdir)/.git; then \ + ( \ + cd $(srcdir) && \ + git log --pretty=format:'%aN <%aE>' | sort -u \ + ) > all.list && \ + sort -u $(srcdir)/AUTHORS.in > maint.list && \ + comm -23 all.list maint.list > contrib.list && \ + contrib="`cat contrib.list`" && \ + perl -p -e "s/#contributorslist#// and print '$$contrib'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \ + rm -f all.list maint.list contrib.list; \ fi -- 2.17.1
On 07/04/2018 02:47 PM, Andrea Bolognani wrote:
Comparing the generated AUTHORS file before and after these changes:
AUTHORS | 51 +-------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-)
There would be plenty of room for additional deduplication, but that's how far I can get based on concrete data as opposed to relying on (more or less educated) guesses.
Andrea Bolognani (5): AUTHORS: Remove unnecessary remark AUTHORS: Fix entries disagreeing with mailmap mailmap: Fix consolidation rules mailmap: Consolidate current and past maintainers AUTHORS: Avoid duplicated entries
.mailmap | 16 +++++++++++++--- AUTHORS.in | 6 ++---- Makefile.am | 18 +++++++++++++----- 3 files changed, 28 insertions(+), 12 deletions(-)
ACK series. Michal
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Michal Prívozník