Allow the user to control the verbosity of merge-recursive.

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 4775c110ffa1de7603300b2ddc6bc18301d05789..edb40429ec4465f3bebba02f2174314dd0183225 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -4,10 +4,11 @@
 #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)
 {
@@ -15,11 +16,11 @@ 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 mailmap = {NULL, 0, 0, 0};
@@ -35,8 +36,26 @@ static int read_mailmap(const char *filename)
                char *end_of_name, *left_bracket, *right_bracket;
                char *name, *email;
                int i;
-               if (buffer[0] == '#')
+               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)
@@ -87,7 +106,7 @@ static void insert_author_oneline(struct path_list *list,
                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;
@@ -130,12 +149,17 @@ static void insert_author_oneline(struct path_list *list,
        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);
@@ -163,18 +187,25 @@ static void read_from_stdin(struct path_list *list)
                                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);
+                       }
                }
        }
 }
@@ -211,7 +242,7 @@ static void get_from_rev(struct rev_info *rev, struct path_list *list)
                                        author = scratch;
                                        authorlen = strlen(scratch);
                                } else {
-                                       while (bracket[-1] == ' ')
+                                       if (bracket[-1] == ' ')
                                                bracket--;
 
                                        author = buffer + 7;
@@ -251,8 +282,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
        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;
@@ -262,30 +292,34 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
                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");