]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/shortlog.c
setup.h: move declarations for setup.c functions from cache.h
[thirdparty/git.git] / builtin / shortlog.c
CommitLineData
b8ec5923
JS
1#include "builtin.h"
2#include "cache.h"
b2141fc1 3#include "config.h"
b8ec5923
JS
4#include "commit.h"
5#include "diff.h"
32a8f510 6#include "environment.h"
f394e093 7#include "gettext.h"
c455c87c 8#include "string-list.h"
b8ec5923 9#include "revision.h"
3714e7c8 10#include "utf8.h"
7c1c6782 11#include "mailmap.h"
e38da487 12#include "setup.h"
552bcac3 13#include "shortlog.h"
14ec9cbd 14#include "parse-options.h"
47beb37b 15#include "trailer.h"
449a9009 16#include "strmap.h"
b8ec5923 17
14ec9cbd 18static char const * const shortlog_usage[] = {
cd56d4e5
19 N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
20 N_("git log --pretty=short | git shortlog [<options>]"),
14ec9cbd
PH
21 NULL
22};
b8ec5923 23
9b21a34a
JK
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
37static 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
43static int compare_by_list(const void *a1, const void *a2)
b8ec5923 44{
c455c87c
JS
45 const struct string_list_item *i1 = a1, *i2 = a2;
46 const struct string_list *l1 = i1->util, *l2 = i2->util;
b8ec5923
JS
47
48 if (l1->nr < l2->nr)
6d6ab610 49 return 1;
b8ec5923
JS
50 else if (l1->nr == l2->nr)
51 return 0;
52 else
6d6ab610 53 return -1;
b8ec5923
JS
54}
55
552bcac3 56static void insert_one_record(struct shortlog *log,
45d93eb8 57 const char *ident,
1e931cb4 58 const char *oneline)
b8ec5923 59{
c455c87c 60 struct string_list_item *item;
1e931cb4 61
45d93eb8 62 item = string_list_insert(&log->list, ident);
b8ec5923 63
ed7eba90 64 if (log->summary)
9b21a34a 65 item->util = (void *)(UTIL_TO_INT(item) + 1);
ed7eba90 66 else {
4e168333 67 char *buffer;
ed7eba90
JK
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);
b8ec5923 86
f2605051
ÆAB
87 if (!item->util) {
88 item->util = xmalloc(sizeof(struct string_list));
89 string_list_init_nodup(item->util);
90 }
ed7eba90
JK
91 string_list_append(item->util, buffer);
92 }
b8ec5923
JS
93}
94
87abb962
JK
95static int parse_ident(struct shortlog *log,
96 struct strbuf *out, const char *in)
1ab03a57
JK
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
552bcac3 118static void read_from_stdin(struct shortlog *log)
b8ec5923 119{
45d93eb8
JK
120 struct strbuf ident = STRBUF_INIT;
121 struct strbuf mapped_ident = STRBUF_INIT;
50250491 122 struct strbuf oneline = STRBUF_INIT;
fbfda15f
LT
123 static const char *author_match[2] = { "Author: ", "author " };
124 static const char *committer_match[2] = { "Commit: ", "committer " };
125 const char **match;
1e931cb4 126
63d24fa0
JK
127 if (HAS_MULTI_BITS(log->groups))
128 die(_("using multiple --group options with stdin is not supported"));
129
130 switch (log->groups) {
92338c45
JK
131 case SHORTLOG_GROUP_AUTHOR:
132 match = author_match;
133 break;
134 case SHORTLOG_GROUP_COMMITTER:
135 match = committer_match;
136 break;
47beb37b 137 case SHORTLOG_GROUP_TRAILER:
b017d3da 138 die(_("using %s with stdin is not supported"), "--group=trailer");
3dc95e09
TB
139 case SHORTLOG_GROUP_FORMAT:
140 die(_("using %s with stdin is not supported"), "--group=format");
92338c45
JK
141 default:
142 BUG("unhandled shortlog group");
143 }
144
45d93eb8 145 while (strbuf_getline_lf(&ident, stdin) != EOF) {
5c3894c3 146 const char *v;
45d93eb8
JK
147 if (!skip_prefix(ident.buf, match[0], &v) &&
148 !skip_prefix(ident.buf, match[1], &v))
1e931cb4 149 continue;
a1c5405a 150 while (strbuf_getline_lf(&oneline, stdin) != EOF &&
50250491 151 oneline.len)
1e931cb4 152 ; /* discard headers */
a1c5405a 153 while (strbuf_getline_lf(&oneline, stdin) != EOF &&
50250491 154 !oneline.len)
1e931cb4 155 ; /* discard blanks */
1ab03a57 156
45d93eb8 157 strbuf_reset(&mapped_ident);
87abb962 158 if (parse_ident(log, &mapped_ident, v) < 0)
1ab03a57
JK
159 continue;
160
45d93eb8 161 insert_one_record(log, mapped_ident.buf, oneline.buf);
b8ec5923 162 }
45d93eb8
JK
163 strbuf_release(&ident);
164 strbuf_release(&mapped_ident);
50250491 165 strbuf_release(&oneline);
b8ec5923
JS
166}
167
47beb37b 168static void insert_records_from_trailers(struct shortlog *log,
63d24fa0 169 struct strset *dups,
47beb37b
JK
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;
56d5dde7 176 struct strbuf ident = STRBUF_INIT;
47beb37b 177
0b293df9
TB
178 if (!log->trailers.nr)
179 return;
180
47beb37b
JK
181 /*
182 * Using format_commit_message("%B") would be simpler here, but
183 * this saves us copying the message.
184 */
185 commit_buffer = logmsg_reencode(commit, NULL, ctx->output_encoding);
186 body = strstr(commit_buffer, "\n\n");
187 if (!body)
188 return;
189
190 trailer_iterator_init(&iter, body);
191 while (trailer_iterator_advance(&iter)) {
192 const char *value = iter.val.buf;
193
63d24fa0 194 if (!string_list_has_string(&log->trailers, iter.key.buf))
47beb37b
JK
195 continue;
196
56d5dde7
JK
197 strbuf_reset(&ident);
198 if (!parse_ident(log, &ident, value))
199 value = ident.buf;
200
449a9009 201 if (!strset_add(dups, value))
f17b0b99 202 continue;
47beb37b
JK
203 insert_one_record(log, value, oneline);
204 }
205 trailer_iterator_release(&iter);
206
56d5dde7 207 strbuf_release(&ident);
47beb37b
JK
208 unuse_commit_buffer(commit, commit_buffer);
209}
210
3dc95e09
TB
211static int shortlog_needs_dedup(const struct shortlog *log)
212{
213 return HAS_MULTI_BITS(log->groups) || log->format.nr > 1 || log->trailers.nr;
214}
215
216static void insert_records_from_format(struct shortlog *log,
217 struct strset *dups,
218 struct commit *commit,
219 struct pretty_print_context *ctx,
220 const char *oneline)
221{
222 struct strbuf buf = STRBUF_INIT;
223 struct string_list_item *item;
224
225 for_each_string_list_item(item, &log->format) {
226 strbuf_reset(&buf);
227
228 format_commit_message(commit, item->string, &buf, ctx);
229
230 if (!shortlog_needs_dedup(log) || strset_add(dups, buf.buf))
231 insert_one_record(log, buf.buf, oneline);
232 }
233
234 strbuf_release(&buf);
235}
236
552bcac3 237void shortlog_add_commit(struct shortlog *log, struct commit *commit)
b8ec5923 238{
2db6b83d 239 struct strbuf oneline = STRBUF_INIT;
63d24fa0 240 struct strset dups = STRSET_INIT;
2db6b83d 241 struct pretty_print_context ctx = {0};
92338c45 242 const char *oneline_str;
2db6b83d
JK
243
244 ctx.fmt = CMIT_FMT_USERFORMAT;
245 ctx.abbrev = log->abbrev;
6d167fd7 246 ctx.print_email_subject = 1;
251554c2 247 ctx.date_mode = log->date_mode;
2db6b83d
JK
248 ctx.output_encoding = get_log_output_encoding();
249
4e1d1a2e
JK
250 if (!log->summary) {
251 if (log->user_format)
252 pretty_print_commit(&ctx, commit, &oneline);
552bcac3 253 else
4e1d1a2e 254 format_commit_message(commit, "%s", &oneline, &ctx);
cd4f09e3 255 }
92338c45
JK
256 oneline_str = oneline.len ? oneline.buf : "<none>";
257
0b293df9 258 insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str);
3dc95e09 259 insert_records_from_format(log, &dups, commit, &ctx, oneline_str);
2db6b83d 260
63d24fa0 261 strset_clear(&dups);
2db6b83d 262 strbuf_release(&oneline);
552bcac3
DB
263}
264
265static void get_from_rev(struct rev_info *rev, struct shortlog *log)
266{
267 struct commit *commit;
268
269 if (prepare_revision_walk(rev))
ab8b53bb 270 die(_("revision walk setup failed"));
552bcac3
DB
271 while ((commit = get_revision(rev)) != NULL)
272 shortlog_add_commit(log, commit);
b8ec5923
JS
273}
274
14ec9cbd 275static int parse_uint(char const **arg, int comma, int defval)
3d711d97
JH
276{
277 unsigned long ul;
278 int ret;
279 char *endp;
280
281 ul = strtoul(*arg, &endp, 10);
14ec9cbd 282 if (*endp && *endp != comma)
3d711d97 283 return -1;
14ec9cbd 284 if (ul > INT_MAX)
3d711d97 285 return -1;
14ec9cbd
PH
286 ret = *arg == endp ? defval : (int)ul;
287 *arg = *endp ? endp + 1 : endp;
3d711d97
JH
288 return ret;
289}
290
291static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
292#define DEFAULT_WRAPLEN 76
293#define DEFAULT_INDENT1 6
294#define DEFAULT_INDENT2 9
295
14ec9cbd 296static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
3d711d97 297{
14ec9cbd
PH
298 struct shortlog *log = opt->value;
299
300 log->wrap_lines = !unset;
301 if (unset)
302 return 0;
303 if (!arg) {
304 log->wrap = DEFAULT_WRAPLEN;
305 log->in1 = DEFAULT_INDENT1;
306 log->in2 = DEFAULT_INDENT2;
307 return 0;
308 }
309
310 log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN);
311 log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1);
312 log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2);
313 if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0)
314 return error(wrap_arg_usage);
315 if (log->wrap &&
316 ((log->in1 && log->wrap <= log->in1) ||
317 (log->in2 && log->wrap <= log->in2)))
318 return error(wrap_arg_usage);
319 return 0;
3d711d97
JH
320}
321
92338c45
JK
322static int parse_group_option(const struct option *opt, const char *arg, int unset)
323{
324 struct shortlog *log = opt->value;
47beb37b 325 const char *field;
92338c45 326
63d24fa0
JK
327 if (unset) {
328 log->groups = 0;
329 string_list_clear(&log->trailers, 0);
3dc95e09 330 string_list_clear(&log->format, 0);
63d24fa0
JK
331 } else if (!strcasecmp(arg, "author"))
332 log->groups |= SHORTLOG_GROUP_AUTHOR;
92338c45 333 else if (!strcasecmp(arg, "committer"))
63d24fa0 334 log->groups |= SHORTLOG_GROUP_COMMITTER;
47beb37b 335 else if (skip_prefix(arg, "trailer:", &field)) {
63d24fa0
JK
336 log->groups |= SHORTLOG_GROUP_TRAILER;
337 string_list_append(&log->trailers, field);
3dc95e09
TB
338 } else if (skip_prefix(arg, "format:", &field)) {
339 log->groups |= SHORTLOG_GROUP_FORMAT;
340 string_list_append(&log->format, field);
341 } else if (strchr(arg, '%')) {
342 log->groups |= SHORTLOG_GROUP_FORMAT;
343 string_list_append(&log->format, arg);
344 } else {
92338c45 345 return error(_("unknown group type: %s"), arg);
3dc95e09 346 }
92338c45
JK
347
348 return 0;
349}
350
351
552bcac3
DB
352void shortlog_init(struct shortlog *log)
353{
354 memset(log, 0, sizeof(*log));
355
4e168333 356 read_mailmap(&log->mailmap);
552bcac3 357
c455c87c 358 log->list.strdup_strings = 1;
552bcac3
DB
359 log->wrap = DEFAULT_WRAPLEN;
360 log->in1 = DEFAULT_INDENT1;
361 log->in2 = DEFAULT_INDENT2;
63d24fa0
JK
362 log->trailers.strdup_strings = 1;
363 log->trailers.cmp = strcasecmp;
3dc95e09 364 log->format.strdup_strings = 1;
552bcac3
DB
365}
366
10538e2a
TB
367void shortlog_finish_setup(struct shortlog *log)
368{
9c10d4ff
TB
369 if (log->groups & SHORTLOG_GROUP_AUTHOR)
370 string_list_append(&log->format,
371 log->email ? "%aN <%aE>" : "%aN");
7b11234e
TB
372 if (log->groups & SHORTLOG_GROUP_COMMITTER)
373 string_list_append(&log->format,
374 log->email ? "%cN <%cE>" : "%cN");
9c10d4ff 375
10538e2a
TB
376 string_list_sort(&log->trailers);
377}
378
b8ec5923
JS
379int cmd_shortlog(int argc, const char **argv, const char *prefix)
380{
64093fc0
JK
381 struct shortlog log = { STRING_LIST_INIT_NODUP };
382 struct rev_info rev;
773b69bf 383 int nongit = !startup_info->have_repository;
552bcac3 384
64093fc0 385 const struct option options[] = {
63d24fa0 386 OPT_BIT('c', "committer", &log.groups,
e73fe3dd 387 N_("group by committer rather than author"),
63d24fa0 388 SHORTLOG_GROUP_COMMITTER),
d5d09d47
SB
389 OPT_BOOL('n', "numbered", &log.sort_by_number,
390 N_("sort output according to the number of commits per author")),
391 OPT_BOOL('s', "summary", &log.summary,
e73fe3dd 392 N_("suppress commit descriptions, only provides commit count")),
d5d09d47 393 OPT_BOOL('e', "email", &log.email,
e73fe3dd 394 N_("show the email address of each author")),
203c8533 395 OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
e73fe3dd 396 N_("linewrap output"), PARSE_OPT_OPTARG,
203c8533 397 &parse_wrap_args),
92338c45 398 OPT_CALLBACK(0, "group", &log, N_("field"),
e73fe3dd 399 N_("group by field"), parse_group_option),
14ec9cbd
PH
400 OPT_END(),
401 };
402
403 struct parse_opt_ctx_t ctx;
404
d551a488 405 git_config(git_default_config, NULL);
552bcac3 406 shortlog_init(&log);
2abf3503 407 repo_init_revisions(the_repository, &rev, prefix);
9ca1169f
SB
408 parse_options_start(&ctx, argc, argv, prefix, options,
409 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
14ec9cbd
PH
410
411 for (;;) {
14ec9cbd 412 switch (parse_options_step(&ctx, options, shortlog_usage)) {
352e7613
ÆAB
413 case PARSE_OPT_NON_OPTION:
414 case PARSE_OPT_UNKNOWN:
415 break;
14ec9cbd 416 case PARSE_OPT_HELP:
3bb0923f 417 case PARSE_OPT_ERROR:
fa83cc83 418 case PARSE_OPT_SUBCOMMAND:
14ec9cbd 419 exit(129);
a92ec7ef
NTND
420 case PARSE_OPT_COMPLETE:
421 exit(0);
14ec9cbd
PH
422 case PARSE_OPT_DONE:
423 goto parse_done;
3d711d97 424 }
6b61ec05 425 parse_revision_opt(&rev, &ctx, options, shortlog_usage);
14ec9cbd
PH
426 }
427parse_done:
087c7458 428 revision_opts_finish(&rev);
14ec9cbd
PH
429 argc = parse_options_end(&ctx);
430
4aa0161e
431 if (nongit && argc > 1) {
432 error(_("too many arguments given outside repository"));
433 usage_with_options(shortlog_usage, options);
434 }
435
14ec9cbd 436 if (setup_revisions(argc, argv, &rev, NULL) != 1) {
ab8b53bb 437 error(_("unrecognized argument: %s"), argv[1]);
14ec9cbd 438 usage_with_options(shortlog_usage, options);
b8ec5923
JS
439 }
440
b526f8ed 441 log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
c1977021 442 log.abbrev = rev.abbrev;
7f7d712b 443 log.file = rev.diffopt.file;
251554c2 444 log.date_mode = rev.date_mode;
b526f8ed 445
63d24fa0
JK
446 if (!log.groups)
447 log.groups = SHORTLOG_GROUP_AUTHOR;
10538e2a 448 shortlog_finish_setup(&log);
63d24fa0 449
3384a2df 450 /* assume HEAD if from a tty */
abe549e1 451 if (!nongit && !rev.pending.nr && isatty(0))
3384a2df 452 add_head_to_pending(&rev);
0497c620 453 if (rev.pending.nr == 0) {
37314495 454 if (isatty(0))
ab8b53bb 455 fprintf(stderr, _("(reading log message from standard input)\n"));
552bcac3 456 read_from_stdin(&log);
0497c620 457 }
b8ec5923 458 else
552bcac3 459 get_from_rev(&rev, &log);
b8ec5923 460
2108fe4a
ÆAB
461 release_revisions(&rev);
462
552bcac3 463 shortlog_output(&log);
7f7d712b
JS
464 if (log.file != stdout)
465 fclose(log.file);
552bcac3
DB
466 return 0;
467}
b8ec5923 468
bb96a2c9
RS
469static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
470 const struct shortlog *log)
471{
5b597082
SP
472 strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
473 strbuf_addch(sb, '\n');
bb96a2c9
RS
474}
475
552bcac3
DB
476void shortlog_output(struct shortlog *log)
477{
99d60545 478 size_t i, j;
bb96a2c9
RS
479 struct strbuf sb = STRBUF_INIT;
480
552bcac3 481 if (log->sort_by_number)
df534dcb 482 STABLE_QSORT(log->list.items, log->list.nr,
9b21a34a 483 log->summary ? compare_by_counter : compare_by_list);
552bcac3 484 for (i = 0; i < log->list.nr; i++) {
9b21a34a 485 const struct string_list_item *item = &log->list.items[i];
552bcac3 486 if (log->summary) {
0a7b3577
JS
487 fprintf(log->file, "%6d\t%s\n",
488 (int)UTIL_TO_INT(item), item->string);
ac60c94d 489 } else {
9b21a34a 490 struct string_list *onelines = item->util;
99d60545
ÆAB
491 fprintf(log->file, "%s (%"PRIuMAX"):\n",
492 item->string, (uintmax_t)onelines->nr);
493 for (j = onelines->nr; j >= 1; j--) {
494 const char *msg = onelines->items[j - 1].string;
3d711d97 495
552bcac3 496 if (log->wrap_lines) {
bb96a2c9
RS
497 strbuf_reset(&sb);
498 add_wrapped_shortlog_msg(&sb, msg, log);
0a7b3577 499 fwrite(sb.buf, sb.len, 1, log->file);
3d711d97
JH
500 }
501 else
0a7b3577 502 fprintf(log->file, " %s\n", msg);
3714e7c8 503 }
0a7b3577 504 putc('\n', log->file);
9b21a34a
JK
505 onelines->strdup_strings = 1;
506 string_list_clear(onelines, 0);
507 free(onelines);
b8ec5923
JS
508 }
509
552bcac3 510 log->list.items[i].util = NULL;
b8ec5923
JS
511 }
512
bb96a2c9 513 strbuf_release(&sb);
c455c87c
JS
514 log->list.strdup_strings = 1;
515 string_list_clear(&log->list, 1);
d20d654f 516 clear_mailmap(&log->mailmap);
3dc95e09 517 string_list_clear(&log->format, 0);
b8ec5923 518}