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