]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/shortlog.c
Merge branch 'jc/strbuf-getline'
[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) {
97 if (!(author[0] == 'A' || author[0] == 'a') ||
59556548 98 !starts_with(author + 1, "uthor: "))
1e931cb4
JH
99 continue;
100 while (fgets(oneline, sizeof(oneline), stdin) &&
101 oneline[0] != '\n')
102 ; /* discard headers */
103 while (fgets(oneline, sizeof(oneline), stdin) &&
104 oneline[0] == '\n')
105 ; /* discard blanks */
552bcac3 106 insert_one_record(log, author + 8, oneline);
b8ec5923
JS
107 }
108}
109
552bcac3 110void shortlog_add_commit(struct shortlog *log, struct commit *commit)
b8ec5923 111{
552bcac3 112 const char *author = NULL, *buffer;
79f7ca06
UKK
113 struct strbuf buf = STRBUF_INIT;
114 struct strbuf ufbuf = STRBUF_INIT;
b8ec5923 115
8b8a5374 116 pp_commit_easy(CMIT_FMT_RAW, commit, &buf);
79f7ca06 117 buffer = buf.buf;
552bcac3
DB
118 while (*buffer && *buffer != '\n') {
119 const char *eol = strchr(buffer, '\n');
b8ec5923 120
552bcac3
DB
121 if (eol == NULL)
122 eol = buffer + strlen(buffer);
123 else
124 eol++;
b8ec5923 125
59556548 126 if (starts_with(buffer, "author "))
552bcac3
DB
127 author = buffer + 7;
128 buffer = eol;
b8ec5923 129 }
cd4f09e3
JK
130 if (!author) {
131 warning(_("Missing author: %s"),
f2fd0760 132 oid_to_hex(&commit->object.oid));
cd4f09e3
JK
133 return;
134 }
b526f8ed 135 if (log->user_format) {
dd2e794a 136 struct pretty_print_context ctx = {0};
6bf13944 137 ctx.fmt = CMIT_FMT_USERFORMAT;
c1977021 138 ctx.abbrev = log->abbrev;
dd2e794a
TR
139 ctx.subject = "";
140 ctx.after_subject = "";
a5481a6c 141 ctx.date_mode.type = DATE_NORMAL;
ecaee805 142 ctx.output_encoding = get_log_output_encoding();
6bf13944 143 pretty_print_commit(&ctx, commit, &ufbuf);
79f7ca06
UKK
144 buffer = ufbuf.buf;
145 } else if (*buffer) {
552bcac3 146 buffer++;
79f7ca06 147 }
552bcac3 148 insert_one_record(log, author, !*buffer ? "<none>" : buffer);
79f7ca06
UKK
149 strbuf_release(&ufbuf);
150 strbuf_release(&buf);
552bcac3
DB
151}
152
153static void get_from_rev(struct rev_info *rev, struct shortlog *log)
154{
155 struct commit *commit;
156
157 if (prepare_revision_walk(rev))
ab8b53bb 158 die(_("revision walk setup failed"));
552bcac3
DB
159 while ((commit = get_revision(rev)) != NULL)
160 shortlog_add_commit(log, commit);
b8ec5923
JS
161}
162
14ec9cbd 163static int parse_uint(char const **arg, int comma, int defval)
3d711d97
JH
164{
165 unsigned long ul;
166 int ret;
167 char *endp;
168
169 ul = strtoul(*arg, &endp, 10);
14ec9cbd 170 if (*endp && *endp != comma)
3d711d97 171 return -1;
14ec9cbd 172 if (ul > INT_MAX)
3d711d97 173 return -1;
14ec9cbd
PH
174 ret = *arg == endp ? defval : (int)ul;
175 *arg = *endp ? endp + 1 : endp;
3d711d97
JH
176 return ret;
177}
178
179static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
180#define DEFAULT_WRAPLEN 76
181#define DEFAULT_INDENT1 6
182#define DEFAULT_INDENT2 9
183
14ec9cbd 184static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
3d711d97 185{
14ec9cbd
PH
186 struct shortlog *log = opt->value;
187
188 log->wrap_lines = !unset;
189 if (unset)
190 return 0;
191 if (!arg) {
192 log->wrap = DEFAULT_WRAPLEN;
193 log->in1 = DEFAULT_INDENT1;
194 log->in2 = DEFAULT_INDENT2;
195 return 0;
196 }
197
198 log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN);
199 log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1);
200 log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2);
201 if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0)
202 return error(wrap_arg_usage);
203 if (log->wrap &&
204 ((log->in1 && log->wrap <= log->in1) ||
205 (log->in2 && log->wrap <= log->in2)))
206 return error(wrap_arg_usage);
207 return 0;
3d711d97
JH
208}
209
552bcac3
DB
210void shortlog_init(struct shortlog *log)
211{
212 memset(log, 0, sizeof(*log));
213
d551a488 214 read_mailmap(&log->mailmap, &log->common_repo_prefix);
552bcac3 215
c455c87c 216 log->list.strdup_strings = 1;
552bcac3
DB
217 log->wrap = DEFAULT_WRAPLEN;
218 log->in1 = DEFAULT_INDENT1;
219 log->in2 = DEFAULT_INDENT2;
220}
221
b8ec5923
JS
222int cmd_shortlog(int argc, const char **argv, const char *prefix)
223{
14ec9cbd
PH
224 static struct shortlog log;
225 static struct rev_info rev;
773b69bf 226 int nongit = !startup_info->have_repository;
552bcac3 227
14ec9cbd 228 static const struct option options[] = {
d5d09d47
SB
229 OPT_BOOL('n', "numbered", &log.sort_by_number,
230 N_("sort output according to the number of commits per author")),
231 OPT_BOOL('s', "summary", &log.summary,
232 N_("Suppress commit descriptions, only provides commit count")),
233 OPT_BOOL('e', "email", &log.email,
234 N_("Show the email address of each author")),
c48bd2c1
NTND
235 { OPTION_CALLBACK, 'w', NULL, &log, N_("w[,i1[,i2]]"),
236 N_("Linewrap output"), PARSE_OPT_OPTARG, &parse_wrap_args },
14ec9cbd
PH
237 OPT_END(),
238 };
239
240 struct parse_opt_ctx_t ctx;
241
d551a488 242 git_config(git_default_config, NULL);
552bcac3 243 shortlog_init(&log);
14ec9cbd 244 init_revisions(&rev, prefix);
9ca1169f
SB
245 parse_options_start(&ctx, argc, argv, prefix, options,
246 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
14ec9cbd
PH
247
248 for (;;) {
14ec9cbd
PH
249 switch (parse_options_step(&ctx, options, shortlog_usage)) {
250 case PARSE_OPT_HELP:
251 exit(129);
252 case PARSE_OPT_DONE:
253 goto parse_done;
3d711d97 254 }
6b61ec05 255 parse_revision_opt(&rev, &ctx, options, shortlog_usage);
14ec9cbd
PH
256 }
257parse_done:
258 argc = parse_options_end(&ctx);
259
260 if (setup_revisions(argc, argv, &rev, NULL) != 1) {
ab8b53bb 261 error(_("unrecognized argument: %s"), argv[1]);
14ec9cbd 262 usage_with_options(shortlog_usage, options);
b8ec5923
JS
263 }
264
b526f8ed 265 log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
c1977021 266 log.abbrev = rev.abbrev;
b526f8ed 267
3384a2df 268 /* assume HEAD if from a tty */
abe549e1 269 if (!nongit && !rev.pending.nr && isatty(0))
3384a2df 270 add_head_to_pending(&rev);
0497c620 271 if (rev.pending.nr == 0) {
37314495 272 if (isatty(0))
ab8b53bb 273 fprintf(stderr, _("(reading log message from standard input)\n"));
552bcac3 274 read_from_stdin(&log);
0497c620 275 }
b8ec5923 276 else
552bcac3 277 get_from_rev(&rev, &log);
b8ec5923 278
552bcac3
DB
279 shortlog_output(&log);
280 return 0;
281}
b8ec5923 282
bb96a2c9
RS
283static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
284 const struct shortlog *log)
285{
5b597082
SP
286 strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
287 strbuf_addch(sb, '\n');
bb96a2c9
RS
288}
289
552bcac3
DB
290void shortlog_output(struct shortlog *log)
291{
292 int i, j;
bb96a2c9
RS
293 struct strbuf sb = STRBUF_INIT;
294
552bcac3 295 if (log->sort_by_number)
c455c87c 296 qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
552bcac3
DB
297 compare_by_number);
298 for (i = 0; i < log->list.nr; i++) {
c455c87c 299 struct string_list *onelines = log->list.items[i].util;
b8ec5923 300
552bcac3 301 if (log->summary) {
c455c87c 302 printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
ac60c94d 303 } else {
c455c87c 304 printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
3714e7c8 305 for (j = onelines->nr - 1; j >= 0; j--) {
c455c87c 306 const char *msg = onelines->items[j].string;
3d711d97 307
552bcac3 308 if (log->wrap_lines) {
bb96a2c9
RS
309 strbuf_reset(&sb);
310 add_wrapped_shortlog_msg(&sb, msg, log);
311 fwrite(sb.buf, sb.len, 1, stdout);
3d711d97
JH
312 }
313 else
314 printf(" %s\n", msg);
3714e7c8
JS
315 }
316 putchar('\n');
b8ec5923
JS
317 }
318
c455c87c 319 onelines->strdup_strings = 1;
fe73fc1a 320 string_list_clear(onelines, 0);
b8ec5923 321 free(onelines);
552bcac3 322 log->list.items[i].util = NULL;
b8ec5923
JS
323 }
324
bb96a2c9 325 strbuf_release(&sb);
c455c87c
JS
326 log->list.strdup_strings = 1;
327 string_list_clear(&log->list, 1);
d20d654f 328 clear_mailmap(&log->mailmap);
b8ec5923 329}