builtin/shortlog.c

   1 #include "builtin.h"
   2 #include "config.h"
   3 #include "commit.h"
   4 #include "diff.h"
   5 #include "environment.h"
   6 #include "gettext.h"
   7 #include "string-list.h"
   8 #include "repository.h"
   9 #include "revision.h"
  10 #include "utf8.h"
  11 #include "mailmap.h"
  12 #include "setup.h"
  13 #include "shortlog.h"
  14 #include "parse-options.h"
  15 #include "trailer.h"
  16 #include "strmap.h"
  17
  18 static char const * const shortlog_usage[] = {
  19         N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
  20         N_("git log --pretty=short | git shortlog [<options>]"),
  21         NULL
  22 };
  23
  24 /*
  25  * The util field of our string_list_items will contain one of two things:
  26  *
  27  *   - if --summary is not in use, it will point to a string list of the
  28  *     oneline subjects assigned to this author
  29  *
  30  *   - if --summary is in use, we don't need that list; we only need to know
  31  *     its size. So we abuse the pointer slot to store our integer counter.
  32  *
  33  *  This macro accesses the latter.
  34  */
  35 #define UTIL_TO_INT(x) ((intptr_t)(x)->util)
  36
  37 static int compare_by_counter(const void *a1, const void *a2)
  38 {
  39         const struct string_list_item *i1 = a1, *i2 = a2;
  40         return UTIL_TO_INT(i2) - UTIL_TO_INT(i1);
  41 }
  42
  43 static int compare_by_list(const void *a1, const void *a2)
  44 {
  45         const struct string_list_item *i1 = a1, *i2 = a2;
  46         const struct string_list *l1 = i1->util, *l2 = i2->util;
  47
  48         if (l1->nr < l2->nr)
  49                 return 1;
  50         else if (l1->nr == l2->nr)
  51                 return 0;
  52         else
  53                 return -1;
  54 }
  55
  56 static void insert_one_record(struct shortlog *log,
  57                               const char *ident,
  58                               const char *oneline)
  59 {
  60         struct string_list_item *item;
  61
  62         item = string_list_insert(&log->list, ident);
  63
  64         if (log->summary)
  65                 item->util = (void *)(UTIL_TO_INT(item) + 1);
  66         else {
  67                 char *buffer;
  68                 struct strbuf subject = STRBUF_INIT;
  69                 const char *eol;
  70
  71                 /* Skip any leading whitespace, including any blank lines. */
  72                 while (*oneline && isspace(*oneline))
  73                         oneline++;
  74                 eol = strchr(oneline, '\n');
  75                 if (!eol)
  76                         eol = oneline + strlen(oneline);
  77                 if (starts_with(oneline, "[PATCH")) {
  78                         char *eob = strchr(oneline, ']');
  79                         if (eob && (!eol || eob < eol))
  80                                 oneline = eob + 1;
  81                 }
  82                 while (*oneline && isspace(*oneline) && *oneline != '\n')
  83                         oneline++;
  84                 format_subject(&subject, oneline, " ");
  85                 buffer = strbuf_detach(&subject, NULL);
  86
  87                 if (!item->util) {
  88                         item->util = xmalloc(sizeof(struct string_list));
  89                         string_list_init_nodup(item->util);
  90                 }
  91                 string_list_append(item->util, buffer);
  92         }
  93 }
  94
  95 static int parse_ident(struct shortlog *log,
  96                        struct strbuf *out, const char *in)
  97 {
  98         const char *mailbuf, *namebuf;
  99         size_t namelen, maillen;
 100         struct ident_split ident;
 101
 102         if (split_ident_line(&ident, in, strlen(in)))
 103                 return -1;
 104
 105         namebuf = ident.name_begin;
 106         mailbuf = ident.mail_begin;
 107         namelen = ident.name_end - ident.name_begin;
 108         maillen = ident.mail_end - ident.mail_begin;
 109
 110         map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
 111         strbuf_add(out, namebuf, namelen);
 112         if (log->email)
 113                 strbuf_addf(out, " <%.*s>", (int)maillen, mailbuf);
 114
 115         return 0;
 116 }
 117
 118 static void read_from_stdin(struct shortlog *log)
 119 {
 120         struct strbuf ident = STRBUF_INIT;
 121         struct strbuf mapped_ident = STRBUF_INIT;
 122         struct strbuf oneline = STRBUF_INIT;
 123         static const char *author_match[2] = { "Author: ", "author " };
 124         static const char *committer_match[2] = { "Commit: ", "committer " };
 125         const char **match;
 126
 127         if (HAS_MULTI_BITS(log->groups))
 128                 die(_("using multiple --group options with stdin is not supported"));
 129
 130         switch (log->groups) {
 131         case SHORTLOG_GROUP_AUTHOR:
 132                 match = author_match;
 133                 break;
 134         case SHORTLOG_GROUP_COMMITTER:
 135                 match = committer_match;
 136                 break;
 137         case SHORTLOG_GROUP_TRAILER:
 138                 die(_("using %s with stdin is not supported"), "--group=trailer");
 139         case SHORTLOG_GROUP_FORMAT:
 140                 die(_("using %s with stdin is not supported"), "--group=format");
 141         default:
 142                 BUG("unhandled shortlog group");
 143         }
 144
 145         while (strbuf_getline_lf(&ident, stdin) != EOF) {
 146                 const char *v;
 147                 if (!skip_prefix(ident.buf, match[0], &v) &&
 148                     !skip_prefix(ident.buf, match[1], &v))
 149                         continue;
 150                 while (strbuf_getline_lf(&oneline, stdin) != EOF &&
 151                        oneline.len)
 152                         ; /* discard headers */
 153                 while (strbuf_getline_lf(&oneline, stdin) != EOF &&
 154                        !oneline.len)
 155                         ; /* discard blanks */
 156
 157                 strbuf_reset(&mapped_ident);
 158                 if (parse_ident(log, &mapped_ident, v) < 0)
 159                         continue;
 160
 161                 insert_one_record(log, mapped_ident.buf, oneline.buf);
 162         }
 163         strbuf_release(&ident);
 164         strbuf_release(&mapped_ident);
 165         strbuf_release(&oneline);
 166 }
 167
 168 static void insert_records_from_trailers(struct shortlog *log,
 169                                          struct strset *dups,
 170                                          struct commit *commit,
 171                                          struct pretty_print_context *ctx,
 172                                          const char *oneline)
 173 {
 174         struct trailer_iterator iter;
 175         const char *commit_buffer, *body;
 176         struct strbuf ident = STRBUF_INIT;
 177
 178         if (!log->trailers.nr)
 179                 return;
 180
 181         /*
 182          * Using repo_format_commit_message("%B") would be simpler here, but
 183          * this saves us copying the message.
 184          */
 185         commit_buffer = repo_logmsg_reencode(the_repository, commit, NULL,
 186                                              ctx->output_encoding);
 187         body = strstr(commit_buffer, "\n\n");
 188         if (!body)
 189                 return;
 190
 191         trailer_iterator_init(&iter, body);
 192         while (trailer_iterator_advance(&iter)) {
 193                 const char *value = iter.val.buf;
 194
 195                 if (!string_list_has_string(&log->trailers, iter.key.buf))
 196                         continue;
 197
 198                 strbuf_reset(&ident);
 199                 if (!parse_ident(log, &ident, value))
 200                         value = ident.buf;
 201
 202                 if (!strset_add(dups, value))
 203                         continue;
 204                 insert_one_record(log, value, oneline);
 205         }
 206         trailer_iterator_release(&iter);
 207
 208         strbuf_release(&ident);
 209         repo_unuse_commit_buffer(the_repository, commit, commit_buffer);
 210 }
 211
 212 static int shortlog_needs_dedup(const struct shortlog *log)
 213 {
 214         return HAS_MULTI_BITS(log->groups) || log->format.nr > 1 || log->trailers.nr;
 215 }
 216
 217 static void insert_records_from_format(struct shortlog *log,
 218                                        struct strset *dups,
 219                                        struct commit *commit,
 220                                        struct pretty_print_context *ctx,
 221                                        const char *oneline)
 222 {
 223         struct strbuf buf = STRBUF_INIT;
 224         struct string_list_item *item;
 225
 226         for_each_string_list_item(item, &log->format) {
 227                 strbuf_reset(&buf);
 228
 229                 repo_format_commit_message(the_repository, commit,
 230                                            item->string, &buf, ctx);
 231
 232                 if (!shortlog_needs_dedup(log) || strset_add(dups, buf.buf))
 233                         insert_one_record(log, buf.buf, oneline);
 234         }
 235
 236         strbuf_release(&buf);
 237 }
 238
 239 void shortlog_add_commit(struct shortlog *log, struct commit *commit)
 240 {
 241         struct strbuf oneline = STRBUF_INIT;
 242         struct strset dups = STRSET_INIT;
 243         struct pretty_print_context ctx = {0};
 244         const char *oneline_str;
 245
 246         ctx.fmt = CMIT_FMT_USERFORMAT;
 247         ctx.abbrev = log->abbrev;
 248         ctx.print_email_subject = 1;
 249         ctx.date_mode = log->date_mode;
 250         ctx.output_encoding = get_log_output_encoding();
 251
 252         if (!log->summary) {
 253                 if (log->user_format)
 254                         pretty_print_commit(&ctx, commit, &oneline);
 255                 else
 256                         repo_format_commit_message(the_repository, commit,
 257                                                    "%s", &oneline, &ctx);
 258         }
 259         oneline_str = oneline.len ? oneline.buf : "<none>";
 260
 261         insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str);
 262         insert_records_from_format(log, &dups, commit, &ctx, oneline_str);
 263
 264         strset_clear(&dups);
 265         strbuf_release(&oneline);
 266 }
 267
 268 static void get_from_rev(struct rev_info *rev, struct shortlog *log)
 269 {
 270         struct commit *commit;
 271
 272         if (prepare_revision_walk(rev))
 273                 die(_("revision walk setup failed"));
 274         while ((commit = get_revision(rev)) != NULL)
 275                 shortlog_add_commit(log, commit);
 276 }
 277
 278 static int parse_uint(char const **arg, int comma, int defval)
 279 {
 280         unsigned long ul;
 281         int ret;
 282         char *endp;
 283
 284         ul = strtoul(*arg, &endp, 10);
 285         if (*endp && *endp != comma)
 286                 return -1;
 287         if (ul > INT_MAX)
 288                 return -1;
 289         ret = *arg == endp ? defval : (int)ul;
 290         *arg = *endp ? endp + 1 : endp;
 291         return ret;
 292 }
 293
 294 static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
 295 #define DEFAULT_WRAPLEN 76
 296 #define DEFAULT_INDENT1 6
 297 #define DEFAULT_INDENT2 9
 298
 299 static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
 300 {
 301         struct shortlog *log = opt->value;
 302
 303         log->wrap_lines = !unset;
 304         if (unset)
 305                 return 0;
 306         if (!arg) {
 307                 log->wrap = DEFAULT_WRAPLEN;
 308                 log->in1 = DEFAULT_INDENT1;
 309                 log->in2 = DEFAULT_INDENT2;
 310                 return 0;
 311         }
 312
 313         log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN);
 314         log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1);
 315         log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2);
 316         if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0)
 317                 return error(wrap_arg_usage);
 318         if (log->wrap &&
 319             ((log->in1 && log->wrap <= log->in1) ||
 320              (log->in2 && log->wrap <= log->in2)))
 321                 return error(wrap_arg_usage);
 322         return 0;
 323 }
 324
 325 static int parse_group_option(const struct option *opt, const char *arg, int unset)
 326 {
 327         struct shortlog *log = opt->value;
 328         const char *field;
 329
 330         if (unset) {
 331                 log->groups = 0;
 332                 string_list_clear(&log->trailers, 0);
 333                 string_list_clear(&log->format, 0);
 334         } else if (!strcasecmp(arg, "author"))
 335                 log->groups |= SHORTLOG_GROUP_AUTHOR;
 336         else if (!strcasecmp(arg, "committer"))
 337                 log->groups |= SHORTLOG_GROUP_COMMITTER;
 338         else if (skip_prefix(arg, "trailer:", &field)) {
 339                 log->groups |= SHORTLOG_GROUP_TRAILER;
 340                 string_list_append(&log->trailers, field);
 341         } else if (skip_prefix(arg, "format:", &field)) {
 342                 log->groups |= SHORTLOG_GROUP_FORMAT;
 343                 string_list_append(&log->format, field);
 344         } else if (strchr(arg, '%')) {
 345                 log->groups |= SHORTLOG_GROUP_FORMAT;
 346                 string_list_append(&log->format, arg);
 347         } else {
 348                 return error(_("unknown group type: %s"), arg);
 349         }
 350
 351         return 0;
 352 }
 353
 354
 355 void shortlog_init(struct shortlog *log)
 356 {
 357         memset(log, 0, sizeof(*log));
 358
 359         read_mailmap(&log->mailmap);
 360
 361         log->list.strdup_strings = 1;
 362         log->wrap = DEFAULT_WRAPLEN;
 363         log->in1 = DEFAULT_INDENT1;
 364         log->in2 = DEFAULT_INDENT2;
 365         log->trailers.strdup_strings = 1;
 366         log->trailers.cmp = strcasecmp;
 367         log->format.strdup_strings = 1;
 368 }
 369
 370 void shortlog_finish_setup(struct shortlog *log)
 371 {
 372         if (log->groups & SHORTLOG_GROUP_AUTHOR)
 373                 string_list_append(&log->format,
 374                                    log->email ? "%aN <%aE>" : "%aN");
 375         if (log->groups & SHORTLOG_GROUP_COMMITTER)
 376                 string_list_append(&log->format,
 377                                    log->email ? "%cN <%cE>" : "%cN");
 378
 379         string_list_sort(&log->trailers);
 380 }
 381
 382 int cmd_shortlog(int argc, const char **argv, const char *prefix)
 383 {
 384         struct shortlog log = { STRING_LIST_INIT_NODUP };
 385         struct rev_info rev;
 386         int nongit = !startup_info->have_repository;
 387
 388         const struct option options[] = {
 389                 OPT_BIT('c', "committer", &log.groups,
 390                         N_("group by committer rather than author"),
 391                         SHORTLOG_GROUP_COMMITTER),
 392                 OPT_BOOL('n', "numbered", &log.sort_by_number,
 393                          N_("sort output according to the number of commits per author")),
 394                 OPT_BOOL('s', "summary", &log.summary,
 395                          N_("suppress commit descriptions, only provides commit count")),
 396                 OPT_BOOL('e', "email", &log.email,
 397                          N_("show the email address of each author")),
 398                 OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
 399                         N_("linewrap output"), PARSE_OPT_OPTARG,
 400                         &parse_wrap_args),
 401                 OPT_CALLBACK(0, "group", &log, N_("field"),
 402                         N_("group by field"), parse_group_option),
 403                 OPT_END(),
 404         };
 405
 406         struct parse_opt_ctx_t ctx;
 407
 408         git_config(git_default_config, NULL);
 409         shortlog_init(&log);
 410         repo_init_revisions(the_repository, &rev, prefix);
 411         parse_options_start(&ctx, argc, argv, prefix, options,
 412                             PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
 413
 414         for (;;) {
 415                 switch (parse_options_step(&ctx, options, shortlog_usage)) {
 416                 case PARSE_OPT_NON_OPTION:
 417                 case PARSE_OPT_UNKNOWN:
 418                         break;
 419                 case PARSE_OPT_HELP:
 420                 case PARSE_OPT_ERROR:
 421                 case PARSE_OPT_SUBCOMMAND:
 422                         exit(129);
 423                 case PARSE_OPT_COMPLETE:
 424                         exit(0);
 425                 case PARSE_OPT_DONE:
 426                         goto parse_done;
 427                 }
 428                 parse_revision_opt(&rev, &ctx, options, shortlog_usage);
 429         }
 430 parse_done:
 431         revision_opts_finish(&rev);
 432         argc = parse_options_end(&ctx);
 433
 434         if (nongit && argc > 1) {
 435                 error(_("too many arguments given outside repository"));
 436                 usage_with_options(shortlog_usage, options);
 437         }
 438
 439         if (setup_revisions(argc, argv, &rev, NULL) != 1) {
 440                 error(_("unrecognized argument: %s"), argv[1]);
 441                 usage_with_options(shortlog_usage, options);
 442         }
 443
 444         log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
 445         log.abbrev = rev.abbrev;
 446         log.file = rev.diffopt.file;
 447         log.date_mode = rev.date_mode;
 448
 449         if (!log.groups)
 450                 log.groups = SHORTLOG_GROUP_AUTHOR;
 451         shortlog_finish_setup(&log);
 452
 453         /* assume HEAD if from a tty */
 454         if (!nongit && !rev.pending.nr && isatty(0))
 455                 add_head_to_pending(&rev);
 456         if (rev.pending.nr == 0) {
 457                 if (isatty(0))
 458                         fprintf(stderr, _("(reading log message from standard input)\n"));
 459                 read_from_stdin(&log);
 460         }
 461         else
 462                 get_from_rev(&rev, &log);
 463
 464         release_revisions(&rev);
 465
 466         shortlog_output(&log);
 467         if (log.file != stdout)
 468                 fclose(log.file);
 469         return 0;
 470 }
 471
 472 static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
 473                                      const struct shortlog *log)
 474 {
 475         strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
 476         strbuf_addch(sb, '\n');
 477 }
 478
 479 void shortlog_output(struct shortlog *log)
 480 {
 481         size_t i, j;
 482         struct strbuf sb = STRBUF_INIT;
 483
 484         if (log->sort_by_number)
 485                 STABLE_QSORT(log->list.items, log->list.nr,
 486                       log->summary ? compare_by_counter : compare_by_list);
 487         for (i = 0; i < log->list.nr; i++) {
 488                 const struct string_list_item *item = &log->list.items[i];
 489                 if (log->summary) {
 490                         fprintf(log->file, "%6d\t%s\n",
 491                                 (int)UTIL_TO_INT(item), item->string);
 492                 } else {
 493                         struct string_list *onelines = item->util;
 494                         fprintf(log->file, "%s (%"PRIuMAX"):\n",
 495                                 item->string, (uintmax_t)onelines->nr);
 496                         for (j = onelines->nr; j >= 1; j--) {
 497                                 const char *msg = onelines->items[j - 1].string;
 498
 499                                 if (log->wrap_lines) {
 500                                         strbuf_reset(&sb);
 501                                         add_wrapped_shortlog_msg(&sb, msg, log);
 502                                         fwrite(sb.buf, sb.len, 1, log->file);
 503                                 }
 504                                 else
 505                                         fprintf(log->file, "      %s\n", msg);
 506                         }
 507                         putc('\n', log->file);
 508                         onelines->strdup_strings = 1;
 509                         string_list_clear(onelines, 0);
 510                         free(onelines);
 511                 }
 512
 513                 log->list.items[i].util = NULL;
 514         }
 515
 516         strbuf_release(&sb);
 517         log->list.strdup_strings = 1;
 518         string_list_clear(&log->list, 1);
 519         clear_mailmap(&log->mailmap);
 520         string_list_clear(&log->format, 0);
 521 }