2006-10-22 19:23:31 +08:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
2008-07-22 02:03:49 +08:00
|
|
|
#include "string-list.h"
|
2006-10-22 19:23:31 +08:00
|
|
|
#include "revision.h"
|
2006-12-23 05:15:59 +08:00
|
|
|
#include "utf8.h"
|
2007-04-27 15:41:15 +08:00
|
|
|
#include "mailmap.h"
|
2008-02-26 07:24:14 +08:00
|
|
|
#include "shortlog.h"
|
2008-07-10 05:38:33 +08:00
|
|
|
#include "parse-options.h"
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2008-07-10 05:38:33 +08:00
|
|
|
static char const * const shortlog_usage[] = {
|
2015-01-13 15:44:47 +08:00
|
|
|
N_("git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"),
|
2008-07-10 05:38:33 +08:00
|
|
|
NULL
|
|
|
|
};
|
2006-10-22 19:23:31 +08:00
|
|
|
|
|
|
|
static int compare_by_number(const void *a1, const void *a2)
|
|
|
|
{
|
2008-07-22 02:03:49 +08:00
|
|
|
const struct string_list_item *i1 = a1, *i2 = a2;
|
|
|
|
const struct string_list *l1 = i1->util, *l2 = i2->util;
|
2006-10-22 19:23:31 +08:00
|
|
|
|
|
|
|
if (l1->nr < l2->nr)
|
2006-11-22 04:12:06 +08:00
|
|
|
return 1;
|
2006-10-22 19:23:31 +08:00
|
|
|
else if (l1->nr == l2->nr)
|
|
|
|
return 0;
|
|
|
|
else
|
2006-11-22 04:12:06 +08:00
|
|
|
return -1;
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
static void insert_one_record(struct shortlog *log,
|
2007-12-08 09:07:41 +08:00
|
|
|
const char *author,
|
|
|
|
const char *oneline)
|
2006-10-22 19:23:31 +08:00
|
|
|
{
|
2008-02-26 07:24:14 +08:00
|
|
|
const char *dot3 = log->common_repo_prefix;
|
2006-10-22 19:23:31 +08:00
|
|
|
char *buffer, *p;
|
2008-07-22 02:03:49 +08:00
|
|
|
struct string_list_item *item;
|
2013-01-06 05:26:40 +08:00
|
|
|
const char *mailbuf, *namebuf;
|
|
|
|
size_t namelen, maillen;
|
2007-12-08 09:07:41 +08:00
|
|
|
const char *eol;
|
2009-01-07 04:41:06 +08:00
|
|
|
struct strbuf subject = STRBUF_INIT;
|
2013-01-06 05:26:40 +08:00
|
|
|
struct strbuf namemailbuf = STRBUF_INIT;
|
2013-01-06 05:26:38 +08:00
|
|
|
struct ident_split ident;
|
2007-12-08 09:07:41 +08:00
|
|
|
|
2013-01-06 05:26:38 +08:00
|
|
|
if (split_ident_line(&ident, author, strlen(author)))
|
2007-12-08 09:07:41 +08:00
|
|
|
return;
|
2009-02-08 22:34:30 +08:00
|
|
|
|
2013-01-06 05:26:40 +08:00
|
|
|
namebuf = ident.name_begin;
|
|
|
|
mailbuf = ident.mail_begin;
|
|
|
|
namelen = ident.name_end - ident.name_begin;
|
|
|
|
maillen = ident.mail_end - ident.mail_begin;
|
2009-02-08 22:34:30 +08:00
|
|
|
|
2013-01-06 05:26:40 +08:00
|
|
|
map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
|
|
|
|
strbuf_add(&namemailbuf, namebuf, namelen);
|
2009-02-08 22:34:30 +08:00
|
|
|
|
2013-01-06 05:26:40 +08:00
|
|
|
if (log->email)
|
|
|
|
strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf);
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2013-01-06 05:26:40 +08:00
|
|
|
item = string_list_insert(&log->list, namemailbuf.buf);
|
2006-10-22 19:23:31 +08:00
|
|
|
if (item->util == NULL)
|
2008-07-22 02:03:49 +08:00
|
|
|
item->util = xcalloc(1, sizeof(struct string_list));
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2008-03-05 22:24:10 +08:00
|
|
|
/* Skip any leading whitespace, including any blank lines. */
|
|
|
|
while (*oneline && isspace(*oneline))
|
|
|
|
oneline++;
|
2007-12-08 09:07:41 +08:00
|
|
|
eol = strchr(oneline, '\n');
|
|
|
|
if (!eol)
|
|
|
|
eol = oneline + strlen(oneline);
|
2013-12-01 04:55:40 +08:00
|
|
|
if (starts_with(oneline, "[PATCH")) {
|
2006-11-20 00:28:25 +08:00
|
|
|
char *eob = strchr(oneline, ']');
|
2007-12-08 09:07:41 +08:00
|
|
|
if (eob && (!eol || eob < eol))
|
|
|
|
oneline = eob + 1;
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
2007-12-08 09:07:41 +08:00
|
|
|
while (*oneline && isspace(*oneline) && *oneline != '\n')
|
2006-10-22 19:23:31 +08:00
|
|
|
oneline++;
|
2009-01-07 04:41:06 +08:00
|
|
|
format_subject(&subject, oneline, " ");
|
|
|
|
buffer = strbuf_detach(&subject, NULL);
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2006-11-25 16:01:27 +08: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 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2010-06-26 07:41:38 +08:00
|
|
|
string_list_append(item->util, buffer);
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
static void read_from_stdin(struct shortlog *log)
|
2006-10-22 19:23:31 +08:00
|
|
|
{
|
2007-12-08 09:07:41 +08:00
|
|
|
char author[1024], oneline[1024];
|
|
|
|
|
|
|
|
while (fgets(author, sizeof(author), stdin) != NULL) {
|
|
|
|
if (!(author[0] == 'A' || author[0] == 'a') ||
|
2013-12-01 04:55:40 +08:00
|
|
|
!starts_with(author + 1, "uthor: "))
|
2007-12-08 09:07:41 +08:00
|
|
|
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 07:24:14 +08:00
|
|
|
insert_one_record(log, author + 8, oneline);
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
|
2006-10-22 19:23:31 +08:00
|
|
|
{
|
2008-02-26 07:24:14 +08:00
|
|
|
const char *author = NULL, *buffer;
|
2009-11-26 03:33:28 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct strbuf ufbuf = STRBUF_INIT;
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2011-05-27 06:27:24 +08:00
|
|
|
pp_commit_easy(CMIT_FMT_RAW, commit, &buf);
|
2009-11-26 03:33:28 +08:00
|
|
|
buffer = buf.buf;
|
2008-02-26 07:24:14 +08:00
|
|
|
while (*buffer && *buffer != '\n') {
|
|
|
|
const char *eol = strchr(buffer, '\n');
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
if (eol == NULL)
|
|
|
|
eol = buffer + strlen(buffer);
|
|
|
|
else
|
|
|
|
eol++;
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2013-12-01 04:55:40 +08:00
|
|
|
if (starts_with(buffer, "author "))
|
2008-02-26 07:24:14 +08:00
|
|
|
author = buffer + 7;
|
|
|
|
buffer = eol;
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
shortlog: ignore commits with missing authors
Most of git's traversals are robust against minor breakages
in commit data. For example, "git log" will still output an
entry for a commit that has a broken encoding or missing
author, and will not abort the whole operation.
Shortlog, on the other hand, will die as soon as it sees a
commit without an author, meaning that a repository with
a broken commit cannot get any shortlog output at all.
Let's downgrade this fatal error to a warning, and continue
the operation.
We simply ignore the commit and do not count it in the total
(since we do not have any author under which to file it).
Alternatively, we could output some kind of "<empty>" record
to collect these bogus commits. It is probably not worth it,
though; we have already warned to stderr, so the user is
aware that such bogosities exist, and any placeholder we
came up with would either be syntactically invalid, or would
potentially conflict with real data.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-19 05:14:00 +08:00
|
|
|
if (!author) {
|
|
|
|
warning(_("Missing author: %s"),
|
2008-02-26 07:24:14 +08:00
|
|
|
sha1_to_hex(commit->object.sha1));
|
shortlog: ignore commits with missing authors
Most of git's traversals are robust against minor breakages
in commit data. For example, "git log" will still output an
entry for a commit that has a broken encoding or missing
author, and will not abort the whole operation.
Shortlog, on the other hand, will die as soon as it sees a
commit without an author, meaning that a repository with
a broken commit cannot get any shortlog output at all.
Let's downgrade this fatal error to a warning, and continue
the operation.
We simply ignore the commit and do not count it in the total
(since we do not have any author under which to file it).
Alternatively, we could output some kind of "<empty>" record
to collect these bogus commits. It is probably not worth it,
though; we have already warned to stderr, so the user is
aware that such bogosities exist, and any placeholder we
came up with would either be syntactically invalid, or would
potentially conflict with real data.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-19 05:14:00 +08:00
|
|
|
return;
|
|
|
|
}
|
2008-07-15 02:08:52 +08:00
|
|
|
if (log->user_format) {
|
2009-10-19 23:48:08 +08:00
|
|
|
struct pretty_print_context ctx = {0};
|
2011-05-27 06:27:49 +08:00
|
|
|
ctx.fmt = CMIT_FMT_USERFORMAT;
|
2010-05-04 11:18:57 +08:00
|
|
|
ctx.abbrev = log->abbrev;
|
2009-10-19 23:48:08 +08:00
|
|
|
ctx.subject = "";
|
|
|
|
ctx.after_subject = "";
|
convert "enum date_mode" into a struct
In preparation for adding date modes that may carry extra
information beyond the mode itself, this patch converts the
date_mode enum into a struct.
Most of the conversion is fairly straightforward; we pass
the struct as a pointer and dereference the type field where
necessary. Locations that declare a date_mode can use a "{}"
constructor. However, the tricky case is where we use the
enum labels as constants, like:
show_date(t, tz, DATE_NORMAL);
Ideally we could say:
show_date(t, tz, &{ DATE_NORMAL });
but of course C does not allow that. Likewise, we cannot
cast the constant to a struct, because we need to pass an
actual address. Our options are basically:
1. Manually add a "struct date_mode d = { DATE_NORMAL }"
definition to each caller, and pass "&d". This makes
the callers uglier, because they sometimes do not even
have their own scope (e.g., they are inside a switch
statement).
2. Provide a pre-made global "date_normal" struct that can
be passed by address. We'd also need "date_rfc2822",
"date_iso8601", and so forth. But at least the ugliness
is defined in one place.
3. Provide a wrapper that generates the correct struct on
the fly. The big downside is that we end up pointing to
a single global, which makes our wrapper non-reentrant.
But show_date is already not reentrant, so it does not
matter.
This patch implements 3, along with a minor macro to keep
the size of the callers sane.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-06-26 00:55:02 +08:00
|
|
|
ctx.date_mode.type = DATE_NORMAL;
|
2013-06-26 18:19:50 +08:00
|
|
|
ctx.output_encoding = get_log_output_encoding();
|
2011-05-27 06:27:49 +08:00
|
|
|
pretty_print_commit(&ctx, commit, &ufbuf);
|
2009-11-26 03:33:28 +08:00
|
|
|
buffer = ufbuf.buf;
|
|
|
|
} else if (*buffer) {
|
2008-02-26 07:24:14 +08:00
|
|
|
buffer++;
|
2009-11-26 03:33:28 +08:00
|
|
|
}
|
2008-02-26 07:24:14 +08:00
|
|
|
insert_one_record(log, author, !*buffer ? "<none>" : buffer);
|
2009-11-26 03:33:28 +08:00
|
|
|
strbuf_release(&ufbuf);
|
|
|
|
strbuf_release(&buf);
|
2008-02-26 07:24:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void get_from_rev(struct rev_info *rev, struct shortlog *log)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
if (prepare_revision_walk(rev))
|
2011-02-23 07:42:32 +08:00
|
|
|
die(_("revision walk setup failed"));
|
2008-02-26 07:24:14 +08:00
|
|
|
while ((commit = get_revision(rev)) != NULL)
|
|
|
|
shortlog_add_commit(log, commit);
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2008-07-10 05:38:33 +08:00
|
|
|
static int parse_uint(char const **arg, int comma, int defval)
|
2007-04-08 16:28:00 +08:00
|
|
|
{
|
|
|
|
unsigned long ul;
|
|
|
|
int ret;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
ul = strtoul(*arg, &endp, 10);
|
2008-07-10 05:38:33 +08:00
|
|
|
if (*endp && *endp != comma)
|
2007-04-08 16:28:00 +08:00
|
|
|
return -1;
|
2008-07-10 05:38:33 +08:00
|
|
|
if (ul > INT_MAX)
|
2007-04-08 16:28:00 +08:00
|
|
|
return -1;
|
2008-07-10 05:38:33 +08:00
|
|
|
ret = *arg == endp ? defval : (int)ul;
|
|
|
|
*arg = *endp ? endp + 1 : endp;
|
2007-04-08 16:28:00 +08: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-10 05:38:33 +08:00
|
|
|
static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
|
2007-04-08 16:28:00 +08:00
|
|
|
{
|
2008-07-10 05:38:33 +08: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 16:28:00 +08:00
|
|
|
}
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
void shortlog_init(struct shortlog *log)
|
|
|
|
{
|
|
|
|
memset(log, 0, sizeof(*log));
|
|
|
|
|
2009-02-08 22:34:27 +08:00
|
|
|
read_mailmap(&log->mailmap, &log->common_repo_prefix);
|
2008-02-26 07:24:14 +08:00
|
|
|
|
2008-07-22 02:03:49 +08:00
|
|
|
log->list.strdup_strings = 1;
|
2008-02-26 07:24:14 +08:00
|
|
|
log->wrap = DEFAULT_WRAPLEN;
|
|
|
|
log->in1 = DEFAULT_INDENT1;
|
|
|
|
log->in2 = DEFAULT_INDENT2;
|
|
|
|
}
|
|
|
|
|
2006-10-22 19:23:31 +08:00
|
|
|
int cmd_shortlog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2008-07-10 05:38:33 +08:00
|
|
|
static struct shortlog log;
|
|
|
|
static struct rev_info rev;
|
2010-08-06 11:01:37 +08:00
|
|
|
int nongit = !startup_info->have_repository;
|
2008-02-26 07:24:14 +08:00
|
|
|
|
2008-07-10 05:38:33 +08:00
|
|
|
static const struct option options[] = {
|
2013-08-03 19:51:19 +08:00
|
|
|
OPT_BOOL('n', "numbered", &log.sort_by_number,
|
|
|
|
N_("sort output according to the number of commits per author")),
|
|
|
|
OPT_BOOL('s', "summary", &log.summary,
|
|
|
|
N_("Suppress commit descriptions, only provides commit count")),
|
|
|
|
OPT_BOOL('e', "email", &log.email,
|
|
|
|
N_("Show the email address of each author")),
|
2012-08-20 20:32:43 +08:00
|
|
|
{ OPTION_CALLBACK, 'w', NULL, &log, N_("w[,i1[,i2]]"),
|
|
|
|
N_("Linewrap output"), PARSE_OPT_OPTARG, &parse_wrap_args },
|
2008-07-10 05:38:33 +08:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
|
|
|
struct parse_opt_ctx_t ctx;
|
|
|
|
|
2009-02-08 22:34:27 +08:00
|
|
|
git_config(git_default_config, NULL);
|
2008-02-26 07:24:14 +08:00
|
|
|
shortlog_init(&log);
|
2008-07-10 05:38:33 +08:00
|
|
|
init_revisions(&rev, prefix);
|
2010-12-06 15:57:42 +08:00
|
|
|
parse_options_start(&ctx, argc, argv, prefix, options,
|
|
|
|
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
|
2008-07-10 05:38:33 +08:00
|
|
|
|
|
|
|
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 16:28:00 +08:00
|
|
|
}
|
2008-07-10 05:38:34 +08:00
|
|
|
parse_revision_opt(&rev, &ctx, options, shortlog_usage);
|
2008-07-10 05:38:33 +08:00
|
|
|
}
|
|
|
|
parse_done:
|
|
|
|
argc = parse_options_end(&ctx);
|
|
|
|
|
|
|
|
if (setup_revisions(argc, argv, &rev, NULL) != 1) {
|
2011-02-23 07:42:32 +08:00
|
|
|
error(_("unrecognized argument: %s"), argv[1]);
|
2008-07-10 05:38:33 +08:00
|
|
|
usage_with_options(shortlog_usage, options);
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2008-07-15 02:08:52 +08:00
|
|
|
log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
|
2010-05-04 11:18:57 +08:00
|
|
|
log.abbrev = rev.abbrev;
|
2008-07-15 02:08:52 +08:00
|
|
|
|
2007-12-12 02:09:04 +08:00
|
|
|
/* assume HEAD if from a tty */
|
2008-03-15 05:35:24 +08:00
|
|
|
if (!nongit && !rev.pending.nr && isatty(0))
|
2007-12-12 02:09:04 +08:00
|
|
|
add_head_to_pending(&rev);
|
2007-03-08 18:12:06 +08:00
|
|
|
if (rev.pending.nr == 0) {
|
2010-02-25 04:49:03 +08:00
|
|
|
if (isatty(0))
|
2011-02-23 07:42:32 +08:00
|
|
|
fprintf(stderr, _("(reading log message from standard input)\n"));
|
2008-02-26 07:24:14 +08:00
|
|
|
read_from_stdin(&log);
|
2007-03-08 18:12:06 +08:00
|
|
|
}
|
2006-10-22 19:23:31 +08:00
|
|
|
else
|
2008-02-26 07:24:14 +08:00
|
|
|
get_from_rev(&rev, &log);
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
shortlog_output(&log);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2010-02-20 06:15:01 +08:00
|
|
|
static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
|
|
|
|
const struct shortlog *log)
|
|
|
|
{
|
2012-12-11 13:59:21 +08:00
|
|
|
strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
|
|
|
|
strbuf_addch(sb, '\n');
|
2010-02-20 06:15:01 +08:00
|
|
|
}
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
void shortlog_output(struct shortlog *log)
|
|
|
|
{
|
|
|
|
int i, j;
|
2010-02-20 06:15:01 +08:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
if (log->sort_by_number)
|
2008-07-22 02:03:49 +08:00
|
|
|
qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
|
2008-02-26 07:24:14 +08:00
|
|
|
compare_by_number);
|
|
|
|
for (i = 0; i < log->list.nr; i++) {
|
2008-07-22 02:03:49 +08:00
|
|
|
struct string_list *onelines = log->list.items[i].util;
|
2006-10-22 19:23:31 +08:00
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
if (log->summary) {
|
2008-07-22 02:03:49 +08:00
|
|
|
printf("%6d\t%s\n", onelines->nr, log->list.items[i].string);
|
2006-11-22 04:49:45 +08:00
|
|
|
} else {
|
2008-07-22 02:03:49 +08:00
|
|
|
printf("%s (%d):\n", log->list.items[i].string, onelines->nr);
|
2006-12-23 05:15:59 +08:00
|
|
|
for (j = onelines->nr - 1; j >= 0; j--) {
|
2008-07-22 02:03:49 +08:00
|
|
|
const char *msg = onelines->items[j].string;
|
2007-04-08 16:28:00 +08:00
|
|
|
|
2008-02-26 07:24:14 +08:00
|
|
|
if (log->wrap_lines) {
|
2010-02-20 06:15:01 +08:00
|
|
|
strbuf_reset(&sb);
|
|
|
|
add_wrapped_shortlog_msg(&sb, msg, log);
|
|
|
|
fwrite(sb.buf, sb.len, 1, stdout);
|
2007-04-08 16:28:00 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
printf(" %s\n", msg);
|
2006-12-23 05:15:59 +08:00
|
|
|
}
|
|
|
|
putchar('\n');
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2008-07-22 02:03:49 +08:00
|
|
|
onelines->strdup_strings = 1;
|
2008-12-31 05:01:44 +08:00
|
|
|
string_list_clear(onelines, 0);
|
2006-10-22 19:23:31 +08:00
|
|
|
free(onelines);
|
2008-02-26 07:24:14 +08:00
|
|
|
log->list.items[i].util = NULL;
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|
|
|
|
|
2010-02-20 06:15:01 +08:00
|
|
|
strbuf_release(&sb);
|
2008-07-22 02:03:49 +08:00
|
|
|
log->list.strdup_strings = 1;
|
|
|
|
string_list_clear(&log->list, 1);
|
2009-02-08 22:34:30 +08:00
|
|
|
clear_mailmap(&log->mailmap);
|
2006-10-22 19:23:31 +08:00
|
|
|
}
|