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"
|
2006-10-22 15:23:31 +04:00
|
|
|
|
|
|
|
static const char shortlog_usage[] =
|
2006-11-21 23:49:45 +03:00
|
|
|
"git-shortlog [-n] [-s] [<commit-id>... ]";
|
2006-10-22 15:23:31 +04:00
|
|
|
|
2006-11-25 11:07:54 +03:00
|
|
|
static char *common_repo_prefix;
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2006-11-19 19:28:51 +03:00
|
|
|
static struct path_list mailmap = {NULL, 0, 0, 0};
|
|
|
|
|
2006-10-22 15:23:31 +04:00
|
|
|
static void insert_author_oneline(struct path_list *list,
|
|
|
|
const char *author, int authorlen,
|
|
|
|
const char *oneline, int onelinelen)
|
|
|
|
{
|
2006-11-25 11:07:54 +03:00
|
|
|
const char *dot3 = common_repo_prefix;
|
2006-10-22 15:23:31 +04:00
|
|
|
char *buffer, *p;
|
|
|
|
struct path_list_item *item;
|
|
|
|
struct path_list *onelines;
|
|
|
|
|
|
|
|
while (authorlen > 0 && isspace(author[authorlen - 1]))
|
|
|
|
authorlen--;
|
|
|
|
|
|
|
|
buffer = xmalloc(authorlen + 1);
|
|
|
|
memcpy(buffer, author, authorlen);
|
|
|
|
buffer[authorlen] = '\0';
|
|
|
|
|
|
|
|
item = path_list_insert(buffer, list);
|
|
|
|
if (item->util == NULL)
|
|
|
|
item->util = xcalloc(1, sizeof(struct path_list));
|
|
|
|
else
|
|
|
|
free(buffer);
|
|
|
|
|
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, ']');
|
|
|
|
|
|
|
|
if (eob) {
|
|
|
|
while (isspace(eob[1]) && eob[1] != '\n')
|
|
|
|
eob++;
|
|
|
|
if (eob - oneline < onelinelen) {
|
|
|
|
onelinelen -= eob - oneline;
|
|
|
|
oneline = eob;
|
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (onelinelen > 0 && isspace(oneline[0])) {
|
|
|
|
oneline++;
|
|
|
|
onelinelen--;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (onelinelen > 0 && isspace(oneline[onelinelen - 1]))
|
|
|
|
onelinelen--;
|
|
|
|
|
|
|
|
buffer = xmalloc(onelinelen + 1);
|
|
|
|
memcpy(buffer, oneline, onelinelen);
|
|
|
|
buffer[onelinelen] = '\0';
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_from_stdin(struct path_list *list)
|
|
|
|
{
|
|
|
|
char buffer[1024];
|
|
|
|
|
|
|
|
while (fgets(buffer, sizeof(buffer), stdin) != NULL) {
|
|
|
|
char *bob;
|
|
|
|
if ((buffer[0] == 'A' || buffer[0] == 'a') &&
|
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
|
|
|
!prefixcmp(buffer + 1, "uthor: ") &&
|
2006-10-22 15:23:31 +04:00
|
|
|
(bob = strchr(buffer + 7, '<')) != NULL) {
|
|
|
|
char buffer2[1024], offset = 0;
|
|
|
|
|
2007-04-27 11:41:15 +04:00
|
|
|
if (map_email(&mailmap, bob + 1, buffer, sizeof(buffer)))
|
2006-10-22 15:23:31 +04:00
|
|
|
bob = buffer + strlen(buffer);
|
|
|
|
else {
|
|
|
|
offset = 8;
|
2006-12-11 02:51:54 +03:00
|
|
|
while (buffer + offset < bob &&
|
|
|
|
isspace(bob[-1]))
|
2006-10-22 15:23:31 +04:00
|
|
|
bob--;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (fgets(buffer2, sizeof(buffer2), stdin) &&
|
|
|
|
buffer2[0] != '\n')
|
|
|
|
; /* chomp input */
|
2006-12-11 02:55:07 +03:00
|
|
|
if (fgets(buffer2, sizeof(buffer2), stdin)) {
|
|
|
|
int l2 = strlen(buffer2);
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < l2; i++)
|
|
|
|
if (!isspace(buffer2[i]))
|
|
|
|
break;
|
2006-10-22 15:23:31 +04:00
|
|
|
insert_author_oneline(list,
|
|
|
|
buffer + offset,
|
|
|
|
bob - buffer - offset,
|
2006-12-11 02:55:07 +03:00
|
|
|
buffer2 + i, l2 - i);
|
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_from_rev(struct rev_info *rev, struct path_list *list)
|
|
|
|
{
|
|
|
|
char scratch[1024];
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
prepare_revision_walk(rev);
|
|
|
|
while ((commit = get_revision(rev)) != NULL) {
|
2007-03-07 04:44:17 +03:00
|
|
|
const char *author = NULL, *oneline, *buffer;
|
2006-10-22 15:23:31 +04:00
|
|
|
int authorlen = authorlen, onelinelen;
|
|
|
|
|
|
|
|
/* get author and oneline */
|
|
|
|
for (buffer = commit->buffer; buffer && *buffer != '\0' &&
|
|
|
|
*buffer != '\n'; ) {
|
2007-03-07 04:44:17 +03:00
|
|
|
const char *eol = strchr(buffer, '\n');
|
2006-10-22 15:23:31 +04:00
|
|
|
|
|
|
|
if (eol == NULL)
|
|
|
|
eol = buffer + strlen(buffer);
|
|
|
|
else
|
|
|
|
eol++;
|
|
|
|
|
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(buffer, "author ")) {
|
2006-10-22 15:23:31 +04:00
|
|
|
char *bracket = strchr(buffer, '<');
|
|
|
|
|
|
|
|
if (bracket == NULL || bracket > eol)
|
|
|
|
die("Invalid commit buffer: %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
2007-04-27 11:41:15 +04:00
|
|
|
if (map_email(&mailmap, bracket + 1, scratch,
|
2006-10-22 15:23:31 +04:00
|
|
|
sizeof(scratch))) {
|
|
|
|
author = scratch;
|
|
|
|
authorlen = strlen(scratch);
|
|
|
|
} else {
|
2006-12-09 07:04:21 +03:00
|
|
|
if (bracket[-1] == ' ')
|
2006-10-22 15:23:31 +04:00
|
|
|
bracket--;
|
|
|
|
|
|
|
|
author = buffer + 7;
|
|
|
|
authorlen = bracket - buffer - 7;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffer = eol;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (author == NULL)
|
|
|
|
die ("Missing author: %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
if (buffer == NULL || *buffer == '\0') {
|
|
|
|
oneline = "<none>";
|
|
|
|
onelinelen = sizeof(oneline) + 1;
|
|
|
|
} else {
|
|
|
|
char *eol;
|
|
|
|
|
|
|
|
oneline = buffer + 1;
|
|
|
|
eol = strchr(oneline, '\n');
|
|
|
|
if (eol == NULL)
|
|
|
|
onelinelen = strlen(oneline);
|
|
|
|
else
|
|
|
|
onelinelen = eol - oneline;
|
|
|
|
}
|
|
|
|
|
|
|
|
insert_author_oneline(list,
|
|
|
|
author, authorlen, oneline, onelinelen);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2006-10-22 15:23:31 +04:00
|
|
|
int cmd_shortlog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
struct path_list list = { NULL, 0, 0, 1 };
|
|
|
|
int i, j, sort_by_number = 0, summary = 0;
|
2007-04-08 12:28:00 +04:00
|
|
|
int wrap_lines = 0;
|
|
|
|
int wrap = DEFAULT_WRAPLEN;
|
|
|
|
int in1 = DEFAULT_INDENT1;
|
|
|
|
int in2 = DEFAULT_INDENT2;
|
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"))
|
|
|
|
sort_by_number = 1;
|
|
|
|
else if (!strcmp(argv[1], "-s") ||
|
|
|
|
!strcmp(argv[1], "--summary"))
|
|
|
|
summary = 1;
|
2007-04-08 12:28:00 +04:00
|
|
|
else if (!prefixcmp(argv[1], "-w")) {
|
|
|
|
wrap_lines = 1;
|
|
|
|
parse_wrap_args(argv[1], &in1, &in2, &wrap);
|
|
|
|
}
|
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
|
|
|
|
2006-11-19 19:28:51 +03:00
|
|
|
if (!access(".mailmap", R_OK))
|
2007-04-27 11:41:15 +04:00
|
|
|
read_mailmap(&mailmap, ".mailmap", &common_repo_prefix);
|
2006-11-19 19:28:51 +03:00
|
|
|
|
2007-03-08 13:12:06 +03:00
|
|
|
if (rev.pending.nr == 0) {
|
|
|
|
if (isatty(0))
|
|
|
|
fprintf(stderr, "(reading log to summarize from standard input)\n");
|
2006-10-22 15:23:31 +04:00
|
|
|
read_from_stdin(&list);
|
2007-03-08 13:12:06 +03:00
|
|
|
}
|
2006-10-22 15:23:31 +04:00
|
|
|
else
|
|
|
|
get_from_rev(&rev, &list);
|
|
|
|
|
|
|
|
if (sort_by_number)
|
2006-11-21 23:12:06 +03:00
|
|
|
qsort(list.items, list.nr, sizeof(struct path_list_item),
|
2006-10-22 15:23:31 +04:00
|
|
|
compare_by_number);
|
|
|
|
|
|
|
|
for (i = 0; i < list.nr; i++) {
|
|
|
|
struct path_list *onelines = list.items[i].util;
|
|
|
|
|
2006-11-21 23:49:45 +03:00
|
|
|
if (summary) {
|
|
|
|
printf("%s: %d\n", list.items[i].path, onelines->nr);
|
|
|
|
} else {
|
|
|
|
printf("%s (%d):\n", 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;
|
|
|
|
|
|
|
|
if (wrap_lines) {
|
|
|
|
int col = print_wrapped_text(msg, in1, in2, wrap);
|
|
|
|
if (col != wrap)
|
|
|
|
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);
|
|
|
|
list.items[i].util = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
list.strdup_paths = 1;
|
|
|
|
path_list_clear(&list, 1);
|
2006-11-19 19:28:51 +03:00
|
|
|
mailmap.strdup_paths = 1;
|
|
|
|
path_list_clear(&mailmap, 1);
|
2006-10-22 15:23:31 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|