7:47 a.m.
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
7:47 a.m.
New subject: [libvirt] [PATCH 1/5] AUTHORS: Remove unnecessary remark
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(a)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(a)aa.jp.fujitsu.com>
#authorslist#
-[....send patches to get your name here....]
-
The libvirt logo was designed by Diana Fong
-- End
--
2.17.1
7:47 a.m.
New subject: [libvirt] [PATCH 2/5] AUTHORS: Fix entries disagreeing with mailmap
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(a)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(a)canonical.com>
Christophe Fergeau <cfergeau(a)redhat.com>
Claudio Bley <claudio.bley(a)gmail.com>
Cole Robinson <crobinso(a)redhat.com>
-Daniel Berrange <berrange(a)redhat.com>
+Daniel P. Berrangé <berrange(a)redhat.com>
Daniel Veillard <veillard(a)redhat.com>
Doug Goldstein <cardoe(a)gentoo.org>
Eric Blake <eblake(a)redhat.com>
--
2.17.1
8:09 a.m.
New subject: [libvirt] [PATCH 2/5] AUTHORS: Fix entries disagreeing with mailmap
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(a)redhat.com>
---
AUTHORS.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Heh, thanks :-)
Reviewed-by: Daniel P. Berrangé <berrange(a)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(a)canonical.com>
Christophe Fergeau <cfergeau(a)redhat.com>
Claudio Bley <claudio.bley(a)gmail.com>
Cole Robinson <crobinso(a)redhat.com>
-Daniel Berrange <berrange(a)redhat.com>
+Daniel P. Berrangé <berrange(a)redhat.com>
Daniel Veillard <veillard(a)redhat.com>
Doug Goldstein <cardoe(a)gentoo.org>
Eric Blake <eblake(a)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 :|
7:47 a.m.
New subject: [libvirt] [PATCH 3/5] mailmap: Fix consolidation rules
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(a)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(a)suse.com> <jfehlig(a)novell.com>
<jfehlig(a)suse.com> <jfehlig(a)linux-ypgk.site>
<jclift(a)redhat.com> <justin(a)salasaga.org>
-<berrange(a)redhat.com> <dan(a)berrange.com>
<soren(a)linux2go.dk> <soren(a)canonical.com>
<cfergeau(a)redhat.com> <teuf(a)gnome.org>
<wency(a)cn.fujitsu.com> <wency cn fujitsu com>
@@ -56,9 +55,12 @@ Aurelien Rougemont <beorn(a)binaries.fr>
Serge E. Hallyn <serge.hallyn(a)canonical.com>
Henrik Persson E <henrik.e.persson(a)ericsson.com>
Philipp Hahn <hahn(a)univention.de>
-Marco Bozzolan <bozzolan(a)gmail.com>
-Marco Bozzolan <redshift(a)gmx.com>
Pritesh Kothari <pritesh.kothari(a)sun.com>
Wang Yufei (James) <james.wangyufei(a)huawei.com>
Deepak C Shetty <dpkshetty(a)gmail.com>
+
+# Non-trivial consolidation:
+# see git documentation for information about the format
Daniel P. Berrangé <berrange(a)redhat.com>
+Daniel P. Berrangé <berrange(a)redhat.com> <dan(a)berrange.com>
+Marco Bozzolan <bozzolan(a)gmail.com> <redshift(a)gmx.com>
--
2.17.1
7:47 a.m.
New subject: [libvirt] [PATCH 4/5] mailmap: Consolidate current and past maintainers
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(a)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(a)linux.vnet.ibm.com> <zhlcindy(a)gmail.com>
<serge.hallyn(a)canonical.com> <serue(a)us.ibm.com>
<pritesh.kothari(a)sun.com> <Pritesh.Kothari(a)Sun.COM>
+<cbosdonnat(a)suse.com> <cedric.bosdonnat(a)free.fr>
+<mnestratov(a)virtuozzo.com> <mnestratov(a)parallels.com>
+<nshirokovskiy(a)virtuozzo.com> <nshirokovskiy(a)parallels.com>
+<jyang(a)redhat.com> <osier(a)yunify.com>
# Name consolidation:
# Preferred author spelling <preferred email>
@@ -58,9 +62,13 @@ Philipp Hahn <hahn(a)univention.de>
Pritesh Kothari <pritesh.kothari(a)sun.com>
Wang Yufei (James) <james.wangyufei(a)huawei.com>
Deepak C Shetty <dpkshetty(a)gmail.com>
+Dave Allan <dallan(a)redhat.com>
+Richard W.M. Jones <rjones(a)redhat.com>
# Non-trivial consolidation:
# see git documentation for information about the format
Daniel P. Berrangé <berrange(a)redhat.com>
Daniel P. Berrangé <berrange(a)redhat.com> <dan(a)berrange.com>
+Michal Prívozník <mprivozn(a)redhat.com>
+Michal Prívozník <mprivozn(a)redhat.com> <miso.privoznik(a)gmail.com>
Marco Bozzolan <bozzolan(a)gmail.com> <redshift(a)gmx.com>
--
2.17.1
7:47 a.m.
New subject: [libvirt] [PATCH 5/5] AUTHORS: Avoid duplicated entries
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(a)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(a)kinkrsoftware.nl>
Takahashi Tomohiro <takatom(a)jp.fujitsu.com>
Tatsuro Enokura <fj7716hz(a)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
5:01 a.m.
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
2332
days inactive
2333
days old
7 comments
3 participants
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Michal Prívozník