![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 26212b009c6b1bb1a17dacc174d2e59d0dc54ef1..edb40429ec4465f3bebba02f2174314dd0183225 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
#include "diff.h"
#include "path-list.h"
#include "revision.h"
-#include <string.h>
static const char shortlog_usage[] =
-"git-shortlog [-n] [-s] [<commit-id>... ]\n";
+"git-shortlog [-n] [-s] [<commit-id>... ]";
+
+static char *common_repo_prefix;
static int compare_by_number(const void *a1, const void *a2)
{
const struct path_list *l1 = i1->util, *l2 = i2->util;
if (l1->nr < l2->nr)
- return -1;
+ return 1;
else if (l1->nr == l2->nr)
return 0;
else
- return +1;
+ return -1;
}
-static struct path_list_item mailmap_list[] = {
- { "R.Marek@sh.cvut.cz", (void*)"Rudolf Marek" },
- { "Ralf.Wildenhues@gmx.de", (void*)"Ralf Wildenhues" },
- { "aherrman@de.ibm.com", (void*)"Andreas Herrmann" },
- { "akpm@osdl.org", (void*)"Andrew Morton" },
- { "andrew.vasquez@qlogic.com", (void*)"Andrew Vasquez" },
- { "aquynh@gmail.com", (void*)"Nguyen Anh Quynh" },
- { "axboe@suse.de", (void*)"Jens Axboe" },
- { "blaisorblade@yahoo.it", (void*)"Paolo 'Blaisorblade' Giarrusso" },
- { "bunk@stusta.de", (void*)"Adrian Bunk" },
- { "domen@coderock.org", (void*)"Domen Puncer" },
- { "dougg@torque.net", (void*)"Douglas Gilbert" },
- { "dwmw2@shinybook.infradead.org", (void*)"David Woodhouse" },
- { "ecashin@coraid.com", (void*)"Ed L Cashin" },
- { "felix@derklecks.de", (void*)"Felix Moeller" },
- { "fzago@systemfabricworks.com", (void*)"Frank Zago" },
- { "gregkh@suse.de", (void*)"Greg Kroah-Hartman" },
- { "hch@lst.de", (void*)"Christoph Hellwig" },
- { "htejun@gmail.com", (void*)"Tejun Heo" },
- { "jejb@mulgrave.(none)", (void*)"James Bottomley" },
- { "jejb@titanic.il.steeleye.com", (void*)"James Bottomley" },
- { "jgarzik@pretzel.yyz.us", (void*)"Jeff Garzik" },
- { "johnpol@2ka.mipt.ru", (void*)"Evgeniy Polyakov" },
- { "kay.sievers@vrfy.org", (void*)"Kay Sievers" },
- { "minyard@acm.org", (void*)"Corey Minyard" },
- { "mshah@teja.com", (void*)"Mitesh shah" },
- { "pj@ludd.ltu.se", (void*)"Peter A Jonsson" },
- { "rmps@joel.ist.utl.pt", (void*)"Rui Saraiva" },
- { "santtu.hyrkko@gmail.com", (void*)"Santtu Hyrkk\e,Av\e(B" },
- { "simon@thekelleys.org.uk", (void*)"Simon Kelley" },
- { "ssant@in.ibm.com", (void*)"Sachin P Sant" },
- { "terra@gnome.org", (void*)"Morten Welinder" },
- { "tony.luck@intel.com", (void*)"Tony Luck" },
- { "welinder@anemone.rentec.com", (void*)"Morten Welinder" },
- { "welinder@darter.rentec.com", (void*)"Morten Welinder" },
- { "welinder@troll.com", (void*)"Morten Welinder" }
-};
-
-static struct path_list mailmap = {
- mailmap_list,
- sizeof(mailmap_list) / sizeof(struct path_list_item), 0, 0
-};
+static struct path_list mailmap = {NULL, 0, 0, 0};
+
+static int read_mailmap(const char *filename)
+{
+ char buffer[1024];
+ FILE *f = fopen(filename, "r");
+
+ if (f == NULL)
+ return 1;
+ while (fgets(buffer, sizeof(buffer), f) != NULL) {
+ char *end_of_name, *left_bracket, *right_bracket;
+ char *name, *email;
+ int i;
+ if (buffer[0] == '#') {
+ static const char abbrev[] = "# repo-abbrev:";
+ int abblen = sizeof(abbrev) - 1;
+ int len = strlen(buffer);
+
+ if (len && buffer[len - 1] == '\n')
+ buffer[--len] = 0;
+ if (!strncmp(buffer, abbrev, abblen)) {
+ char *cp;
+
+ if (common_repo_prefix)
+ free(common_repo_prefix);
+ common_repo_prefix = xmalloc(len);
+
+ for (cp = buffer + abblen; isspace(*cp); cp++)
+ ; /* nothing */
+ strcpy(common_repo_prefix, cp);
+ }
+ continue;
+ }
+ if ((left_bracket = strchr(buffer, '<')) == NULL)
+ continue;
+ if ((right_bracket = strchr(left_bracket + 1, '>')) == NULL)
+ continue;
+ if (right_bracket == left_bracket + 1)
+ continue;
+ for (end_of_name = left_bracket; end_of_name != buffer
+ && isspace(end_of_name[-1]); end_of_name--)
+ /* keep on looking */
+ if (end_of_name == buffer)
+ continue;
+ name = xmalloc(end_of_name - buffer + 1);
+ strlcpy(name, buffer, end_of_name - buffer + 1);
+ email = xmalloc(right_bracket - left_bracket);
+ for (i = 0; i < right_bracket - left_bracket - 1; i++)
+ email[i] = tolower(left_bracket[i + 1]);
+ email[right_bracket - left_bracket - 1] = '\0';
+ path_list_insert(email, &mailmap)->util = name;
+ }
+ fclose(f);
+ return 0;
+}
static int map_email(char *email, char *name, int maxlen)
{
return 0;
*p = '\0';
+ /* downcase the email address */
+ for (p = email; *p; p++)
+ *p = tolower(*p);
item = path_list_lookup(email, &mailmap);
if (item != NULL) {
const char *realname = (const char *)item->util;
const char *author, int authorlen,
const char *oneline, int onelinelen)
{
- const char *dot3 = "/pub/scm/linux/kernel/git/";
+ const char *dot3 = common_repo_prefix;
char *buffer, *p;
struct path_list_item *item;
struct path_list *onelines;
memcpy(buffer, oneline, onelinelen);
buffer[onelinelen] = '\0';
- while ((p = strstr(buffer, dot3)) != NULL) {
- memcpy(p, "...", 3);
- strcpy(p + 2, p + sizeof(dot3) - 1);
+ if (dot3) {
+ int dot3len = strlen(dot3);
+ if (dot3len > 5) {
+ while ((p = strstr(buffer, dot3)) != NULL) {
+ int taillen = strlen(p) - dot3len;
+ memcpy(p, "/.../", 5);
+ memmove(p + 5, p + dot3len, taillen + 1);
+ }
+ }
}
-
onelines = item->util;
if (onelines->nr >= onelines->alloc) {
onelines->alloc = alloc_nr(onelines->nr);
bob = buffer + strlen(buffer);
else {
offset = 8;
- while (isspace(bob[-1]))
+ while (buffer + offset < bob &&
+ isspace(bob[-1]))
bob--;
}
while (fgets(buffer2, sizeof(buffer2), stdin) &&
buffer2[0] != '\n')
; /* chomp input */
- if (fgets(buffer2, sizeof(buffer2), stdin))
+ if (fgets(buffer2, sizeof(buffer2), stdin)) {
+ int l2 = strlen(buffer2);
+ int i;
+ for (i = 0; i < l2; i++)
+ if (!isspace(buffer2[i]))
+ break;
insert_author_oneline(list,
buffer + offset,
bob - buffer - offset,
- buffer2, strlen(buffer2));
+ buffer2 + i, l2 - i);
+ }
}
}
}
author = scratch;
authorlen = strlen(scratch);
} else {
- while (bracket[-1] == ' ')
+ if (bracket[-1] == ' ')
bracket--;
author = buffer + 7;
struct path_list list = { NULL, 0, 0, 1 };
int i, j, sort_by_number = 0, summary = 0;
- init_revisions(&rev, prefix);
- argc = setup_revisions(argc, argv, &rev, NULL);
+ /* since -n is a shadowed rev argument, parse our args first */
while (argc > 1) {
if (!strcmp(argv[1], "-n") || !strcmp(argv[1], "--numbered"))
sort_by_number = 1;
else if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
usage(shortlog_usage);
else
- die ("unrecognized argument: %s", argv[1]);
+ break;
argv++;
argc--;
}
+ init_revisions(&rev, prefix);
+ argc = setup_revisions(argc, argv, &rev, NULL);
+ if (argc > 1)
+ die ("unrecognized argument: %s", argv[1]);
+
+ if (!access(".mailmap", R_OK))
+ read_mailmap(".mailmap");
- if (rev.pending.nr == 1)
- die ("Need a range!");
- else if (rev.pending.nr == 0)
+ if (rev.pending.nr == 0)
read_from_stdin(&list);
else
get_from_rev(&rev, &list);
if (sort_by_number)
- qsort(list.items, sizeof(struct path_list_item), list.nr,
+ qsort(list.items, list.nr, sizeof(struct path_list_item),
compare_by_number);
for (i = 0; i < list.nr; i++) {
struct path_list *onelines = list.items[i].util;
- printf("%s (%d):\n", list.items[i].path, onelines->nr);
- if (!summary) {
+ if (summary) {
+ printf("%s: %d\n", list.items[i].path, onelines->nr);
+ } else {
+ printf("%s (%d):\n", list.items[i].path, onelines->nr);
for (j = onelines->nr - 1; j >= 0; j--)
printf(" %s\n", onelines->items[j].path);
printf("\n");
list.strdup_paths = 1;
path_list_clear(&list, 1);
+ mailmap.strdup_paths = 1;
+ path_list_clear(&mailmap, 1);
return 0;
}