builtin/shortlog.c

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