2006-10-22 15:23:31 +04:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "path-list.h"
|
|
|
|
#include "revision.h"
|
2006-12-23 00:15:59 +03:00
|
|
|
#include "utf8.h"
|
2007-04-27 11:41:15 +04:00
|
|
|
#include "mailmap.h"
|
2008-02-26 02:24:14 +03:00
|
|
|
#include "shortlog.h"
|
2006-10-22 15:23:31 +04:00
|
|
|
|
|
|
|
static const char shortlog_usage[] =
|
2008-04-13 02:38:20 +04:00
|
|
|
"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";
|
2006-10-22 15:23:31 +04:00
|
|
|
|
|
|
|
static int compare_by_number(const void *a1, const void *a2)
|
|
|
|
{
|
|
|
|
const struct path_list_item *i1 = a1, *i2 = a2;
|
|
|
|
const struct path_list *l1 = i1->util, *l2 = i2->util;
|
|
|
|
|
|
|
|
if (l1->nr < l2->nr)
|
2006-11-21 23:12:06 +03:00
|
|
|
return 1;
|
2006-10-22 15:23:31 +04:00
|
|
|
else if (l1->nr == l2->nr)
|
|
|
|
return 0;
|
|
|
|
else
|
2006-11-21 23:12:06 +03:00
|
|
|
return -1;
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
static void insert_one_record(struct shortlog *log,
|
2007-12-08 04:07:41 +03:00
|
|
|
const char *author,
|
|
|
|
const char *oneline)
|
2006-10-22 15:23:31 +04:00
|
|
|
{
|
2008-02-26 02:24:14 +03:00
|
|
|
const char *dot3 = log->common_repo_prefix;
|
2006-10-22 15:23:31 +04:00
|
|
|
char *buffer, *p;
|
|
|
|
struct path_list_item *item;
|
|
|
|
struct path_list *onelines;
|
2007-12-08 04:07:41 +03:00
|
|
|
char namebuf[1024];
|
|
|
|
size_t len;
|
|
|
|
const char *eol;
|
|
|
|
const char *boemail, *eoemail;
|
|
|
|
|
|
|
|
boemail = strchr(author, '<');
|
|
|
|
if (!boemail)
|
|
|
|
return;
|
|
|
|
eoemail = strchr(boemail, '>');
|
|
|
|
if (!eoemail)
|
|
|
|
return;
|
2008-02-26 02:24:14 +03:00
|
|
|
if (!map_email(&log->mailmap, boemail+1, namebuf, sizeof(namebuf))) {
|
2007-12-08 04:07:41 +03: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 04:19:31 +03:00
|
|
|
else
|
|
|
|
len = strlen(namebuf);
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
if (log->email) {
|
2007-12-08 04:19:31 +03:00
|
|
|
size_t room = sizeof(namebuf) - len - 1;
|
|
|
|
int maillen = eoemail - boemail + 1;
|
|
|
|
snprintf(namebuf + len, room, " %.*s", maillen, boemail);
|
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2007-12-08 04:07:41 +03:00
|
|
|
buffer = xstrdup(namebuf);
|
2008-02-26 02:24:14 +03:00
|
|
|
item = path_list_insert(buffer, &log->list);
|
2006-10-22 15:23:31 +04:00
|
|
|
if (item->util == NULL)
|
|
|
|
item->util = xcalloc(1, sizeof(struct path_list));
|
|
|
|
else
|
|
|
|
free(buffer);
|
|
|
|
|
2008-03-05 17:24:10 +03:00
|
|
|
/* Skip any leading whitespace, including any blank lines. */
|
|
|
|
while (*oneline && isspace(*oneline))
|
|
|
|
oneline++;
|
2007-12-08 04:07:41 +03: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 12:53:29 +03:00
|
|
|
if (!prefixcmp(oneline, "[PATCH")) {
|
2006-11-19 19:28:25 +03:00
|
|
|
char *eob = strchr(oneline, ']');
|
2007-12-08 04:07:41 +03:00
|
|
|
if (eob && (!eol || eob < eol))
|
|
|
|
oneline = eob + 1;
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
2007-12-08 04:07:41 +03:00
|
|
|
while (*oneline && isspace(*oneline) && *oneline != '\n')
|
2006-10-22 15:23:31 +04:00
|
|
|
oneline++;
|
2007-12-08 04:07:41 +03:00
|
|
|
len = eol - oneline;
|
|
|
|
while (len && isspace(oneline[len-1]))
|
|
|
|
len--;
|
|
|
|
buffer = xmemdupz(oneline, len);
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2006-11-25 11:01:27 +03: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 15:23:31 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
onelines = item->util;
|
|
|
|
if (onelines->nr >= onelines->alloc) {
|
|
|
|
onelines->alloc = alloc_nr(onelines->nr);
|
|
|
|
onelines->items = xrealloc(onelines->items,
|
|
|
|
onelines->alloc
|
|
|
|
* sizeof(struct path_list_item));
|
|
|
|
}
|
|
|
|
|
|
|
|
onelines->items[onelines->nr].util = NULL;
|
|
|
|
onelines->items[onelines->nr++].path = buffer;
|
|
|
|
}
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
static void read_from_stdin(struct shortlog *log)
|
2006-10-22 15:23:31 +04:00
|
|
|
{
|
2007-12-08 04:07:41 +03: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 02:24:14 +03:00
|
|
|
insert_one_record(log, author + 8, oneline);
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
|
2006-10-22 15:23:31 +04:00
|
|
|
{
|
2008-02-26 02:24:14 +03:00
|
|
|
const char *author = NULL, *buffer;
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
buffer = commit->buffer;
|
|
|
|
while (*buffer && *buffer != '\n') {
|
|
|
|
const char *eol = strchr(buffer, '\n');
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
if (eol == NULL)
|
|
|
|
eol = buffer + strlen(buffer);
|
|
|
|
else
|
|
|
|
eol++;
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
if (!prefixcmp(buffer, "author "))
|
|
|
|
author = buffer + 7;
|
|
|
|
buffer = eol;
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
2008-02-26 02:24:14 +03:00
|
|
|
if (!author)
|
|
|
|
die("Missing author: %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
if (*buffer)
|
|
|
|
buffer++;
|
|
|
|
insert_one_record(log, author, !*buffer ? "<none>" : buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
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 15:23:31 +04:00
|
|
|
}
|
|
|
|
|
2007-04-08 12:28:00 +04:00
|
|
|
static int parse_uint(char const **arg, int comma)
|
|
|
|
{
|
|
|
|
unsigned long ul;
|
|
|
|
int ret;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
ul = strtoul(*arg, &endp, 10);
|
|
|
|
if (endp != *arg && *endp && *endp != comma)
|
|
|
|
return -1;
|
|
|
|
ret = (int) ul;
|
|
|
|
if (ret != ul)
|
|
|
|
return -1;
|
|
|
|
*arg = endp;
|
|
|
|
if (**arg)
|
|
|
|
(*arg)++;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char wrap_arg_usage[] = "-w[<width>[,<indent1>[,<indent2>]]]";
|
|
|
|
#define DEFAULT_WRAPLEN 76
|
|
|
|
#define DEFAULT_INDENT1 6
|
|
|
|
#define DEFAULT_INDENT2 9
|
|
|
|
|
|
|
|
static void parse_wrap_args(const char *arg, int *in1, int *in2, int *wrap)
|
|
|
|
{
|
|
|
|
arg += 2; /* skip -w */
|
|
|
|
|
|
|
|
*wrap = parse_uint(&arg, ',');
|
|
|
|
if (*wrap < 0)
|
|
|
|
die(wrap_arg_usage);
|
|
|
|
*in1 = parse_uint(&arg, ',');
|
|
|
|
if (*in1 < 0)
|
|
|
|
die(wrap_arg_usage);
|
|
|
|
*in2 = parse_uint(&arg, '\0');
|
|
|
|
if (*in2 < 0)
|
|
|
|
die(wrap_arg_usage);
|
|
|
|
|
|
|
|
if (!*wrap)
|
|
|
|
*wrap = DEFAULT_WRAPLEN;
|
|
|
|
if (!*in1)
|
|
|
|
*in1 = DEFAULT_INDENT1;
|
|
|
|
if (!*in2)
|
|
|
|
*in2 = DEFAULT_INDENT2;
|
|
|
|
if (*wrap &&
|
|
|
|
((*in1 && *wrap <= *in1) ||
|
|
|
|
(*in2 && *wrap <= *in2)))
|
|
|
|
die(wrap_arg_usage);
|
|
|
|
}
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
void shortlog_init(struct shortlog *log)
|
|
|
|
{
|
|
|
|
memset(log, 0, sizeof(*log));
|
|
|
|
|
|
|
|
read_mailmap(&log->mailmap, ".mailmap", &log->common_repo_prefix);
|
|
|
|
|
|
|
|
log->list.strdup_paths = 1;
|
|
|
|
log->wrap = DEFAULT_WRAPLEN;
|
|
|
|
log->in1 = DEFAULT_INDENT1;
|
|
|
|
log->in2 = DEFAULT_INDENT2;
|
|
|
|
}
|
|
|
|
|
2006-10-22 15:23:31 +04:00
|
|
|
int cmd_shortlog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2008-02-26 02:24:14 +03:00
|
|
|
struct shortlog log;
|
2006-10-22 15:23:31 +04:00
|
|
|
struct rev_info rev;
|
2008-03-15 00:35:24 +03:00
|
|
|
int nongit;
|
2008-02-26 02:24:14 +03:00
|
|
|
|
2008-03-15 00:35:24 +03:00
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
2008-02-26 02:24:14 +03:00
|
|
|
shortlog_init(&log);
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2006-11-21 23:12:06 +03:00
|
|
|
/* since -n is a shadowed rev argument, parse our args first */
|
2006-10-22 15:23:31 +04:00
|
|
|
while (argc > 1) {
|
|
|
|
if (!strcmp(argv[1], "-n") || !strcmp(argv[1], "--numbered"))
|
2008-02-26 02:24:14 +03:00
|
|
|
log.sort_by_number = 1;
|
2006-10-22 15:23:31 +04:00
|
|
|
else if (!strcmp(argv[1], "-s") ||
|
|
|
|
!strcmp(argv[1], "--summary"))
|
2008-02-26 02:24:14 +03:00
|
|
|
log.summary = 1;
|
2007-12-08 04:19:31 +03:00
|
|
|
else if (!strcmp(argv[1], "-e") ||
|
|
|
|
!strcmp(argv[1], "--email"))
|
2008-02-26 02:24:14 +03:00
|
|
|
log.email = 1;
|
2007-04-08 12:28:00 +04:00
|
|
|
else if (!prefixcmp(argv[1], "-w")) {
|
2008-02-26 02:24:14 +03:00
|
|
|
log.wrap_lines = 1;
|
|
|
|
parse_wrap_args(argv[1], &log.in1, &log.in2, &log.wrap);
|
2007-04-08 12:28:00 +04:00
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
else if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
|
|
|
|
usage(shortlog_usage);
|
|
|
|
else
|
2006-11-21 23:12:06 +03:00
|
|
|
break;
|
2006-10-22 15:23:31 +04:00
|
|
|
argv++;
|
|
|
|
argc--;
|
|
|
|
}
|
2006-11-21 23:12:06 +03:00
|
|
|
init_revisions(&rev, prefix);
|
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
|
|
|
if (argc > 1)
|
|
|
|
die ("unrecognized argument: %s", argv[1]);
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2007-12-11 21:09:04 +03:00
|
|
|
/* assume HEAD if from a tty */
|
2008-03-15 00:35:24 +03:00
|
|
|
if (!nongit && !rev.pending.nr && isatty(0))
|
2007-12-11 21:09:04 +03:00
|
|
|
add_head_to_pending(&rev);
|
2007-03-08 13:12:06 +03:00
|
|
|
if (rev.pending.nr == 0) {
|
2008-02-26 02:24:14 +03:00
|
|
|
read_from_stdin(&log);
|
2007-03-08 13:12:06 +03:00
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
else
|
2008-02-26 02:24:14 +03:00
|
|
|
get_from_rev(&rev, &log);
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
shortlog_output(&log);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
void shortlog_output(struct shortlog *log)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
if (log->sort_by_number)
|
|
|
|
qsort(log->list.items, log->list.nr, sizeof(struct path_list_item),
|
|
|
|
compare_by_number);
|
|
|
|
for (i = 0; i < log->list.nr; i++) {
|
|
|
|
struct path_list *onelines = log->list.items[i].util;
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
if (log->summary) {
|
|
|
|
printf("%6d\t%s\n", onelines->nr, log->list.items[i].path);
|
2006-11-21 23:49:45 +03:00
|
|
|
} else {
|
2008-02-26 02:24:14 +03:00
|
|
|
printf("%s (%d):\n", log->list.items[i].path, onelines->nr);
|
2006-12-23 00:15:59 +03:00
|
|
|
for (j = onelines->nr - 1; j >= 0; j--) {
|
2007-04-08 12:28:00 +04:00
|
|
|
const char *msg = onelines->items[j].path;
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
if (log->wrap_lines) {
|
|
|
|
int col = print_wrapped_text(msg, log->in1, log->in2, log->wrap);
|
|
|
|
if (col != log->wrap)
|
2007-04-08 12:28:00 +04:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
printf(" %s\n", msg);
|
2006-12-23 00:15:59 +03:00
|
|
|
}
|
|
|
|
putchar('\n');
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
onelines->strdup_paths = 1;
|
|
|
|
path_list_clear(onelines, 1);
|
|
|
|
free(onelines);
|
2008-02-26 02:24:14 +03:00
|
|
|
log->list.items[i].util = NULL;
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
|
2008-02-26 02:24:14 +03:00
|
|
|
log->list.strdup_paths = 1;
|
|
|
|
path_list_clear(&log->list, 1);
|
|
|
|
log->mailmap.strdup_paths = 1;
|
|
|
|
path_list_clear(&log->mailmap, 1);
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|