@matheusbsbs / matheus-bagliano / commits / d8e812502f
Fork 0

shortlog: read mailmap from ./.mailmap again

While at it, remove the linux specific mailmap into contrib/mailmap.linux. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Johannes Schindelin committed Nov 19, 2006 at 17:28 UTC d8e812502f1c72f5ef542de7eb05874e27f2b086
2 files changed +79 -42
builtin-shortlog.c
+39 -42
@@ -22,48 +22,40 @@ static int compare_by_number(const void *a1, const void *a2)
22 return +1;
23 }
24
25 -static struct path_list_item mailmap_list[] = {
26 - { "R.Marek@sh.cvut.cz", (void*)"Rudolf Marek" },
27 - { "Ralf.Wildenhues@gmx.de", (void*)"Ralf Wildenhues" },
28 - { "aherrman@de.ibm.com", (void*)"Andreas Herrmann" },
29 - { "akpm@osdl.org", (void*)"Andrew Morton" },
30 - { "andrew.vasquez@qlogic.com", (void*)"Andrew Vasquez" },
31 - { "aquynh@gmail.com", (void*)"Nguyen Anh Quynh" },
32 - { "axboe@suse.de", (void*)"Jens Axboe" },
33 - { "blaisorblade@yahoo.it", (void*)"Paolo 'Blaisorblade' Giarrusso" },
34 - { "bunk@stusta.de", (void*)"Adrian Bunk" },
35 - { "domen@coderock.org", (void*)"Domen Puncer" },
36 - { "dougg@torque.net", (void*)"Douglas Gilbert" },
37 - { "dwmw2@shinybook.infradead.org", (void*)"David Woodhouse" },
38 - { "ecashin@coraid.com", (void*)"Ed L Cashin" },
39 - { "felix@derklecks.de", (void*)"Felix Moeller" },
40 - { "fzago@systemfabricworks.com", (void*)"Frank Zago" },
41 - { "gregkh@suse.de", (void*)"Greg Kroah-Hartman" },
42 - { "hch@lst.de", (void*)"Christoph Hellwig" },
43 - { "htejun@gmail.com", (void*)"Tejun Heo" },
44 - { "jejb@mulgrave.(none)", (void*)"James Bottomley" },
45 - { "jejb@titanic.il.steeleye.com", (void*)"James Bottomley" },
46 - { "jgarzik@pretzel.yyz.us", (void*)"Jeff Garzik" },
47 - { "johnpol@2ka.mipt.ru", (void*)"Evgeniy Polyakov" },
48 - { "kay.sievers@vrfy.org", (void*)"Kay Sievers" },
49 - { "minyard@acm.org", (void*)"Corey Minyard" },
50 - { "mshah@teja.com", (void*)"Mitesh shah" },
51 - { "pj@ludd.ltu.se", (void*)"Peter A Jonsson" },
52 - { "rmps@joel.ist.utl.pt", (void*)"Rui Saraiva" },
53 - { "santtu.hyrkko@gmail.com", (void*)"Santtu Hyrkk,Av(B" },
54 - { "simon@thekelleys.org.uk", (void*)"Simon Kelley" },
55 - { "ssant@in.ibm.com", (void*)"Sachin P Sant" },
56 - { "terra@gnome.org", (void*)"Morten Welinder" },
57 - { "tony.luck@intel.com", (void*)"Tony Luck" },
58 - { "welinder@anemone.rentec.com", (void*)"Morten Welinder" },
59 - { "welinder@darter.rentec.com", (void*)"Morten Welinder" },
60 - { "welinder@troll.com", (void*)"Morten Welinder" }
61 -};
62 -
63 -static struct path_list mailmap = {
64 - mailmap_list,
65 - sizeof(mailmap_list) / sizeof(struct path_list_item), 0, 0
66 -};
25 +static struct path_list mailmap = {NULL, 0, 0, 0};
26 +
27 +static int read_mailmap(const char *filename)
28 +{
29 + char buffer[1024];
30 + FILE *f = fopen(filename, "r");
31 +
32 + if (f == NULL)
33 + return 1;
34 + while (fgets(buffer, sizeof(buffer), f) != NULL) {
35 + char *end_of_name, *left_bracket, *right_bracket;
36 + char *name, *email;
37 + if (buffer[0] == '#')
38 + continue;
39 + if ((left_bracket = strchr(buffer, '<')) == NULL)
40 + continue;
41 + if ((right_bracket = strchr(left_bracket + 1, '>')) == NULL)
42 + continue;
43 + if (right_bracket == left_bracket + 1)
44 + continue;
45 + for (end_of_name = left_bracket; end_of_name != buffer
46 + && isspace(end_of_name[-1]); end_of_name--)
47 + /* keep on looking */
48 + if (end_of_name == buffer)
49 + continue;
50 + name = xmalloc(end_of_name - buffer + 1);
51 + strlcpy(name, buffer, end_of_name - buffer + 1);
52 + email = xmalloc(right_bracket - left_bracket);
53 + strlcpy(email, left_bracket + 1, right_bracket - left_bracket);
54 + path_list_insert(email, &mailmap)->util = name;
55 + }
56 + fclose(f);
57 + return 0;
58 +}
59
60 static int map_email(char *email, char *name, int maxlen)
61 {
@@ -269,6 +261,9 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
261 argc--;
262 }
263
264 + if (!access(".mailmap", R_OK))
265 + read_mailmap(".mailmap");
266 +
267 if (rev.pending.nr == 1)
268 die ("Need a range!");
269 else if (rev.pending.nr == 0)
@@ -298,6 +293,8 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
293
294 list.strdup_paths = 1;
295 path_list_clear(&list, 1);
296 + mailmap.strdup_paths = 1;
297 + path_list_clear(&mailmap, 1);
298
299 return 0;
300 }
contrib/mailmap.linux new
+40
@@ -0,0 +1,40 @@
1 +#
2 +# Even with git, we don't always have name translations.
3 +# So have an email->real name table to translate the
4 +# (hopefully few) missing names
5 +#
6 +Adrian Bunk <bunk@stusta.de>
7 +Andreas Herrmann <aherrman@de.ibm.com>
8 +Andrew Morton <akpm@osdl.org>
9 +Andrew Vasquez <andrew.vasquez@qlogic.com>
10 +Christoph Hellwig <hch@lst.de>
11 +Corey Minyard <minyard@acm.org>
12 +David Woodhouse <dwmw2@shinybook.infradead.org>
13 +Domen Puncer <domen@coderock.org>
14 +Douglas Gilbert <dougg@torque.net>
15 +Ed L Cashin <ecashin@coraid.com>
16 +Evgeniy Polyakov <johnpol@2ka.mipt.ru>
17 +Felix Moeller <felix@derklecks.de>
18 +Frank Zago <fzago@systemfabricworks.com>
19 +Greg Kroah-Hartman <gregkh@suse.de>
20 +James Bottomley <jejb@mulgrave.(none)>
21 +James Bottomley <jejb@titanic.il.steeleye.com>
22 +Jeff Garzik <jgarzik@pretzel.yyz.us>
23 +Jens Axboe <axboe@suse.de>
24 +Kay Sievers <kay.sievers@vrfy.org>
25 +Mitesh shah <mshah@teja.com>
26 +Morten Welinder <terra@gnome.org>
27 +Morten Welinder <welinder@anemone.rentec.com>
28 +Morten Welinder <welinder@darter.rentec.com>
29 +Morten Welinder <welinder@troll.com>
30 +Nguyen Anh Quynh <aquynh@gmail.com>
31 +Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
32 +Peter A Jonsson <pj@ludd.ltu.se>
33 +Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
34 +Rudolf Marek <R.Marek@sh.cvut.cz>
35 +Rui Saraiva <rmps@joel.ist.utl.pt>
36 +Sachin P Sant <ssant@in.ibm.com>
37 +Santtu Hyrkk,Av(B <santtu.hyrkko@gmail.com>
38 +Simon Kelley <simon@thekelleys.org.uk>
39 +Tejun Heo <htejun@gmail.com>
40 +Tony Luck <tony.luck@intel.com>