development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

shortlog -w: make wrap-line behaviour optional.

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-04-08 01:28:00 -07:00
parent 3714e7c895
commit 3d711d97a0
2 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
builtin-shortlog.c
View file

@ -277,11 +277,64 @@ static void get_from_rev(struct rev_info *rev, struct path_list *list)
} }
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);
}
int cmd_shortlog(int argc, const char **argv, const char *prefix) int cmd_shortlog(int argc, const char **argv, const char *prefix)
{ {
struct rev_info rev; struct rev_info rev;
struct path_list list = { NULL, 0, 0, 1 }; struct path_list list = { NULL, 0, 0, 1 };
int i, j, sort_by_number = 0, summary = 0; int i, j, sort_by_number = 0, summary = 0;
int wrap_lines = 0;
int wrap = DEFAULT_WRAPLEN;
int in1 = DEFAULT_INDENT1;
int in2 = DEFAULT_INDENT2;
/* since -n is a shadowed rev argument, parse our args first */ /* since -n is a shadowed rev argument, parse our args first */
while (argc > 1) { while (argc > 1) {
@ -290,6 +343,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
else if (!strcmp(argv[1], "-s") || else if (!strcmp(argv[1], "-s") ||
!strcmp(argv[1], "--summary")) !strcmp(argv[1], "--summary"))
summary = 1; summary = 1;
else if (!prefixcmp(argv[1], "-w")) {
wrap_lines = 1;
parse_wrap_args(argv[1], &in1, &in2, &wrap);
}
else if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) else if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
usage(shortlog_usage); usage(shortlog_usage);
else else
@ -325,10 +382,15 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
} else { } else {
printf("%s (%d):\n", list.items[i].path, onelines->nr); printf("%s (%d):\n", list.items[i].path, onelines->nr);
for (j = onelines->nr - 1; j >= 0; j--) { for (j = onelines->nr - 1; j >= 0; j--) {
int col = print_wrapped_text(onelines->items[j].path, const char *msg = onelines->items[j].path;
6, 9, 76);
if (col != 76) if (wrap_lines) {
putchar('\n'); int col = print_wrapped_text(msg, in1, in2, wrap);
if (col != wrap)
putchar('\n');
}
else
printf(" %s\n", msg);
} }
putchar('\n'); putchar('\n');
} }

2
t/t4201-shortlog.sh
View file

@ -29,7 +29,7 @@ git commit -m "$(echo "This is a very, very long first line for the commit messa
echo 5 > a1 echo 5 > a1
git commit -m "a 12 34 56 78" a1 git commit -m "a 12 34 56 78" a1
git shortlog HEAD > out git shortlog -w HEAD > out
cat > expect << EOF cat > expect << EOF
A U Thor (5): A U Thor (5):