]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/shortlog.c
shortlog: match both "Author:" and "author" on stdin
[thirdparty/git.git] / builtin / shortlog.c
CommitLineData
b8ec5923
JS
1#include "builtin.h"
2#include "cache.h"
3#include "commit.h"
4#include "diff.h"
c455c87c 5#include "string-list.h"
b8ec5923 6#include "revision.h"
3714e7c8 7#include "utf8.h"
7c1c6782 8#include "mailmap.h"
552bcac3 9#include "shortlog.h"
14ec9cbd 10#include "parse-options.h"
b8ec5923 11
14ec9cbd 12static char const * const shortlog_usage[] = {
9c9b4f2f 13 N_("git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"),
14ec9cbd
PH
14 NULL
15};
b8ec5923
JS
16
17static int compare_by_number(const void *a1, const void *a2)
18{
c455c87c
JS
19 const struct string_list_item *i1 = a1, *i2 = a2;
20 const struct string_list *l1 = i1->util, *l2 = i2->util;
b8ec5923
JS
21
22 if (l1->nr < l2->nr)
6d6ab610 23 return 1;
b8ec5923
JS
24 else if (l1->nr == l2->nr)
25 return 0;
26 else
6d6ab610 27 return -1;
b8ec5923
JS
28}
29
552bcac3 30static void insert_one_record(struct shortlog *log,
1e931cb4
JH
31 const char *author,
32 const char *oneline)
b8ec5923 33{
552bcac3 34 const char *dot3 = log->common_repo_prefix;
b8ec5923 35 char *buffer, *p;
c455c87c 36 struct string_list_item *item;
ea02ffa3
AP
37 const char *mailbuf, *namebuf;
38 size_t namelen, maillen;
1e931cb4 39 const char *eol;
cec08717 40 struct strbuf subject = STRBUF_INIT;
ea02ffa3 41 struct strbuf namemailbuf = STRBUF_INIT;
3c020bd5 42 struct ident_split ident;
1e931cb4 43
3c020bd5 44 if (split_ident_line(&ident, author, strlen(author)))
1e931cb4 45 return;
d20d654f 46
ea02ffa3
AP
47 namebuf = ident.name_begin;
48 mailbuf = ident.mail_begin;
49 namelen = ident.name_end - ident.name_begin;
50 maillen = ident.mail_end - ident.mail_begin;
d20d654f 51
ea02ffa3
AP
52 map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
53 strbuf_add(&namemailbuf, namebuf, namelen);
d20d654f 54
ea02ffa3
AP
55 if (log->email)
56 strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf);
b8ec5923 57
ea02ffa3 58 item = string_list_insert(&log->list, namemailbuf.buf);
b8ec5923 59 if (item->util == NULL)
c455c87c 60 item->util = xcalloc(1, sizeof(struct string_list));
b8ec5923 61
c1ce83a5
AW
62 /* Skip any leading whitespace, including any blank lines. */
63 while (*oneline && isspace(*oneline))
64 oneline++;
1e931cb4
JH
65 eol = strchr(oneline, '\n');
66 if (!eol)
67 eol = oneline + strlen(oneline);
59556548 68 if (starts_with(oneline, "[PATCH")) {
72019cde 69 char *eob = strchr(oneline, ']');
1e931cb4
JH
70 if (eob && (!eol || eob < eol))
71 oneline = eob + 1;
b8ec5923 72 }
1e931cb4 73 while (*oneline && isspace(*oneline) && *oneline != '\n')
b8ec5923 74 oneline++;
cec08717
RS
75 format_subject(&subject, oneline, " ");
76 buffer = strbuf_detach(&subject, NULL);
b8ec5923 77
c95044d4
JH
78 if (dot3) {
79 int dot3len = strlen(dot3);
80 if (dot3len > 5) {
81 while ((p = strstr(buffer, dot3)) != NULL) {
82 int taillen = strlen(p) - dot3len;
83 memcpy(p, "/.../", 5);
84 memmove(p + 5, p + dot3len, taillen + 1);
85 }
86 }
b8ec5923
JS
87 }
88
1d2f80fa 89 string_list_append(item->util, buffer);
b8ec5923
JS
90}
91
552bcac3 92static void read_from_stdin(struct shortlog *log)
b8ec5923 93{
1e931cb4
JH
94 char author[1024], oneline[1024];
95
96 while (fgets(author, sizeof(author), stdin) != NULL) {
5c3894c3
JK
97 const char *v;
98 if (!skip_prefix(author, "Author: ", &v) &&
99 !skip_prefix(author, "author ", &v))
1e931cb4
JH
100 continue;
101 while (fgets(oneline, sizeof(oneline), stdin) &&
102 oneline[0] != '\n')
103 ; /* discard headers */
104 while (fgets(oneline, sizeof(oneline), stdin) &&
105 oneline[0] == '\n')
106 ; /* discard blanks */
5c3894c3 107 insert_one_record(log, v, oneline);
b8ec5923
JS
108 }
109}
110
552bcac3 111void shortlog_add_commit(struct shortlog *log, struct commit *commit)
b8ec5923 112{
552bcac3 113 const char *author = NULL, *buffer;
79f7ca06
UKK
114 struct strbuf buf = STRBUF_INIT;
115 struct strbuf ufbuf = STRBUF_INIT;
b8ec5923 116
8b8a5374 117 pp_commit_easy(CMIT_FMT_RAW, commit, &buf);
79f7ca06 118 buffer = buf.buf;
552bcac3
DB
119 while (*buffer && *buffer != '\n') {
120 const char *eol = strchr(buffer, '\n');
b8ec5923 121
552bcac3
DB
122 if (eol == NULL)
123 eol = buffer + strlen(buffer);
124 else
125 eol++;
b8ec5923 126
59556548 127 if (starts_with(buffer, "author "))
552bcac3
DB
128 author = buffer + 7;
129 buffer = eol;
b8ec5923 130 }
cd4f09e3
JK
131 if (!author) {
132 warning(_("Missing author: %s"),
f2fd0760 133 oid_to_hex(&commit->object.oid));
cd4f09e3
JK
134 return;
135 }
b526f8ed 136 if (log->user_format) {
dd2e794a 137 struct pretty_print_context ctx = {0};
6bf13944 138 ctx.fmt = CMIT_FMT_USERFORMAT;
c1977021 139 ctx.abbrev = log->abbrev;
dd2e794a
TR
140 ctx.subject = "";
141 ctx.after_subject = "";
a5481a6c 142 ctx.date_mode.type = DATE_NORMAL;
ecaee805 143 ctx.output_encoding = get_log_output_encoding();
6bf13944 144 pretty_print_commit(&ctx, commit, &ufbuf);
79f7ca06
UKK
145 buffer = ufbuf.buf;
146 } else if (*buffer) {
552bcac3 147 buffer++;
79f7ca06 148 }
552bcac3 149 insert_one_record(log, author, !*buffer ? "<none>" : buffer);
79f7ca06
UKK
150 strbuf_release(&ufbuf);
151 strbuf_release(&buf);
552bcac3
DB
152}
153
154static void get_from_rev(struct rev_info *rev, struct shortlog *log)
155{
156 struct commit *commit;
157
158 if (prepare_revision_walk(rev))
ab8b53bb 159 die(_("revision walk setup failed"));
552bcac3
DB
160 while ((commit = get_revision(rev)) != NULL)
161 shortlog_add_commit(log, commit);
b8ec5923
JS
162}
163
14ec9cbd 164static int parse_uint(char const **arg, int comma, int defval)
3d711d97
JH
165{
166 unsigned long ul;
167 int ret;
168 char *endp;
169
170 ul = strtoul(*arg, &endp, 10);
14ec9cbd 171 if (*endp && *endp != comma)
3d711d97 172 return -1;
14ec9cbd 173 if (ul > INT_MAX)
3d711d97 174 return -1;
14ec9cbd
PH
175 ret = *arg == endp ? defval : (int)ul;
176 *arg = *endp ? endp + 1 : endp;
3d711d97
JH
177 return ret;
178}
179
180static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
181#define DEFAULT_WRAPLEN 76
182#define DEFAULT_INDENT1 6
183#define DEFAULT_INDENT2 9
184
14ec9cbd 185static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
3d711d97 186{
14ec9cbd
PH
187 struct shortlog *log = opt->value;
188
189 log->wrap_lines = !unset;
190 if (unset)
191 return 0;
192 if (!arg) {
193 log->wrap = DEFAULT_WRAPLEN;
194 log->in1 = DEFAULT_INDENT1;
195 log->in2 = DEFAULT_INDENT2;
196 return 0;
197 }
198
199 log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN);
200 log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1);
201 log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2);
202 if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0)
203 return error(wrap_arg_usage);
204 if (log->wrap &&
205 ((log->in1 && log->wrap <= log->in1) ||
206 (log->in2 && log->wrap <= log->in2)))
207 return error(wrap_arg_usage);
208 return 0;
3d711d97
JH
209}
210
552bcac3
DB
211void shortlog_init(struct shortlog *log)
212{
213 memset(log, 0, sizeof(*log));
214
d551a488 215 read_mailmap(&log->mailmap, &log->common_repo_prefix);
552bcac3 216
c455c87c 217 log->list.strdup_strings = 1;
552bcac3
DB
218 log->wrap = DEFAULT_WRAPLEN;
219 log->in1 = DEFAULT_INDENT1;
220 log->in2 = DEFAULT_INDENT2;
221}
222
b8ec5923
JS
223int cmd_shortlog(int argc, const char **argv, const char *prefix)
224{
14ec9cbd
PH
225 static struct shortlog log;
226 static struct rev_info rev;
773b69bf 227 int nongit = !startup_info->have_repository;
552bcac3 228
14ec9cbd 229 static const struct option options[] = {
d5d09d47
SB
230 OPT_BOOL('n', "numbered", &log.sort_by_number,
231 N_("sort output according to the number of commits per author")),
232 OPT_BOOL('s', "summary", &log.summary,
233 N_("Suppress commit descriptions, only provides commit count")),
234 OPT_BOOL('e', "email", &log.email,
235 N_("Show the email address of each author")),
c48bd2c1
NTND
236 { OPTION_CALLBACK, 'w', NULL, &log, N_("w[,i1[,i2]]"),
237 N_("Linewrap output"), PARSE_OPT_OPTARG, &parse_wrap_args },
14ec9cbd
PH
238 OPT_END(),
239 };
240
241 struct parse_opt_ctx_t ctx;
242
d551a488 243 git_config(git_default_config, NULL);
552bcac3 244 shortlog_init(&log);
14ec9cbd 245 init_revisions(&rev, prefix);
9ca1169f
SB
246 parse_options_start(&ctx, argc, argv, prefix, options,
247 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
14ec9cbd
PH
248
249 for (;;) {
14ec9cbd
PH
250 switch (parse_options_step(&ctx, options, shortlog_usage)) {
251 case PARSE_OPT_HELP:
252 exit(129);
253 case PARSE_OPT_DONE:
254 goto parse_done;
3d711d97 255 }
6b61ec05 256 parse_revision_opt(&rev, &ctx, options, shortlog_usage);
14ec9cbd
PH
257 }
258parse_done:
259 argc = parse_options_end(&ctx);
260
261 if (setup_revisions(argc, argv, &rev, NULL) != 1) {
ab8b53bb 262 error(_("unrecognized argument: %s"), argv[1]);
14ec9cbd 263 usage_with_options(shortlog_usage, options);
b8ec5923
JS
264 }
265
b526f8ed 266 log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
c1977021 267 log.abbrev = rev.abbrev;
b526f8ed 268
3384a2df 269 /* assume HEAD if from a tty */
abe549e1 270 if (!nongit && !rev.pending.nr && isatty(0))
3384a2df 271 add_head_to_pending(&rev);
0497c620 272 if (rev.pending.nr == 0) {
37314495 273 if (isatty(0))
ab8b53bb 274 fprintf(stderr, _("(reading log message from standard input)\n"));
552bcac3 275 read_from_stdin(&log);
0497c620 276 }
b8ec5923 277 else
552bcac3 278 get_from_rev(&rev, &log);
b8ec5923 279
552bcac3
DB
280 shortlog_output(&log);
281 return 0;
282}
b8ec5923 283
bb96a2c9
RS
284static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
285 const struct shortlog *log)
286{
5b597082
SP
287 strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
288 strbuf_addch(sb, '\n');
bb96a2c9
RS
289}
290
552bcac3
DB
291void shortlog_output(struct shortlog *log)
292{
293 int i, j;
bb96a2c9
RS
294 struct strbuf sb = STRBUF_INIT;
295
552bcac3 296 if (log->sort_by_number)
c455c87c 297 qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
552bcac3
DB
298 compare_by_number);
299 for (i = 0; i < log->list.nr; i++) {
c455c87c 300 struct string_list *onelines = log->list.items[i].util;
b8ec5923 301
552bcac3 302 if (log->summary) {
c455c87c 303 printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
ac60c94d 304 } else {
c455c87c 305 printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
3714e7c8 306 for (j = onelines->nr - 1; j >= 0; j--) {
c455c87c 307 const char *msg = onelines->items[j].string;
3d711d97 308
552bcac3 309 if (log->wrap_lines) {
bb96a2c9
RS
310 strbuf_reset(&sb);
311 add_wrapped_shortlog_msg(&sb, msg, log);
312 fwrite(sb.buf, sb.len, 1, stdout);
3d711d97
JH
313 }
314 else
315 printf(" %s\n", msg);
3714e7c8
JS
316 }
317 putchar('\n');
b8ec5923
JS
318 }
319
c455c87c 320 onelines->strdup_strings = 1;
fe73fc1a 321 string_list_clear(onelines, 0);
b8ec5923 322 free(onelines);
552bcac3 323 log->list.items[i].util = NULL;
b8ec5923
JS
324 }
325
bb96a2c9 326 strbuf_release(&sb);
c455c87c
JS
327 log->list.strdup_strings = 1;
328 string_list_clear(&log->list, 1);
d20d654f 329 clear_mailmap(&log->mailmap);
b8ec5923 330}