]>
Commit | Line | Data |
---|---|---|
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 | 12 | static char const * const shortlog_usage[] = { |
588c038a | 13 | "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]", |
14ec9cbd PH |
14 | "", |
15 | "[rev-opts] are documented in git-rev-list(1)", | |
16 | NULL | |
17 | }; | |
b8ec5923 JS |
18 | |
19 | static int compare_by_number(const void *a1, const void *a2) | |
20 | { | |
c455c87c JS |
21 | const struct string_list_item *i1 = a1, *i2 = a2; |
22 | const struct string_list *l1 = i1->util, *l2 = i2->util; | |
b8ec5923 JS |
23 | |
24 | if (l1->nr < l2->nr) | |
6d6ab610 | 25 | return 1; |
b8ec5923 JS |
26 | else if (l1->nr == l2->nr) |
27 | return 0; | |
28 | else | |
6d6ab610 | 29 | return -1; |
b8ec5923 JS |
30 | } |
31 | ||
cec08717 RS |
32 | const char *format_subject(struct strbuf *sb, const char *msg, |
33 | const char *line_separator); | |
34 | ||
552bcac3 | 35 | static void insert_one_record(struct shortlog *log, |
1e931cb4 JH |
36 | const char *author, |
37 | const char *oneline) | |
b8ec5923 | 38 | { |
552bcac3 | 39 | const char *dot3 = log->common_repo_prefix; |
b8ec5923 | 40 | char *buffer, *p; |
c455c87c JS |
41 | struct string_list_item *item; |
42 | struct string_list *onelines; | |
1e931cb4 JH |
43 | char namebuf[1024]; |
44 | size_t len; | |
45 | const char *eol; | |
46 | const char *boemail, *eoemail; | |
cec08717 | 47 | struct strbuf subject = STRBUF_INIT; |
1e931cb4 JH |
48 | |
49 | boemail = strchr(author, '<'); | |
50 | if (!boemail) | |
51 | return; | |
52 | eoemail = strchr(boemail, '>'); | |
53 | if (!eoemail) | |
54 | return; | |
552bcac3 | 55 | if (!map_email(&log->mailmap, boemail+1, namebuf, sizeof(namebuf))) { |
1e931cb4 JH |
56 | while (author < boemail && isspace(*author)) |
57 | author++; | |
58 | for (len = 0; | |
59 | len < sizeof(namebuf) - 1 && author + len < boemail; | |
60 | len++) | |
61 | namebuf[len] = author[len]; | |
62 | while (0 < len && isspace(namebuf[len-1])) | |
63 | len--; | |
64 | namebuf[len] = '\0'; | |
65 | } | |
4602c17d JH |
66 | else |
67 | len = strlen(namebuf); | |
68 | ||
552bcac3 | 69 | if (log->email) { |
4602c17d JH |
70 | size_t room = sizeof(namebuf) - len - 1; |
71 | int maillen = eoemail - boemail + 1; | |
72 | snprintf(namebuf + len, room, " %.*s", maillen, boemail); | |
73 | } | |
b8ec5923 | 74 | |
1e931cb4 | 75 | buffer = xstrdup(namebuf); |
c455c87c | 76 | item = string_list_insert(buffer, &log->list); |
b8ec5923 | 77 | if (item->util == NULL) |
c455c87c | 78 | item->util = xcalloc(1, sizeof(struct string_list)); |
b8ec5923 JS |
79 | else |
80 | free(buffer); | |
81 | ||
c1ce83a5 AW |
82 | /* Skip any leading whitespace, including any blank lines. */ |
83 | while (*oneline && isspace(*oneline)) | |
84 | oneline++; | |
1e931cb4 JH |
85 | eol = strchr(oneline, '\n'); |
86 | if (!eol) | |
87 | eol = oneline + strlen(oneline); | |
cc44c765 | 88 | if (!prefixcmp(oneline, "[PATCH")) { |
72019cde | 89 | char *eob = strchr(oneline, ']'); |
1e931cb4 JH |
90 | if (eob && (!eol || eob < eol)) |
91 | oneline = eob + 1; | |
b8ec5923 | 92 | } |
1e931cb4 | 93 | while (*oneline && isspace(*oneline) && *oneline != '\n') |
b8ec5923 | 94 | oneline++; |
1e931cb4 | 95 | len = eol - oneline; |
cec08717 RS |
96 | format_subject(&subject, oneline, " "); |
97 | buffer = strbuf_detach(&subject, NULL); | |
b8ec5923 | 98 | |
c95044d4 JH |
99 | if (dot3) { |
100 | int dot3len = strlen(dot3); | |
101 | if (dot3len > 5) { | |
102 | while ((p = strstr(buffer, dot3)) != NULL) { | |
103 | int taillen = strlen(p) - dot3len; | |
104 | memcpy(p, "/.../", 5); | |
105 | memmove(p + 5, p + dot3len, taillen + 1); | |
106 | } | |
107 | } | |
b8ec5923 JS |
108 | } |
109 | ||
b8ec5923 JS |
110 | onelines = item->util; |
111 | if (onelines->nr >= onelines->alloc) { | |
112 | onelines->alloc = alloc_nr(onelines->nr); | |
113 | onelines->items = xrealloc(onelines->items, | |
114 | onelines->alloc | |
c455c87c | 115 | * sizeof(struct string_list_item)); |
b8ec5923 JS |
116 | } |
117 | ||
118 | onelines->items[onelines->nr].util = NULL; | |
c455c87c | 119 | onelines->items[onelines->nr++].string = buffer; |
b8ec5923 JS |
120 | } |
121 | ||
552bcac3 | 122 | static void read_from_stdin(struct shortlog *log) |
b8ec5923 | 123 | { |
1e931cb4 JH |
124 | char author[1024], oneline[1024]; |
125 | ||
126 | while (fgets(author, sizeof(author), stdin) != NULL) { | |
127 | if (!(author[0] == 'A' || author[0] == 'a') || | |
128 | prefixcmp(author + 1, "uthor: ")) | |
129 | continue; | |
130 | while (fgets(oneline, sizeof(oneline), stdin) && | |
131 | oneline[0] != '\n') | |
132 | ; /* discard headers */ | |
133 | while (fgets(oneline, sizeof(oneline), stdin) && | |
134 | oneline[0] == '\n') | |
135 | ; /* discard blanks */ | |
552bcac3 | 136 | insert_one_record(log, author + 8, oneline); |
b8ec5923 JS |
137 | } |
138 | } | |
139 | ||
552bcac3 | 140 | void shortlog_add_commit(struct shortlog *log, struct commit *commit) |
b8ec5923 | 141 | { |
552bcac3 | 142 | const char *author = NULL, *buffer; |
b8ec5923 | 143 | |
552bcac3 DB |
144 | buffer = commit->buffer; |
145 | while (*buffer && *buffer != '\n') { | |
146 | const char *eol = strchr(buffer, '\n'); | |
b8ec5923 | 147 | |
552bcac3 DB |
148 | if (eol == NULL) |
149 | eol = buffer + strlen(buffer); | |
150 | else | |
151 | eol++; | |
b8ec5923 | 152 | |
552bcac3 DB |
153 | if (!prefixcmp(buffer, "author ")) |
154 | author = buffer + 7; | |
155 | buffer = eol; | |
b8ec5923 | 156 | } |
552bcac3 DB |
157 | if (!author) |
158 | die("Missing author: %s", | |
159 | sha1_to_hex(commit->object.sha1)); | |
b526f8ed JS |
160 | if (log->user_format) { |
161 | struct strbuf buf = STRBUF_INIT; | |
162 | ||
163 | pretty_print_commit(CMIT_FMT_USERFORMAT, commit, &buf, | |
164 | DEFAULT_ABBREV, "", "", DATE_NORMAL, 0); | |
165 | insert_one_record(log, author, buf.buf); | |
166 | strbuf_release(&buf); | |
167 | return; | |
168 | } | |
552bcac3 DB |
169 | if (*buffer) |
170 | buffer++; | |
171 | insert_one_record(log, author, !*buffer ? "<none>" : buffer); | |
172 | } | |
173 | ||
174 | static void get_from_rev(struct rev_info *rev, struct shortlog *log) | |
175 | { | |
176 | struct commit *commit; | |
177 | ||
178 | if (prepare_revision_walk(rev)) | |
179 | die("revision walk setup failed"); | |
180 | while ((commit = get_revision(rev)) != NULL) | |
181 | shortlog_add_commit(log, commit); | |
b8ec5923 JS |
182 | } |
183 | ||
14ec9cbd | 184 | static int parse_uint(char const **arg, int comma, int defval) |
3d711d97 JH |
185 | { |
186 | unsigned long ul; | |
187 | int ret; | |
188 | char *endp; | |
189 | ||
190 | ul = strtoul(*arg, &endp, 10); | |
14ec9cbd | 191 | if (*endp && *endp != comma) |
3d711d97 | 192 | return -1; |
14ec9cbd | 193 | if (ul > INT_MAX) |
3d711d97 | 194 | return -1; |
14ec9cbd PH |
195 | ret = *arg == endp ? defval : (int)ul; |
196 | *arg = *endp ? endp + 1 : endp; | |
3d711d97 JH |
197 | return ret; |
198 | } | |
199 | ||
200 | static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]"; | |
201 | #define DEFAULT_WRAPLEN 76 | |
202 | #define DEFAULT_INDENT1 6 | |
203 | #define DEFAULT_INDENT2 9 | |
204 | ||
14ec9cbd | 205 | static int parse_wrap_args(const struct option *opt, const char *arg, int unset) |
3d711d97 | 206 | { |
14ec9cbd PH |
207 | struct shortlog *log = opt->value; |
208 | ||
209 | log->wrap_lines = !unset; | |
210 | if (unset) | |
211 | return 0; | |
212 | if (!arg) { | |
213 | log->wrap = DEFAULT_WRAPLEN; | |
214 | log->in1 = DEFAULT_INDENT1; | |
215 | log->in2 = DEFAULT_INDENT2; | |
216 | return 0; | |
217 | } | |
218 | ||
219 | log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN); | |
220 | log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1); | |
221 | log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2); | |
222 | if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0) | |
223 | return error(wrap_arg_usage); | |
224 | if (log->wrap && | |
225 | ((log->in1 && log->wrap <= log->in1) || | |
226 | (log->in2 && log->wrap <= log->in2))) | |
227 | return error(wrap_arg_usage); | |
228 | return 0; | |
3d711d97 JH |
229 | } |
230 | ||
552bcac3 DB |
231 | void shortlog_init(struct shortlog *log) |
232 | { | |
233 | memset(log, 0, sizeof(*log)); | |
234 | ||
235 | read_mailmap(&log->mailmap, ".mailmap", &log->common_repo_prefix); | |
236 | ||
c455c87c | 237 | log->list.strdup_strings = 1; |
552bcac3 DB |
238 | log->wrap = DEFAULT_WRAPLEN; |
239 | log->in1 = DEFAULT_INDENT1; | |
240 | log->in2 = DEFAULT_INDENT2; | |
241 | } | |
242 | ||
b8ec5923 JS |
243 | int cmd_shortlog(int argc, const char **argv, const char *prefix) |
244 | { | |
14ec9cbd PH |
245 | static struct shortlog log; |
246 | static struct rev_info rev; | |
abe549e1 | 247 | int nongit; |
552bcac3 | 248 | |
14ec9cbd PH |
249 | static const struct option options[] = { |
250 | OPT_BOOLEAN('n', "numbered", &log.sort_by_number, | |
251 | "sort output according to the number of commits per author"), | |
252 | OPT_BOOLEAN('s', "summary", &log.summary, | |
253 | "Suppress commit descriptions, only provides commit count"), | |
254 | OPT_BOOLEAN('e', "email", &log.email, | |
255 | "Show the email address of each author"), | |
256 | { OPTION_CALLBACK, 'w', NULL, &log, "w[,i1[,i2]]", | |
257 | "Linewrap output", PARSE_OPT_OPTARG, &parse_wrap_args }, | |
258 | OPT_END(), | |
259 | }; | |
260 | ||
261 | struct parse_opt_ctx_t ctx; | |
262 | ||
abe549e1 | 263 | prefix = setup_git_directory_gently(&nongit); |
552bcac3 | 264 | shortlog_init(&log); |
14ec9cbd PH |
265 | init_revisions(&rev, prefix); |
266 | parse_options_start(&ctx, argc, argv, PARSE_OPT_KEEP_DASHDASH | | |
267 | PARSE_OPT_KEEP_ARGV0); | |
268 | ||
269 | for (;;) { | |
14ec9cbd PH |
270 | switch (parse_options_step(&ctx, options, shortlog_usage)) { |
271 | case PARSE_OPT_HELP: | |
272 | exit(129); | |
273 | case PARSE_OPT_DONE: | |
274 | goto parse_done; | |
3d711d97 | 275 | } |
6b61ec05 | 276 | parse_revision_opt(&rev, &ctx, options, shortlog_usage); |
14ec9cbd PH |
277 | } |
278 | parse_done: | |
279 | argc = parse_options_end(&ctx); | |
280 | ||
281 | if (setup_revisions(argc, argv, &rev, NULL) != 1) { | |
282 | error("unrecognized argument: %s", argv[1]); | |
283 | usage_with_options(shortlog_usage, options); | |
b8ec5923 JS |
284 | } |
285 | ||
b526f8ed JS |
286 | log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT; |
287 | ||
3384a2df | 288 | /* assume HEAD if from a tty */ |
abe549e1 | 289 | if (!nongit && !rev.pending.nr && isatty(0)) |
3384a2df | 290 | add_head_to_pending(&rev); |
0497c620 | 291 | if (rev.pending.nr == 0) { |
552bcac3 | 292 | read_from_stdin(&log); |
0497c620 | 293 | } |
b8ec5923 | 294 | else |
552bcac3 | 295 | get_from_rev(&rev, &log); |
b8ec5923 | 296 | |
552bcac3 DB |
297 | shortlog_output(&log); |
298 | return 0; | |
299 | } | |
b8ec5923 | 300 | |
552bcac3 DB |
301 | void shortlog_output(struct shortlog *log) |
302 | { | |
303 | int i, j; | |
304 | if (log->sort_by_number) | |
c455c87c | 305 | qsort(log->list.items, log->list.nr, sizeof(struct string_list_item), |
552bcac3 DB |
306 | compare_by_number); |
307 | for (i = 0; i < log->list.nr; i++) { | |
c455c87c | 308 | struct string_list *onelines = log->list.items[i].util; |
b8ec5923 | 309 | |
552bcac3 | 310 | if (log->summary) { |
c455c87c | 311 | printf("%6d\t%s\n", onelines->nr, log->list.items[i].string); |
ac60c94d | 312 | } else { |
c455c87c | 313 | printf("%s (%d):\n", log->list.items[i].string, onelines->nr); |
3714e7c8 | 314 | for (j = onelines->nr - 1; j >= 0; j--) { |
c455c87c | 315 | const char *msg = onelines->items[j].string; |
3d711d97 | 316 | |
552bcac3 DB |
317 | if (log->wrap_lines) { |
318 | int col = print_wrapped_text(msg, log->in1, log->in2, log->wrap); | |
319 | if (col != log->wrap) | |
3d711d97 JH |
320 | putchar('\n'); |
321 | } | |
322 | else | |
323 | printf(" %s\n", msg); | |
3714e7c8 JS |
324 | } |
325 | putchar('\n'); | |
b8ec5923 JS |
326 | } |
327 | ||
c455c87c JS |
328 | onelines->strdup_strings = 1; |
329 | string_list_clear(onelines, 1); | |
b8ec5923 | 330 | free(onelines); |
552bcac3 | 331 | log->list.items[i].util = NULL; |
b8ec5923 JS |
332 | } |
333 | ||
c455c87c JS |
334 | log->list.strdup_strings = 1; |
335 | string_list_clear(&log->list, 1); | |
336 | log->mailmap.strdup_strings = 1; | |
337 | string_list_clear(&log->mailmap, 1); | |
b8ec5923 | 338 | } |