On 02/08/2015 11:17 PM, Pádraig Brady wrote:
> On 08/02/15 19:40, Bernhard Voelker wrote:
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -172,6 +172,21 @@ THANKS: THANKS.in Makefile.am .mailmap thanks-gen
>> .version
>> printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \
>> } > $@-t && chmod a-w $@-t && mv $@-t $@
>>
>> +# Sort the contributor name/email pair list in 'THANKS.in'.
>> +# See sc_THANKS_in_sorted ... which uses the same sort options.
>> +.PHONY: sort-THANKS.in
>> +sort-THANKS.in: Makefile.am
> This separate target is probably overkill,
> as THANKS.in should remain sorted due to the sc_ rule.
okay, removed.
>> diff --git a/cfg.mk b/cfg.mk
>> index f5be6de..26df247 100644
>> --- a/cfg.mk
>> +++ b/cfg.mk
>> @@ -611,6 +611,17 @@ sc_THANKS_in_duplicates:
>> && { echo '$(ME): remove the above names from THANKS.in' \
>> 1>&2; exit 1; } || :
>>
>> +# Ensure the contributor list stays sorted. The sort order can be fixed
>> +# with 'make sort-THANKS.in' ... which uses the same sort options.
>> +sc_THANKS_in_sorted:
>> + @sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > [email protected]; \
>> + LC_ALL='en_US.UTF-8' sort -f -k1,1 [email protected] > [email protected]
>> + @diff -u [email protected] [email protected]; diff=$$?; \
>> + rm -f [email protected] [email protected]; \
>> + test "$$diff" = 0 \
>> + || { echo '$(ME): THANKS.in is unsorted; please run' \
>> + 'make sort-THANKS.in' 1>&2; exit 1; }
>> +
>
> I don't like the sorting in this locale at all.
> Actually the locale is OK, just the sorting in the patch seems
> to have been done in LC_ALL=C ?
>
> $ printf '%s\n' Duncan Dániel Gaël Gary Ørn Oskar | LC_ALL=en_US.utf8 sort
> Dániel
> Duncan
> Gaël
> Gary
> Ørn
> Oskar
Outch, it seems we hit a bug in the downstream I18N implementation when
both -f and -k1,1 are in effect. This came in when I added -k1,1 late.
$ printf '%s\n' Duncan Dániel Gaël Gary Ørn Oskar | LC_ALL=en_US.utf8
/usr/bin/sort -f -k1,1
Duncan
Dániel
Gary
Gaël
Oskar
Ørn
$ printf '%s\n' Duncan Dániel Gaël Gary Ørn Oskar | LC_ALL=en_US.utf8
src/sort -f -k1,1
Dániel
Duncan
Gaël
Gary
Ørn
Oskar
AFAIK downstream sort on [your] Fedora shares the bug with that on [my]
openSUSE?
The sc_ rule now uses our own sort to avoid issues.
> That locale doesn't work correctly with the only cyrillic entry though:
>
> $ printf '%s\n' Марк Michal | LC_ALL=en_US.utf8 sort
> Michal
> Марк
>
> I'm thinking we should convert that to latin1 (Mark Korenberg) like all other
> entries.
done.
Thanks for the review.
Latest patch attached.
Have a nice day,
Berny
>From 7b1ca5ffd6f0d50dd21558572c44296f8a3e59bb Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <[email protected]>
Date: Mon, 9 Feb 2015 02:42:40 +0100
Subject: [PATCH] maint: sort contributors in THANKS.in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* THANKS.in: Document the preferred sort order as a comment
at the top of the file. Change "ÐаÑк ÐоÑенбеÑг" to latin1
("Mark Korenberg"). Sort all entries.
* cfg.mk (sc_THANKS_in_sorted): Add rule to ensure that
'THANKS.in' remains sorted.
---
THANKS.in | 47 +++++++++++++++++++++++++----------------------
cfg.mk | 10 ++++++++++
2 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/THANKS.in b/THANKS.in
index 1621012..776b4fb 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -11,6 +11,9 @@ note to the GNU coreutils mailing list <[email protected]>.
## is used to generate the THANKS file. Note that numerous people listed
## here would have been listed as commit authors if we had been using git
## for version control when they contributed.
+##
+## Let's keep the list in this order ... which sc_THANKS_in_sorted ensures:
+## $ LC_ALL=en_US.UTF-8 src/sort -f -k1,1
??? [email protected]
A Costa [email protected]
@@ -33,12 +36,11 @@ aldomel [email protected]
Alen Muzinic [email protected]
Alexander Nguyen [email protected]
Alexander V. Lukyanov [email protected]
-Allen Hewes [email protected]
-Axel Dörfler [email protected]
Alexandre Duret-Lutz [email protected]
Alexey Solovyov [email protected]
Alexey Vyskubov [email protected]
Alfred M. Szmidt [email protected]
+Allen Hewes [email protected]
Ambrose Feinstein [email protected]
Amr Ali [email protected]
Anders Kaseorg [email protected]
@@ -72,6 +74,7 @@ Arun Sharma [email protected]
Arvind Autar [email protected]
Augey Mikus [email protected]
Austin Donnelly [email protected]
+Axel Dörfler [email protected]
Axel Kittenberger [email protected]
Barry Kelly http://barrkel.blogspot.com/
Bauke Jan Douma [email protected]
@@ -110,6 +113,7 @@ Charles Karney [email protected]
Charles Randall [email protected]
Chas. Owens [email protected]
Chip Salzenberg [email protected]
+Choi Jongu [email protected]
Chris Clayton [email protected]
Chris Faylor [email protected]
Chris J. Bednar [email protected]
@@ -164,8 +168,8 @@ Dean Gaudet [email protected]
Deepak Goel [email protected]
Denis Excoffier [email protected]
Denis McKeon [email protected]
-Dennis Henriksen [email protected]
Dennis Clarke [email protected]
+Dennis Henriksen [email protected]
Dennis Smit [email protected]
Derek Clegg [email protected]
Dick Streefland [email protected]
@@ -225,7 +229,6 @@ Gerhard Poul [email protected]
Germano Leichsenring [email protected]
Glen Lenker [email protected]
Göran Uddeborg [email protected]
-Guochun Shi [email protected]
GOTO Masanori [email protected]
Greg Louis [email protected]
Greg McGary [email protected]
@@ -236,6 +239,7 @@ Greg Wooledge [email protected]
Gregory Leblanc [email protected]
Guido Leenders [email protected]
Guntram Blohm [email protected]
+Guochun Shi [email protected]
H. J. Lu [email protected]
Hans Ginzel [email protected]
Hans Lermen [email protected]
@@ -250,8 +254,8 @@ Herbert Xu [email protected]
Holger Berger [email protected]
Hon-Yin Kok [email protected]
Hugh Daniel [email protected]
-Ian Bruce [email protected]
Iain Calder [email protected]
+Ian Bruce [email protected]
Ian Jackson [email protected]
Ian Kent [email protected]
Ian Lance Taylor [email protected]
@@ -262,10 +266,10 @@ Ingo Saitz [email protected]
Ivan Labath [email protected]
Ivo Timmermans [email protected]
Jacky Fong [email protected]
-James [email protected]
James Antill jmanti%[email protected]
-James Lemley [email protected]
James Hunt [email protected]
+James [email protected]
+James Lemley [email protected]
James Ralston [email protected]
James Sneeringer [email protected]
James Tanis [email protected]
@@ -275,8 +279,8 @@ Jan Engelhardt [email protected]
Jan Fedak [email protected]
Jan Moringen [email protected]
Jan Nieuwenhuizen [email protected]
-Jan-Pawel Wrozstinski [email protected]
Janos Farkas [email protected]
+Jan-Pawel Wrozstinski [email protected]
Jari Aalto [email protected]
Jarkko Hietaniemi [email protected]
Jarod Wilson [email protected]
@@ -326,8 +330,8 @@ Juan F. Codagnone [email protected]
Juan M. Guerrero [email protected]
Julian Bradfield [email protected]
Jungshik Shin [email protected]
-Jürgen Fluk [email protected]
Juraj Marko [email protected]
+Jürgen Fluk [email protected]
Jurriaan [email protected]
Justin Pryzby [email protected]
jvogel [email protected]
@@ -346,9 +350,9 @@ Ken Irving [email protected]
Ken Pizzini [email protected]
Kevin Mudrick [email protected]
Kirk Kelsey [email protected]
+Kjetil Torgrim Homme [email protected]
Konrad Wróblewski [email protected]
Kristin E Thomas [email protected]
-Kjetil Torgrim Homme [email protected]
Kristoffer Rose [email protected]
Ladislav Hagara [email protected]
Larry McVoy [email protected]
@@ -365,11 +369,10 @@ M. P. Suzuki [email protected]
Maciej Kwapulinski [email protected]
Manas Garg [email protected]
Manfred Hollstein [email protected]
-ÐаÑк ÐоÑенбеÑг [email protected]
Marc Boucher [email protected]
Marc Haber [email protected]
-Marc Mengel [email protected]
Marc Lehman [email protected]
+Marc Mengel [email protected]
Marc Olzheim [email protected]
Marcel Böhme http://www.comp.nus.edu.sg/~mboehme
Marco Franzen [email protected]
@@ -384,15 +387,16 @@ Mark Hewitt [email protected]
Mark Hounschell [email protected]
Mark Hubbart [email protected]
Mark Kettenis [email protected]
+Mark Korenberg [email protected]
Mark Melahn [email protected]
Mark Nudelman [email protected]
Mark W. Eichin [email protected]
Markus Demleitner [email protected]
-Martin [email protected]
Martin Buck [email protected]
Martin Gallant [email protected]
Martin Hippe [email protected]
Martin Jacobs [email protected]
+Martin [email protected]
Martin Michlmayr [email protected]
Martin Mitchell [email protected]
Martin P.J. Zinser [email protected]
@@ -400,6 +404,7 @@ Marty Leisner [email protected]
Masami Takikawa [email protected]
Mate Wierdl [email protected]
Matej Vela [email protected]
+Mathias Brodala [email protected]
Matias A. Fonzo [email protected]
Matt Kraai [email protected]
Matt McCutchen [email protected]
@@ -408,20 +413,17 @@ Matt Pham [email protected]
Matt Schalit [email protected]
Matt Swift [email protected]
Matthew Arnison [email protected]
-Matthew M. Boedicker [email protected]
Matthew Braun [email protected]
Matthew Clarke [email protected]
+Matthew M. Boedicker [email protected]
Matthew S. Levine [email protected]
Matthew Smith [email protected]
Matthew Swift [email protected]
Matthias Urlichs [email protected]
Matti Aarnio [email protected]
-Mathias Brodala [email protected]
Mattias Wadenstein [email protected]
Max Chang [email protected]
Meelis Roos [email protected]
-Michael [email protected]
-Michael ??? [email protected]
Michael Bacarella [email protected]
Michael Deutschmann [email protected]
Michael Elizabeth Chastain [email protected]
@@ -432,6 +434,8 @@ Michael J. Croghan [email protected]
Michael J. Daniel [email protected]
Michael McFarland [email protected]
Michael McLagan [email protected]
+Michael [email protected]
+Michael ??? [email protected]
Michael Mol [email protected]
Michael Piefel [email protected]
Michael Price [email protected]
@@ -507,11 +511,11 @@ Petr Uzel [email protected]
Petter Reinholdtsen [email protected]
Phelippe Neveu [email protected]
Phil Richards [email protected]
+Philipp Gortan [email protected]
+Philipp Thomas [email protected]
Philippe De Muyter [email protected]
Philippe Schnoebelen [email protected]
Phillip Jones [email protected]
-Philipp Gortan [email protected]
-Philipp Thomas [email protected]
Piergiorgio Sartor [email protected]
Pieter Bowman [email protected]
Piotr Gackiewicz [email protected]
@@ -582,8 +586,8 @@ Steven Drake [email protected]
Steven G. Johnson [email protected]
Steven Mocking [email protected]
Steven Parkes [email protected]
-Steven Schveighoffer [email protected]
Steven P Watson [email protected]
+Steven Schveighoffer [email protected]
Stuart Citrin [email protected]
Stuart Kemp [email protected]
Stuart Shelton [email protected]
@@ -591,8 +595,8 @@ Sven Breuner [email protected]
Szakacsits Szabolcs [email protected]
Tadayoshi Funaba [email protected]
TAKAI Kousuke [email protected]
-Theodore Ts'o [email protected]
The Wanderer [email protected]
+Theodore Ts'o [email protected]
Thomas Bushnell [email protected]
Thomas Goerlich [email protected]
Thomas Hood [email protected]
@@ -660,7 +664,6 @@ Yang Ren [email protected]
Yanko Kaneti [email protected]
Yann Dirson [email protected]
Youngjun Song [email protected]
-Choi Jongu [email protected]
Yutaka Amanai [email protected]
;; Local Variables:
diff --git a/cfg.mk b/cfg.mk
index f5be6de..c1a4658 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -611,6 +611,16 @@ sc_THANKS_in_duplicates:
&& { echo '$(ME): remove the above names from THANKS.in' \
1>&2; exit 1; } || :
+# Ensure the contributor list stays sorted. Use our sort as other
+# implementations may result in a different order.
+sc_THANKS_in_sorted: $(srcdir)/src/sort
+ @sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > [email protected]; \
+ LC_ALL=en_US.UTF-8 $(srcdir)/src/sort -f -k1,1 [email protected] > [email protected]
+ @diff -u [email protected] [email protected]; diff=$$?; \
+ rm -f [email protected] [email protected]; \
+ test "$$diff" = 0 \
+ || { echo '$(ME): THANKS.in is unsorted' 1>&2; exit 1; }
+
# Look for developer diagnostics that are marked for translation.
# This won't find any for which devmsg's format string is on a separate line.
sc_marked_devdiagnostics:
--
2.1.4
