2006-10-22 11:23:31 +00:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "cache.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2006-10-22 11:23:31 +00:00
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
2008-07-21 18:03:49 +00:00
|
|
|
#include "string-list.h"
|
2006-10-22 11:23:31 +00:00
|
|
|
#include "revision.h"
|
2006-12-22 21:15:59 +00:00
|
|
|
#include "utf8.h"
|
2007-04-27 07:41:15 +00:00
|
|
|
#include "mailmap.h"
|
2008-02-25 23:24:14 +00:00
|
|
|
#include "shortlog.h"
|
2008-07-09 21:38:33 +00:00
|
|
|
#include "parse-options.h"
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2008-07-09 21:38:33 +00:00
|
|
|
static char const * const shortlog_usage[] = {
|
2018-03-10 11:52:11 +00:00
|
|
|
N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
|
|
|
|
N_("git log --pretty=short | git shortlog [<options>]"),
|
2008-07-09 21:38:33 +00:00
|
|
|
NULL
|
|
|
|
};
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2016-01-18 20:02:59 +00:00
|
|
|
/*
|
|
|
|
* The util field of our string_list_items will contain one of two things:
|
|
|
|
*
|
|
|
|
* - if --summary is not in use, it will point to a string list of the
|
|
|
|
* oneline subjects assigned to this author
|
|
|
|
*
|
|
|
|
* - if --summary is in use, we don't need that list; we only need to know
|
|
|
|
* its size. So we abuse the pointer slot to store our integer counter.
|
|
|
|
*
|
|
|
|
* This macro accesses the latter.
|
|
|
|
*/
|
|
|
|
#define UTIL_TO_INT(x) ((intptr_t)(x)->util)
|
|
|
|
|
|
|
|
static int compare_by_counter(const void *a1, const void *a2)
|
|
|
|
{
|
|
|
|
const struct string_list_item *i1 = a1, *i2 = a2;
|
|
|
|
return UTIL_TO_INT(i2) - UTIL_TO_INT(i1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int compare_by_list(const void *a1, const void *a2)
|
2006-10-22 11:23:31 +00:00
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
const struct string_list_item *i1 = a1, *i2 = a2;
|
|
|
|
const struct string_list *l1 = i1->util, *l2 = i2->util;
|
2006-10-22 11:23:31 +00:00
|
|
|
|
|
|
|
if (l1->nr < l2->nr)
|
2006-11-21 20:12:06 +00:00
|
|
|
return 1;
|
2006-10-22 11:23:31 +00:00
|
|
|
else if (l1->nr == l2->nr)
|
|
|
|
return 0;
|
|
|
|
else
|
2006-11-21 20:12:06 +00:00
|
|
|
return -1;
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
static void insert_one_record(struct shortlog *log,
|
2007-12-08 01:07:41 +00:00
|
|
|
const char *author,
|
|
|
|
const char *oneline)
|
2006-10-22 11:23:31 +00:00
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
struct string_list_item *item;
|
2007-12-08 01:07:41 +00:00
|
|
|
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
item = string_list_insert(&log->list, author);
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2016-01-18 20:02:56 +00:00
|
|
|
if (log->summary)
|
2016-01-18 20:02:59 +00:00
|
|
|
item->util = (void *)(UTIL_TO_INT(item) + 1);
|
2016-01-18 20:02:56 +00:00
|
|
|
else {
|
|
|
|
const char *dot3 = log->common_repo_prefix;
|
|
|
|
char *buffer, *p;
|
|
|
|
struct strbuf subject = STRBUF_INIT;
|
|
|
|
const char *eol;
|
|
|
|
|
|
|
|
/* Skip any leading whitespace, including any blank lines. */
|
|
|
|
while (*oneline && isspace(*oneline))
|
|
|
|
oneline++;
|
|
|
|
eol = strchr(oneline, '\n');
|
|
|
|
if (!eol)
|
|
|
|
eol = oneline + strlen(oneline);
|
|
|
|
if (starts_with(oneline, "[PATCH")) {
|
|
|
|
char *eob = strchr(oneline, ']');
|
|
|
|
if (eob && (!eol || eob < eol))
|
|
|
|
oneline = eob + 1;
|
|
|
|
}
|
|
|
|
while (*oneline && isspace(*oneline) && *oneline != '\n')
|
|
|
|
oneline++;
|
|
|
|
format_subject(&subject, oneline, " ");
|
|
|
|
buffer = strbuf_detach(&subject, NULL);
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2016-01-18 20:02:56 +00: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-11-25 08:01:27 +00:00
|
|
|
}
|
|
|
|
}
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2016-01-18 20:02:59 +00:00
|
|
|
if (item->util == NULL)
|
|
|
|
item->util = xcalloc(1, sizeof(struct string_list));
|
2016-01-18 20:02:56 +00:00
|
|
|
string_list_append(item->util, buffer);
|
|
|
|
}
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
static int parse_stdin_author(struct shortlog *log,
|
|
|
|
struct strbuf *out, const char *in)
|
|
|
|
{
|
|
|
|
const char *mailbuf, *namebuf;
|
|
|
|
size_t namelen, maillen;
|
|
|
|
struct ident_split ident;
|
|
|
|
|
|
|
|
if (split_ident_line(&ident, in, strlen(in)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
namebuf = ident.name_begin;
|
|
|
|
mailbuf = ident.mail_begin;
|
|
|
|
namelen = ident.name_end - ident.name_begin;
|
|
|
|
maillen = ident.mail_end - ident.mail_begin;
|
|
|
|
|
|
|
|
map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
|
|
|
|
strbuf_add(out, namebuf, namelen);
|
|
|
|
if (log->email)
|
|
|
|
strbuf_addf(out, " <%.*s>", (int)maillen, mailbuf);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
static void read_from_stdin(struct shortlog *log)
|
2006-10-22 11:23:31 +00:00
|
|
|
{
|
2016-01-18 20:02:44 +00:00
|
|
|
struct strbuf author = STRBUF_INIT;
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
struct strbuf mapped_author = STRBUF_INIT;
|
2016-01-18 20:02:44 +00:00
|
|
|
struct strbuf oneline = STRBUF_INIT;
|
2016-10-11 18:45:58 +00:00
|
|
|
static const char *author_match[2] = { "Author: ", "author " };
|
|
|
|
static const char *committer_match[2] = { "Commit: ", "committer " };
|
|
|
|
const char **match;
|
2007-12-08 01:07:41 +00:00
|
|
|
|
2016-10-11 18:45:58 +00:00
|
|
|
match = log->committer ? committer_match : author_match;
|
2016-01-29 00:10:14 +00:00
|
|
|
while (strbuf_getline_lf(&author, stdin) != EOF) {
|
2016-01-18 20:02:40 +00:00
|
|
|
const char *v;
|
2016-10-11 18:45:58 +00:00
|
|
|
if (!skip_prefix(author.buf, match[0], &v) &&
|
|
|
|
!skip_prefix(author.buf, match[1], &v))
|
2007-12-08 01:07:41 +00:00
|
|
|
continue;
|
2016-01-29 00:10:14 +00:00
|
|
|
while (strbuf_getline_lf(&oneline, stdin) != EOF &&
|
2016-01-18 20:02:44 +00:00
|
|
|
oneline.len)
|
2007-12-08 01:07:41 +00:00
|
|
|
; /* discard headers */
|
2016-01-29 00:10:14 +00:00
|
|
|
while (strbuf_getline_lf(&oneline, stdin) != EOF &&
|
2016-01-18 20:02:44 +00:00
|
|
|
!oneline.len)
|
2007-12-08 01:07:41 +00:00
|
|
|
; /* discard blanks */
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
|
|
|
|
strbuf_reset(&mapped_author);
|
|
|
|
if (parse_stdin_author(log, &mapped_author, v) < 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
insert_one_record(log, mapped_author.buf, oneline.buf);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
2016-01-18 20:02:44 +00:00
|
|
|
strbuf_release(&author);
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
strbuf_release(&mapped_author);
|
2016-01-18 20:02:44 +00:00
|
|
|
strbuf_release(&oneline);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
|
2006-10-22 11:23:31 +00:00
|
|
|
{
|
2016-01-18 20:02:48 +00:00
|
|
|
struct strbuf author = STRBUF_INIT;
|
|
|
|
struct strbuf oneline = STRBUF_INIT;
|
|
|
|
struct pretty_print_context ctx = {0};
|
2016-10-11 18:45:58 +00:00
|
|
|
const char *fmt;
|
2016-01-18 20:02:48 +00:00
|
|
|
|
|
|
|
ctx.fmt = CMIT_FMT_USERFORMAT;
|
|
|
|
ctx.abbrev = log->abbrev;
|
2017-03-01 11:37:07 +00:00
|
|
|
ctx.print_email_subject = 1;
|
2016-01-18 20:02:48 +00:00
|
|
|
ctx.date_mode.type = DATE_NORMAL;
|
|
|
|
ctx.output_encoding = get_log_output_encoding();
|
|
|
|
|
shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:
1. Read stdin looking for "author" lines.
2. Parse the identity into its name/email bits.
3. Apply mailmap to the name/email.
4. Reformat the identity into a single buffer that is our
"key" for grouping entries (either a name by default,
or "name <email>" if --email was given).
The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().
When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.
But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.
Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).
And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-08 09:21:27 +00:00
|
|
|
fmt = log->committer ?
|
|
|
|
(log->email ? "%cN <%cE>" : "%cN") :
|
|
|
|
(log->email ? "%aN <%aE>" : "%aN");
|
2016-10-11 18:45:58 +00:00
|
|
|
|
|
|
|
format_commit_message(commit, fmt, &author, &ctx);
|
2016-01-18 20:02:52 +00:00
|
|
|
if (!log->summary) {
|
|
|
|
if (log->user_format)
|
|
|
|
pretty_print_commit(&ctx, commit, &oneline);
|
2008-02-25 23:24:14 +00:00
|
|
|
else
|
2016-01-18 20:02:52 +00:00
|
|
|
format_commit_message(commit, "%s", &oneline, &ctx);
|
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-18 21:14:00 +00:00
|
|
|
}
|
2016-01-18 20:02:48 +00:00
|
|
|
|
|
|
|
insert_one_record(log, author.buf, oneline.len ? oneline.buf : "<none>");
|
|
|
|
|
|
|
|
strbuf_release(&author);
|
|
|
|
strbuf_release(&oneline);
|
2008-02-25 23:24:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void get_from_rev(struct rev_info *rev, struct shortlog *log)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
if (prepare_revision_walk(rev))
|
2011-02-22 23:42:32 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2008-02-25 23:24:14 +00:00
|
|
|
while ((commit = get_revision(rev)) != NULL)
|
|
|
|
shortlog_add_commit(log, commit);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2008-07-09 21:38:33 +00:00
|
|
|
static int parse_uint(char const **arg, int comma, int defval)
|
2007-04-08 08:28:00 +00:00
|
|
|
{
|
|
|
|
unsigned long ul;
|
|
|
|
int ret;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
ul = strtoul(*arg, &endp, 10);
|
2008-07-09 21:38:33 +00:00
|
|
|
if (*endp && *endp != comma)
|
2007-04-08 08:28:00 +00:00
|
|
|
return -1;
|
2008-07-09 21:38:33 +00:00
|
|
|
if (ul > INT_MAX)
|
2007-04-08 08:28:00 +00:00
|
|
|
return -1;
|
2008-07-09 21:38:33 +00:00
|
|
|
ret = *arg == endp ? defval : (int)ul;
|
|
|
|
*arg = *endp ? endp + 1 : endp;
|
2007-04-08 08:28:00 +00: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 21:38:33 +00:00
|
|
|
static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
|
2007-04-08 08:28:00 +00:00
|
|
|
{
|
2008-07-09 21:38:33 +00: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 08:28:00 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
void shortlog_init(struct shortlog *log)
|
|
|
|
{
|
|
|
|
memset(log, 0, sizeof(*log));
|
|
|
|
|
2009-02-08 14:34:27 +00:00
|
|
|
read_mailmap(&log->mailmap, &log->common_repo_prefix);
|
2008-02-25 23:24:14 +00:00
|
|
|
|
2008-07-21 18:03:49 +00:00
|
|
|
log->list.strdup_strings = 1;
|
2008-02-25 23:24:14 +00:00
|
|
|
log->wrap = DEFAULT_WRAPLEN;
|
|
|
|
log->in1 = DEFAULT_INDENT1;
|
|
|
|
log->in2 = DEFAULT_INDENT2;
|
|
|
|
}
|
|
|
|
|
2006-10-22 11:23:31 +00:00
|
|
|
int cmd_shortlog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2016-06-13 05:39:28 +00:00
|
|
|
struct shortlog log = { STRING_LIST_INIT_NODUP };
|
|
|
|
struct rev_info rev;
|
2010-08-06 03:01:37 +00:00
|
|
|
int nongit = !startup_info->have_repository;
|
2008-02-25 23:24:14 +00:00
|
|
|
|
2016-06-13 05:39:28 +00:00
|
|
|
const struct option options[] = {
|
2016-10-11 18:45:58 +00:00
|
|
|
OPT_BOOL('c', "committer", &log.committer,
|
|
|
|
N_("Group by committer rather than author")),
|
2013-08-03 11:51:19 +00: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")),
|
2018-08-02 19:18:06 +00:00
|
|
|
{ OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
|
2018-08-02 19:18:14 +00:00
|
|
|
N_("Linewrap output"), PARSE_OPT_OPTARG,
|
2018-08-02 19:18:06 +00:00
|
|
|
&parse_wrap_args },
|
2008-07-09 21:38:33 +00:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
|
|
|
struct parse_opt_ctx_t ctx;
|
|
|
|
|
2009-02-08 14:34:27 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2008-02-25 23:24:14 +00:00
|
|
|
shortlog_init(&log);
|
2018-09-21 15:57:38 +00:00
|
|
|
repo_init_revisions(the_repository, &rev, prefix);
|
2010-12-06 07:57:42 +00:00
|
|
|
parse_options_start(&ctx, argc, argv, prefix, options,
|
|
|
|
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
|
2008-07-09 21:38:33 +00:00
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
switch (parse_options_step(&ctx, options, shortlog_usage)) {
|
|
|
|
case PARSE_OPT_HELP:
|
2018-03-22 18:43:51 +00:00
|
|
|
case PARSE_OPT_ERROR:
|
2008-07-09 21:38:33 +00:00
|
|
|
exit(129);
|
|
|
|
case PARSE_OPT_DONE:
|
|
|
|
goto parse_done;
|
2007-04-08 08:28:00 +00:00
|
|
|
}
|
2008-07-09 21:38:34 +00:00
|
|
|
parse_revision_opt(&rev, &ctx, options, shortlog_usage);
|
2008-07-09 21:38:33 +00:00
|
|
|
}
|
|
|
|
parse_done:
|
|
|
|
argc = parse_options_end(&ctx);
|
|
|
|
|
2018-03-14 21:34:19 +00:00
|
|
|
if (nongit && argc > 1) {
|
|
|
|
error(_("too many arguments given outside repository"));
|
|
|
|
usage_with_options(shortlog_usage, options);
|
|
|
|
}
|
|
|
|
|
2008-07-09 21:38:33 +00:00
|
|
|
if (setup_revisions(argc, argv, &rev, NULL) != 1) {
|
2011-02-22 23:42:32 +00:00
|
|
|
error(_("unrecognized argument: %s"), argv[1]);
|
2008-07-09 21:38:33 +00:00
|
|
|
usage_with_options(shortlog_usage, options);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2008-07-14 18:08:52 +00:00
|
|
|
log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;
|
2010-05-04 03:18:57 +00:00
|
|
|
log.abbrev = rev.abbrev;
|
2016-06-22 15:02:07 +00:00
|
|
|
log.file = rev.diffopt.file;
|
2008-07-14 18:08:52 +00:00
|
|
|
|
2007-12-11 18:09:04 +00:00
|
|
|
/* assume HEAD if from a tty */
|
2008-03-14 21:35:24 +00:00
|
|
|
if (!nongit && !rev.pending.nr && isatty(0))
|
2007-12-11 18:09:04 +00:00
|
|
|
add_head_to_pending(&rev);
|
2007-03-08 10:12:06 +00:00
|
|
|
if (rev.pending.nr == 0) {
|
2010-02-24 20:49:03 +00:00
|
|
|
if (isatty(0))
|
2011-02-22 23:42:32 +00:00
|
|
|
fprintf(stderr, _("(reading log message from standard input)\n"));
|
2008-02-25 23:24:14 +00:00
|
|
|
read_from_stdin(&log);
|
2007-03-08 10:12:06 +00:00
|
|
|
}
|
2006-10-22 11:23:31 +00:00
|
|
|
else
|
2008-02-25 23:24:14 +00:00
|
|
|
get_from_rev(&rev, &log);
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
shortlog_output(&log);
|
2016-06-22 15:02:07 +00:00
|
|
|
if (log.file != stdout)
|
|
|
|
fclose(log.file);
|
2008-02-25 23:24:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2006-10-22 11:23:31 +00:00
|
|
|
|
2010-02-19 22:15:01 +00:00
|
|
|
static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s,
|
|
|
|
const struct shortlog *log)
|
|
|
|
{
|
2012-12-11 05:59:21 +00:00
|
|
|
strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap);
|
|
|
|
strbuf_addch(sb, '\n');
|
2010-02-19 22:15:01 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
void shortlog_output(struct shortlog *log)
|
|
|
|
{
|
|
|
|
int i, j;
|
2010-02-19 22:15:01 +00:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
if (log->sort_by_number)
|
2016-09-29 23:40:14 +00:00
|
|
|
QSORT(log->list.items, log->list.nr,
|
2016-01-18 20:02:59 +00:00
|
|
|
log->summary ? compare_by_counter : compare_by_list);
|
2008-02-25 23:24:14 +00:00
|
|
|
for (i = 0; i < log->list.nr; i++) {
|
2016-01-18 20:02:59 +00:00
|
|
|
const struct string_list_item *item = &log->list.items[i];
|
2008-02-25 23:24:14 +00:00
|
|
|
if (log->summary) {
|
2016-06-22 15:01:49 +00:00
|
|
|
fprintf(log->file, "%6d\t%s\n",
|
|
|
|
(int)UTIL_TO_INT(item), item->string);
|
2006-11-21 20:49:45 +00:00
|
|
|
} else {
|
2016-01-18 20:02:59 +00:00
|
|
|
struct string_list *onelines = item->util;
|
2016-06-22 15:01:49 +00:00
|
|
|
fprintf(log->file, "%s (%d):\n",
|
|
|
|
item->string, onelines->nr);
|
2006-12-22 21:15:59 +00:00
|
|
|
for (j = onelines->nr - 1; j >= 0; j--) {
|
2008-07-21 18:03:49 +00:00
|
|
|
const char *msg = onelines->items[j].string;
|
2007-04-08 08:28:00 +00:00
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
if (log->wrap_lines) {
|
2010-02-19 22:15:01 +00:00
|
|
|
strbuf_reset(&sb);
|
|
|
|
add_wrapped_shortlog_msg(&sb, msg, log);
|
2016-06-22 15:01:49 +00:00
|
|
|
fwrite(sb.buf, sb.len, 1, log->file);
|
2007-04-08 08:28:00 +00:00
|
|
|
}
|
|
|
|
else
|
2016-06-22 15:01:49 +00:00
|
|
|
fprintf(log->file, " %s\n", msg);
|
2006-12-22 21:15:59 +00:00
|
|
|
}
|
2016-06-22 15:01:49 +00:00
|
|
|
putc('\n', log->file);
|
2016-01-18 20:02:59 +00:00
|
|
|
onelines->strdup_strings = 1;
|
|
|
|
string_list_clear(onelines, 0);
|
|
|
|
free(onelines);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:14 +00:00
|
|
|
log->list.items[i].util = NULL;
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|
|
|
|
|
2010-02-19 22:15:01 +00:00
|
|
|
strbuf_release(&sb);
|
2008-07-21 18:03:49 +00:00
|
|
|
log->list.strdup_strings = 1;
|
|
|
|
string_list_clear(&log->list, 1);
|
2009-02-08 14:34:30 +00:00
|
|
|
clear_mailmap(&log->mailmap);
|
2006-10-22 11:23:31 +00:00
|
|
|
}
|