2006-10-22 13:23:31 +02:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
2008-07-21 20:03:49 +02:00
|
|
|
#include "string-list.h"
|
2006-10-22 13:23:31 +02:00
|
|
|
#include "revision.h"
|
2006-12-22 22:15:59 +01:00
|
|
|
#include "utf8.h"
|
2007-04-27 09:41:15 +02:00
|
|
|
#include "mailmap.h"
|
2008-02-26 00:24:14 +01:00
|
|
|
#include "shortlog.h"
|
2008-07-09 23:38:33 +02:00
|
|
|
#include "parse-options.h"
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-07-09 23:38:33 +02:00
|
|
|
static char const * const shortlog_usage[] = {
|
2008-07-17 02:22:50 +02:00
|
|
|
"git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]",
|
2008-07-09 23:38:33 +02:00
|
|
|
"",
|
|
|
|
"[rev-opts] are documented in git-rev-list(1)",
|
|
|
|
NULL
|
|
|
|
};
|
2006-10-22 13:23:31 +02:00
|
|
|
|
|
|
|
static int compare_by_number(const void *a1, const void *a2)
|
|
|
|
{
|
2008-07-21 20:03:49 +02:00
|
|
|
const struct string_list_item *i1 = a1, *i2 = a2;
|
|
|
|
const struct string_list *l1 = i1->util, *l2 = i2->util;
|
2006-10-22 13:23:31 +02:00
|
|
|
|
|
|
|
if (l1->nr < l2->nr)
|
2006-11-21 21:12:06 +01:00
|
|
|
return 1;
|
2006-10-22 13:23:31 +02:00
|
|
|
else if (l1->nr == l2->nr)
|
|
|
|
return 0;
|
|
|
|
else
|
2006-11-21 21:12:06 +01:00
|
|
|
return -1;
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2009-01-06 21:41:06 +01:00
|
|
|
const char *format_subject(struct strbuf *sb, const char *msg,
|
|
|
|
const char *line_separator);
|
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
static void insert_one_record(struct shortlog *log,
|
2007-12-08 02:07:41 +01:00
|
|
|
const char *author,
|
|
|
|
const char *oneline)
|
2006-10-22 13:23:31 +02:00
|
|
|
{
|
2008-02-26 00:24:14 +01:00
|
|
|
const char *dot3 = log->common_repo_prefix;
|
2006-10-22 13:23:31 +02:00
|
|
|
char *buffer, *p;
|
2008-07-21 20:03:49 +02:00
|
|
|
struct string_list_item *item;
|
2007-12-08 02:07:41 +01:00
|
|
|
char namebuf[1024];
|
2009-02-08 15:34:30 +01:00
|
|
|
char emailbuf[1024];
|
2007-12-08 02:07:41 +01:00
|
|
|
size_t len;
|
|
|
|
const char *eol;
|
|
|
|
const char *boemail, *eoemail;
|
2009-01-06 21:41:06 +01:00
|
|
|
struct strbuf subject = STRBUF_INIT;
|
2007-12-08 02:07:41 +01:00
|
|
|
|
|
|
|
boemail = strchr(author, '<');
|
|
|
|
if (!boemail)
|
|
|
|
return;
|
|
|
|
eoemail = strchr(boemail, '>');
|
|
|
|
if (!eoemail)
|
|
|
|
return;
|
2009-02-08 15:34:30 +01:00
|
|
|
|
|
|
|
/* copy author name to namebuf, to support matching on both name and email */
|
|
|
|
memcpy(namebuf, author, boemail - author);
|
|
|
|
len = boemail - author;
|
2009-09-01 07:35:10 +02:00
|
|
|
while (len > 0 && isspace(namebuf[len-1]))
|
2009-02-08 15:34:30 +01:00
|
|
|
len--;
|
|
|
|
namebuf[len] = 0;
|
|
|
|
|
|
|
|
/* copy email name to emailbuf, to allow email replacement as well */
|
|
|
|
memcpy(emailbuf, boemail+1, eoemail - boemail);
|
|
|
|
emailbuf[eoemail - boemail - 1] = 0;
|
|
|
|
|
|
|
|
if (!map_user(&log->mailmap, emailbuf, sizeof(emailbuf), namebuf, sizeof(namebuf))) {
|
2007-12-08 02:07:41 +01:00
|
|
|
while (author < boemail && isspace(*author))
|
|
|
|
author++;
|
|
|
|
for (len = 0;
|
|
|
|
len < sizeof(namebuf) - 1 && author + len < boemail;
|
|
|
|
len++)
|
|
|
|
namebuf[len] = author[len];
|
|
|
|
while (0 < len && isspace(namebuf[len-1]))
|
|
|
|
len--;
|
|
|
|
namebuf[len] = '\0';
|
|
|
|
}
|
2007-12-08 02:19:31 +01:00
|
|
|
else
|
|
|
|
len = strlen(namebuf);
|
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
if (log->email) {
|
2007-12-08 02:19:31 +01:00
|
|
|
size_t room = sizeof(namebuf) - len - 1;
|
2009-02-08 15:34:30 +01:00
|
|
|
int maillen = strlen(emailbuf);
|
|
|
|
snprintf(namebuf + len, room, " <%.*s>", maillen, emailbuf);
|
2007-12-08 02:19:31 +01:00
|
|
|
}
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-12-30 22:01:44 +01:00
|
|
|
item = string_list_insert(namebuf, &log->list);
|
2006-10-22 13:23:31 +02:00
|
|
|
if (item->util == NULL)
|
2008-07-21 20:03:49 +02:00
|
|
|
item->util = xcalloc(1, sizeof(struct string_list));
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-03-05 15:24:10 +01:00
|
|
|
/* Skip any leading whitespace, including any blank lines. */
|
|
|
|
while (*oneline && isspace(*oneline))
|
|
|
|
oneline++;
|
2007-12-08 02:07:41 +01:00
|
|
|
eol = strchr(oneline, '\n');
|
|
|
|
if (!eol)
|
|
|
|
eol = oneline + strlen(oneline);
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 10:53:29 +01:00
|
|
|
if (!prefixcmp(oneline, "[PATCH")) {
|
2006-11-19 17:28:25 +01:00
|
|
|
char *eob = strchr(oneline, ']');
|
2007-12-08 02:07:41 +01:00
|
|
|
if (eob && (!eol || eob < eol))
|
|
|
|
oneline = eob + 1;
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
2007-12-08 02:07:41 +01:00
|
|
|
while (*oneline && isspace(*oneline) && *oneline != '\n')
|
2006-10-22 13:23:31 +02:00
|
|
|
oneline++;
|
2009-01-06 21:41:06 +01:00
|
|
|
format_subject(&subject, oneline, " ");
|
|
|
|
buffer = strbuf_detach(&subject, NULL);
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2006-11-25 09:01:27 +01:00
|
|
|
if (dot3) {
|
|
|
|
int dot3len = strlen(dot3);
|
|
|
|
if (dot3len > 5) {
|
|
|
|
while ((p = strstr(buffer, dot3)) != NULL) {
|
|
|
|
int taillen = strlen(p) - dot3len;
|
|
|
|
memcpy(p, "/.../", 5);
|
|
|
|
memmove(p + 5, p + dot3len, taillen + 1);
|
|
|
|
}
|
|
|
|
}
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-12-30 22:01:44 +01:00
|
|
|
string_list_append(buffer, item->util);
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
static void read_from_stdin(struct shortlog *log)
|
2006-10-22 13:23:31 +02:00
|
|
|
{
|
2007-12-08 02:07:41 +01:00
|
|
|
char author[1024], oneline[1024];
|
|
|
|
|
|
|
|
while (fgets(author, sizeof(author), stdin) != NULL) {
|
|
|
|
if (!(author[0] == 'A' || author[0] == 'a') ||
|
|
|
|
prefixcmp(author + 1, "uthor: "))
|
|
|
|
continue;
|
|
|
|
while (fgets(oneline, sizeof(oneline), stdin) &&
|
|
|
|
oneline[0] != '\n')
|
|
|
|
; /* discard headers */
|
|
|
|
while (fgets(oneline, sizeof(oneline), stdin) &&
|
|
|
|
oneline[0] == '\n')
|
|
|
|
; /* discard blanks */
|
2008-02-26 00:24:14 +01:00
|
|
|
insert_one_record(log, author + 8, oneline);
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
|
2006-10-22 13:23:31 +02:00
|
|
|
{
|
2008-02-26 00:24:14 +01:00
|
|
|
const char *author = NULL, *buffer;
|
2009-11-25 20:33:28 +01:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct strbuf ufbuf = STRBUF_INIT;
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2009-11-25 20:33:28 +01:00
|
|
|
pretty_print_commit(CMIT_FMT_RAW, commit, &buf,
|
|
|
|
0, NULL, NULL, DATE_NORMAL, 0);
|
|
|
|
buffer = buf.buf;
|
2008-02-26 00:24:14 +01:00
|
|
|
while (*buffer && *buffer != '\n') {
|
|
|
|
const char *eol = strchr(buffer, '\n');
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
if (eol == NULL)
|
|
|
|
eol = buffer + strlen(buffer);
|
|
|
|
else
|
|
|
|
eol++;
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
if (!prefixcmp(buffer, "author "))
|
|
|
|
author = buffer + 7;
|
|
|
|
buffer = eol;
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
2008-02-26 00:24:14 +01:00
|
|
|
if (!author)
|
|
|
|
die("Missing author: %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
2008-07-14 20:08:52 +02:00
|
|
|
if (log->user_format) {
|
2009-11-25 20:33:28 +01:00
|
|
|
pretty_print_commit(CMIT_FMT_USERFORMAT, commit, &ufbuf,
|
2008-07-14 20:08:52 +02:00
|
|
|
DEFAULT_ABBREV, "", "", DATE_NORMAL, 0);
|
2009-11-25 20:33:28 +01:00
|
|
|
buffer = ufbuf.buf;
|
|
|
|
} else if (*buffer) {
|
2008-02-26 00:24:14 +01:00
|
|
|
buffer++;
|
2009-11-25 20:33:28 +01:00
|
|
|
}
|
2008-02-26 00:24:14 +01:00
|
|
|
insert_one_record(log, author, !*buffer ? "<none>" : buffer);
|
2009-11-25 20:33:28 +01:00
|
|
|
strbuf_release(&ufbuf);
|
|
|
|
strbuf_release(&buf);
|
2008-02-26 00:24:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void get_from_rev(struct rev_info *rev, struct shortlog *log)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
if (prepare_revision_walk(rev))
|
|
|
|
die("revision walk setup failed");
|
|
|
|
while ((commit = get_revision(rev)) != NULL)
|
|
|
|
shortlog_add_commit(log, commit);
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-09 23:38:33 +02:00
|
|
|
static int parse_uint(char const **arg, int comma, int defval)
|
2007-04-08 10:28:00 +02:00
|
|
|
{
|
|
|
|
unsigned long ul;
|
|
|
|
int ret;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
ul = strtoul(*arg, &endp, 10);
|
2008-07-09 23:38:33 +02:00
|
|
|
if (*endp && *endp != comma)
|
2007-04-08 10:28:00 +02:00
|
|
|
return -1;
|
2008-07-09 23:38:33 +02:00
|
|
|
if (ul > INT_MAX)
|
2007-04-08 10:28:00 +02:00
|
|
|
return -1;
|
2008-07-09 23:38:33 +02:00
|
|
|
ret = *arg == endp ? defval : (int)ul;
|
|
|
|
*arg = *endp ? endp + 1 : endp;
|
2007-04-08 10:28:00 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
|
|
|
|
#define DEFAULT_WRAPLEN 76
|
|
|
|
#define DEFAULT_INDENT1 6
|
|
|
|
#define DEFAULT_INDENT2 9
|
|
|
|
|
2008-07-09 23:38:33 +02:00
|
|
|
static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
|
2007-04-08 10:28:00 +02:00
|
|
|
{
|
2008-07-09 23:38:33 +02:00
|
|
|
struct shortlog *log = opt->value;
|
|
|
|
|
|
|
|
log->wrap_lines = !unset;
|
|
|
|
if (unset)
|
|
|
|
return 0;
|
|
|
|
if (!arg) {
|
|
|
|
log->wrap = DEFAULT_WRAPLEN;
|
|
|
|
log->in1 = DEFAULT_INDENT1;
|
|
|
|
log->in2 = DEFAULT_INDENT2;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
log->wrap = parse_uint(&arg, ',', DEFAULT_WRAPLEN);
|
|
|
|
log->in1 = parse_uint(&arg, ',', DEFAULT_INDENT1);
|
|
|
|
log->in2 = parse_uint(&arg, '\0', DEFAULT_INDENT2);
|
|
|
|
if (log->wrap < 0 || log->in1 < 0 || log->in2 < 0)
|
|
|
|
return error(wrap_arg_usage);
|
|
|
|
if (log->wrap &&
|
|
|
|
((log->in1 && log->wrap <= log->in1) ||
|
|
|
|
(log->in2 && log->wrap <= log->in2)))
|
|
|
|
return error(wrap_arg_usage);
|
|
|
|
return 0;
|
2007-04-08 10:28:00 +02:00
|
|
|
}
|
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
void shortlog_init(struct shortlog *log)
|
|
|
|
{
|
|
|
|
memset(log, 0, sizeof(*log));
|
|
|
|
|
2009-02-08 15:34:27 +01:00
|
|
|
read_mailmap(&log->mailmap, &log->common_repo_prefix);
|
2008-02-26 00:24:14 +01:00
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
log->list.strdup_strings = 1;
|
2008-02-26 00:24:14 +01:00
|
|
|
log->wrap = DEFAULT_WRAPLEN;
|
|
|
|
log->in1 = DEFAULT_INDENT1;
|
|
|
|
log->in2 = DEFAULT_INDENT2;
|
|
|
|
}
|
|
|
|
|
2006-10-22 13:23:31 +02:00
|
|
|
int cmd_shortlog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2008-07-09 23:38:33 +02:00
|
|
|
static struct shortlog log;
|
|
|
|
static struct rev_info rev;
|
2008-03-14 22:35:24 +01:00
|
|
|
int nongit;
|
2008-02-26 00:24:14 +01:00
|
|
|
|
2008-07-09 23:38:33 +02:00
|
|
|
static const struct option options[] = {
|
|
|
|
OPT_BOOLEAN('n', "numbered", &log.sort_by_number,
|
|
|
|
"sort output according to the number of commits per author"),
|
|
|
|
OPT_BOOLEAN('s', "summary", &log.summary,
|
|
|
|
"Suppress commit descriptions, only provides commit count"),
|
|
|
|
OPT_BOOLEAN('e', "email", &log.email,
|
|
|
|
"Show the email address of each author"),
|
|
|
|
{ OPTION_CALLBACK, 'w', NULL, &log, "w[,i1[,i2]]",
|
|
|
|
"Linewrap output", PARSE_OPT_OPTARG, &parse_wrap_args },
|
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
|
|
|
struct parse_opt_ctx_t ctx;
|
|
|
|
|
2008-03-14 22:35:24 +01:00
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
2009-02-08 15:34:27 +01:00
|
|
|
git_config(git_default_config, NULL);
|
2008-02-26 00:24:14 +01:00
|
|
|
shortlog_init(&log);
|
2008-07-09 23:38:33 +02:00
|
|
|
init_revisions(&rev, prefix);
|
2009-05-23 20:53:12 +02:00
|
|
|
parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH |
|
2008-07-09 23:38:33 +02:00
|
|
|
PARSE_OPT_KEEP_ARGV0);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
switch (parse_options_step(&ctx, options, shortlog_usage)) {
|
|
|
|
case PARSE_OPT_HELP:
|
|
|
|
exit(129);
|
|
|
|
case PARSE_OPT_DONE:
|
|
|
|
goto parse_done;
|
2007-04-08 10:28:00 +02:00
|
|
|
}
|
2008-07-09 23:38:34 +02:00
|
|
|
parse_revision_opt(&rev, &ctx, options, shortlog_usage);
|
2008-07-09 23:38:33 +02:00
|
|
|
}
|
|
|
|
parse_done:
|
|
|
|
argc = parse_options_end(&ctx);
|
|
|
|
|
|
|
|
if (setup_revisions(argc, argv, &rev, NULL) != 1) {
|
|
|
|
error("unrecognized argument: %s", argv[1]);
|
|
|
|
usage_with_options(shortlog_usage, options);
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-14 20:08:52 +02:00
|
|
|
log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
|
|
|
|
|
2007-12-11 19:09:04 +01:00
|
|
|
/* assume HEAD if from a tty */
|
2008-03-14 22:35:24 +01:00
|
|
|
if (!nongit && !rev.pending.nr && isatty(0))
|
2007-12-11 19:09:04 +01:00
|
|
|
add_head_to_pending(&rev);
|
2007-03-08 11:12:06 +01:00
|
|
|
if (rev.pending.nr == 0) {
|
2008-02-26 00:24:14 +01:00
|
|
|
read_from_stdin(&log);
|
2007-03-08 11:12:06 +01:00
|
|
|
}
|
2006-10-22 13:23:31 +02:00
|
|
|
else
|
2008-02-26 00:24:14 +01:00
|
|
|
get_from_rev(&rev, &log);
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
shortlog_output(&log);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
void shortlog_output(struct shortlog *log)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
if (log->sort_by_number)
|
2008-07-21 20:03:49 +02:00
|
|
|
qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
|
2008-02-26 00:24:14 +01:00
|
|
|
compare_by_number);
|
|
|
|
for (i = 0; i < log->list.nr; i++) {
|
2008-07-21 20:03:49 +02:00
|
|
|
struct string_list *onelines = log->list.items[i].util;
|
2006-10-22 13:23:31 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
if (log->summary) {
|
2008-07-21 20:03:49 +02:00
|
|
|
printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
|
2006-11-21 21:49:45 +01:00
|
|
|
} else {
|
2008-07-21 20:03:49 +02:00
|
|
|
printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
|
2006-12-22 22:15:59 +01:00
|
|
|
for (j = onelines->nr - 1; j >= 0; j--) {
|
2008-07-21 20:03:49 +02:00
|
|
|
const char *msg = onelines->items[j].string;
|
2007-04-08 10:28:00 +02:00
|
|
|
|
2008-02-26 00:24:14 +01:00
|
|
|
if (log->wrap_lines) {
|
|
|
|
int col = print_wrapped_text(msg, log->in1, log->in2, log->wrap);
|
|
|
|
if (col != log->wrap)
|
2007-04-08 10:28:00 +02:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
printf(" %s\n", msg);
|
2006-12-22 22:15:59 +01:00
|
|
|
}
|
|
|
|
putchar('\n');
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
onelines->strdup_strings = 1;
|
2008-12-30 22:01:44 +01:00
|
|
|
string_list_clear(onelines, 0);
|
2006-10-22 13:23:31 +02:00
|
|
|
free(onelines);
|
2008-02-26 00:24:14 +01:00
|
|
|
log->list.items[i].util = NULL;
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-21 20:03:49 +02:00
|
|
|
log->list.strdup_strings = 1;
|
|
|
|
string_list_clear(&log->list, 1);
|
2009-02-08 15:34:30 +01:00
|
|
|
clear_mailmap(&log->mailmap);
|
2006-10-22 13:23:31 +02:00
|
|
|
}
|