Code

git-svn - return original format_svn_date semantics
[git.git] / builtin-shortlog.c
1 #include "builtin.h"
2 #include "cache.h"
3 #include "commit.h"
4 #include "diff.h"
5 #include "string-list.h"
6 #include "revision.h"
7 #include "utf8.h"
8 #include "mailmap.h"
9 #include "shortlog.h"
10 #include "parse-options.h"
12 static char const * const shortlog_usage[] = {
13         "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]",
14         "",
15         "[rev-opts] are documented in git-rev-list(1)",
16         NULL
17 };
19 static int compare_by_number(const void *a1, const void *a2)
20 {
21         const struct string_list_item *i1 = a1, *i2 = a2;
22         const struct string_list *l1 = i1->util, *l2 = i2->util;
24         if (l1->nr < l2->nr)
25                 return 1;
26         else if (l1->nr == l2->nr)
27                 return 0;
28         else
29                 return -1;
30 }
32 const char *format_subject(struct strbuf *sb, const char *msg,
33                            const char *line_separator);
35 static void insert_one_record(struct shortlog *log,
36                               const char *author,
37                               const char *oneline)
38 {
39         const char *dot3 = log->common_repo_prefix;
40         char *buffer, *p;
41         struct string_list_item *item;
42         char namebuf[1024];
43         char emailbuf[1024];
44         size_t len;
45         const char *eol;
46         const char *boemail, *eoemail;
47         struct strbuf subject = STRBUF_INIT;
49         boemail = strchr(author, '<');
50         if (!boemail)
51                 return;
52         eoemail = strchr(boemail, '>');
53         if (!eoemail)
54                 return;
56         /* copy author name to namebuf, to support matching on both name and email */
57         memcpy(namebuf, author, boemail - author);
58         len = boemail - author;
59         while(len > 0 && isspace(namebuf[len-1]))
60                 len--;
61         namebuf[len] = 0;
63         /* copy email name to emailbuf, to allow email replacement as well */
64         memcpy(emailbuf, boemail+1, eoemail - boemail);
65         emailbuf[eoemail - boemail - 1] = 0;
67         if (!map_user(&log->mailmap, emailbuf, sizeof(emailbuf), namebuf, sizeof(namebuf))) {
68                 while (author < boemail && isspace(*author))
69                         author++;
70                 for (len = 0;
71                      len < sizeof(namebuf) - 1 && author + len < boemail;
72                      len++)
73                         namebuf[len] = author[len];
74                 while (0 < len && isspace(namebuf[len-1]))
75                         len--;
76                 namebuf[len] = '\0';
77         }
78         else
79                 len = strlen(namebuf);
81         if (log->email) {
82                 size_t room = sizeof(namebuf) - len - 1;
83                 int maillen = strlen(emailbuf);
84                 snprintf(namebuf + len, room, " <%.*s>", maillen, emailbuf);
85         }
87         item = string_list_insert(namebuf, &log->list);
88         if (item->util == NULL)
89                 item->util = xcalloc(1, sizeof(struct string_list));
91         /* Skip any leading whitespace, including any blank lines. */
92         while (*oneline && isspace(*oneline))
93                 oneline++;
94         eol = strchr(oneline, '\n');
95         if (!eol)
96                 eol = oneline + strlen(oneline);
97         if (!prefixcmp(oneline, "[PATCH")) {
98                 char *eob = strchr(oneline, ']');
99                 if (eob && (!eol || eob < eol))
100                         oneline = eob + 1;
101         }
102         while (*oneline && isspace(*oneline) && *oneline != '\n')
103                 oneline++;
104         len = eol - oneline;
105         format_subject(&subject, oneline, " ");
106         buffer = strbuf_detach(&subject, NULL);
108         if (dot3) {
109                 int dot3len = strlen(dot3);
110                 if (dot3len > 5) {
111                         while ((p = strstr(buffer, dot3)) != NULL) {
112                                 int taillen = strlen(p) - dot3len;
113                                 memcpy(p, "/.../", 5);
114                                 memmove(p + 5, p + dot3len, taillen + 1);
115                         }
116                 }
117         }
119         string_list_append(buffer, item->util);
122 static void read_from_stdin(struct shortlog *log)
124         char author[1024], oneline[1024];
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 */
136                 insert_one_record(log, author + 8, oneline);
137         }
140 void shortlog_add_commit(struct shortlog *log, struct commit *commit)
142         const char *author = NULL, *buffer;
144         buffer = commit->buffer;
145         while (*buffer && *buffer != '\n') {
146                 const char *eol = strchr(buffer, '\n');
148                 if (eol == NULL)
149                         eol = buffer + strlen(buffer);
150                 else
151                         eol++;
153                 if (!prefixcmp(buffer, "author "))
154                         author = buffer + 7;
155                 buffer = eol;
156         }
157         if (!author)
158                 die("Missing author: %s",
159                     sha1_to_hex(commit->object.sha1));
160         if (log->user_format) {
161                 struct strbuf buf = STRBUF_INIT;
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         }
169         if (*buffer)
170                 buffer++;
171         insert_one_record(log, author, !*buffer ? "<none>" : buffer);
174 static void get_from_rev(struct rev_info *rev, struct shortlog *log)
176         struct commit *commit;
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);
184 static int parse_uint(char const **arg, int comma, int defval)
186         unsigned long ul;
187         int ret;
188         char *endp;
190         ul = strtoul(*arg, &endp, 10);
191         if (*endp && *endp != comma)
192                 return -1;
193         if (ul > INT_MAX)
194                 return -1;
195         ret = *arg == endp ? defval : (int)ul;
196         *arg = *endp ? endp + 1 : endp;
197         return ret;
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
205 static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
207         struct shortlog *log = opt->value;
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         }
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;
231 void shortlog_init(struct shortlog *log)
233         memset(log, 0, sizeof(*log));
235         read_mailmap(&log->mailmap, &log->common_repo_prefix);
237         log->list.strdup_strings = 1;
238         log->wrap = DEFAULT_WRAPLEN;
239         log->in1 = DEFAULT_INDENT1;
240         log->in2 = DEFAULT_INDENT2;
243 int cmd_shortlog(int argc, const char **argv, const char *prefix)
245         static struct shortlog log;
246         static struct rev_info rev;
247         int nongit;
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         };
261         struct parse_opt_ctx_t ctx;
263         prefix = setup_git_directory_gently(&nongit);
264         git_config(git_default_config, NULL);
265         shortlog_init(&log);
266         init_revisions(&rev, prefix);
267         parse_options_start(&ctx, argc, argv, PARSE_OPT_KEEP_DASHDASH |
268                             PARSE_OPT_KEEP_ARGV0);
270         for (;;) {
271                 switch (parse_options_step(&ctx, options, shortlog_usage)) {
272                 case PARSE_OPT_HELP:
273                         exit(129);
274                 case PARSE_OPT_DONE:
275                         goto parse_done;
276                 }
277                 parse_revision_opt(&rev, &ctx, options, shortlog_usage);
278         }
279 parse_done:
280         argc = parse_options_end(&ctx);
282         if (setup_revisions(argc, argv, &rev, NULL) != 1) {
283                 error("unrecognized argument: %s", argv[1]);
284                 usage_with_options(shortlog_usage, options);
285         }
287         log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
289         /* assume HEAD if from a tty */
290         if (!nongit && !rev.pending.nr && isatty(0))
291                 add_head_to_pending(&rev);
292         if (rev.pending.nr == 0) {
293                 read_from_stdin(&log);
294         }
295         else
296                 get_from_rev(&rev, &log);
298         shortlog_output(&log);
299         return 0;
302 void shortlog_output(struct shortlog *log)
304         int i, j;
305         if (log->sort_by_number)
306                 qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
307                         compare_by_number);
308         for (i = 0; i < log->list.nr; i++) {
309                 struct string_list *onelines = log->list.items[i].util;
311                 if (log->summary) {
312                         printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
313                 } else {
314                         printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
315                         for (j = onelines->nr - 1; j >= 0; j--) {
316                                 const char *msg = onelines->items[j].string;
318                                 if (log->wrap_lines) {
319                                         int col = print_wrapped_text(msg, log->in1, log->in2, log->wrap);
320                                         if (col != log->wrap)
321                                                 putchar('\n');
322                                 }
323                                 else
324                                         printf("      %s\n", msg);
325                         }
326                         putchar('\n');
327                 }
329                 onelines->strdup_strings = 1;
330                 string_list_clear(onelines, 0);
331                 free(onelines);
332                 log->list.items[i].util = NULL;
333         }
335         log->list.strdup_strings = 1;
336         string_list_clear(&log->list, 1);
337         clear_mailmap(&log->mailmap);