mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
![Junio C Hamano](/assets/img/avatar_default.png)
As we already walk the history of the branch that gets merged to come up with a short log, let's label it with names of the primary authors, so that the user who summarizes the merge can easily give credit to them in the log message. Also infer the names of "lieutents" to help integrators at higher level of the food-chain to give credit to them, by counting: * The committer of the 'tip' commit that is merged * The committer of merge commits that are merged Often the first one gives the owner of the history being pulled, but his last pull from his sublieutenants may have been a fast-forward, in which case the first one would not be. The latter rule will count the integrator of the history, so together it might be a reasonable heuristics. There are two special cases: - The "author" credit is omitted when the series is written solely by the same author who is making the merge. The name can be seen on the "Author" line of the "git log" output to view the log message anyway. - The "lieutenant" credit is omitted when there is only one key committer in the merged branch and it is the committer who is making the merge. Typically this applies to the case where the developer merges his own branch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
589 lines
15 KiB
C
589 lines
15 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "diff.h"
|
|
#include "revision.h"
|
|
#include "tag.h"
|
|
#include "string-list.h"
|
|
#include "branch.h"
|
|
#include "fmt-merge-msg.h"
|
|
#include "gpg-interface.h"
|
|
|
|
static const char * const fmt_merge_msg_usage[] = {
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]",
|
|
NULL
|
|
};
|
|
|
|
static int use_branch_desc;
|
|
|
|
int fmt_merge_msg_config(const char *key, const char *value, void *cb)
|
|
{
|
|
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
|
|
int is_bool;
|
|
merge_log_config = git_config_bool_or_int(key, value, &is_bool);
|
|
if (!is_bool && merge_log_config < 0)
|
|
return error("%s: negative length %s", key, value);
|
|
if (is_bool && merge_log_config)
|
|
merge_log_config = DEFAULT_MERGE_LOG_LEN;
|
|
} else if (!strcmp(key, "merge.branchdesc")) {
|
|
use_branch_desc = git_config_bool(key, value);
|
|
} else {
|
|
return git_default_config(key, value, cb);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* merge data per repository where the merged tips came from */
|
|
struct src_data {
|
|
struct string_list branch, tag, r_branch, generic;
|
|
int head_status;
|
|
};
|
|
|
|
struct origin_data {
|
|
unsigned char sha1[20];
|
|
unsigned is_local_branch:1;
|
|
};
|
|
|
|
static void init_src_data(struct src_data *data)
|
|
{
|
|
data->branch.strdup_strings = 1;
|
|
data->tag.strdup_strings = 1;
|
|
data->r_branch.strdup_strings = 1;
|
|
data->generic.strdup_strings = 1;
|
|
}
|
|
|
|
static struct string_list srcs = STRING_LIST_INIT_DUP;
|
|
static struct string_list origins = STRING_LIST_INIT_DUP;
|
|
|
|
static int handle_line(char *line)
|
|
{
|
|
int i, len = strlen(line);
|
|
struct origin_data *origin_data;
|
|
char *src, *origin;
|
|
struct src_data *src_data;
|
|
struct string_list_item *item;
|
|
int pulling_head = 0;
|
|
|
|
if (len < 43 || line[40] != '\t')
|
|
return 1;
|
|
|
|
if (!prefixcmp(line + 41, "not-for-merge"))
|
|
return 0;
|
|
|
|
if (line[41] != '\t')
|
|
return 2;
|
|
|
|
line[40] = 0;
|
|
origin_data = xcalloc(1, sizeof(struct origin_data));
|
|
i = get_sha1(line, origin_data->sha1);
|
|
line[40] = '\t';
|
|
if (i) {
|
|
free(origin_data);
|
|
return 3;
|
|
}
|
|
|
|
if (line[len - 1] == '\n')
|
|
line[len - 1] = 0;
|
|
line += 42;
|
|
|
|
/*
|
|
* At this point, line points at the beginning of comment e.g.
|
|
* "branch 'frotz' of git://that/repository.git".
|
|
* Find the repository name and point it with src.
|
|
*/
|
|
src = strstr(line, " of ");
|
|
if (src) {
|
|
*src = 0;
|
|
src += 4;
|
|
pulling_head = 0;
|
|
} else {
|
|
src = line;
|
|
pulling_head = 1;
|
|
}
|
|
|
|
item = unsorted_string_list_lookup(&srcs, src);
|
|
if (!item) {
|
|
item = string_list_append(&srcs, src);
|
|
item->util = xcalloc(1, sizeof(struct src_data));
|
|
init_src_data(item->util);
|
|
}
|
|
src_data = item->util;
|
|
|
|
if (pulling_head) {
|
|
origin = src;
|
|
src_data->head_status |= 1;
|
|
} else if (!prefixcmp(line, "branch ")) {
|
|
origin_data->is_local_branch = 1;
|
|
origin = line + 7;
|
|
string_list_append(&src_data->branch, origin);
|
|
src_data->head_status |= 2;
|
|
} else if (!prefixcmp(line, "tag ")) {
|
|
origin = line;
|
|
string_list_append(&src_data->tag, origin + 4);
|
|
src_data->head_status |= 2;
|
|
} else if (!prefixcmp(line, "remote-tracking branch ")) {
|
|
origin = line + strlen("remote-tracking branch ");
|
|
string_list_append(&src_data->r_branch, origin);
|
|
src_data->head_status |= 2;
|
|
} else {
|
|
origin = src;
|
|
string_list_append(&src_data->generic, line);
|
|
src_data->head_status |= 2;
|
|
}
|
|
|
|
if (!strcmp(".", src) || !strcmp(src, origin)) {
|
|
int len = strlen(origin);
|
|
if (origin[0] == '\'' && origin[len - 1] == '\'')
|
|
origin = xmemdupz(origin + 1, len - 2);
|
|
} else {
|
|
char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5);
|
|
sprintf(new_origin, "%s of %s", origin, src);
|
|
origin = new_origin;
|
|
}
|
|
if (strcmp(".", src))
|
|
origin_data->is_local_branch = 0;
|
|
string_list_append(&origins, origin)->util = origin_data;
|
|
return 0;
|
|
}
|
|
|
|
static void print_joined(const char *singular, const char *plural,
|
|
struct string_list *list, struct strbuf *out)
|
|
{
|
|
if (list->nr == 0)
|
|
return;
|
|
if (list->nr == 1) {
|
|
strbuf_addf(out, "%s%s", singular, list->items[0].string);
|
|
} else {
|
|
int i;
|
|
strbuf_addstr(out, plural);
|
|
for (i = 0; i < list->nr - 1; i++)
|
|
strbuf_addf(out, "%s%s", i > 0 ? ", " : "",
|
|
list->items[i].string);
|
|
strbuf_addf(out, " and %s", list->items[list->nr - 1].string);
|
|
}
|
|
}
|
|
|
|
static void add_branch_desc(struct strbuf *out, const char *name)
|
|
{
|
|
struct strbuf desc = STRBUF_INIT;
|
|
|
|
if (!read_branch_desc(&desc, name)) {
|
|
const char *bp = desc.buf;
|
|
while (*bp) {
|
|
const char *ep = strchrnul(bp, '\n');
|
|
if (*ep)
|
|
ep++;
|
|
strbuf_addf(out, " : %.*s", (int)(ep - bp), bp);
|
|
bp = ep;
|
|
}
|
|
if (out->buf[out->len - 1] != '\n')
|
|
strbuf_addch(out, '\n');
|
|
}
|
|
strbuf_release(&desc);
|
|
}
|
|
|
|
#define util_as_integral(elem) ((intptr_t)((elem)->util))
|
|
|
|
static void record_person(int which, struct string_list *people,
|
|
struct commit *commit)
|
|
{
|
|
char name_buf[MAX_GITNAME], *name, *name_end;
|
|
struct string_list_item *elem;
|
|
const char *field = (which == 'a') ? "\nauthor " : "\ncommitter ";
|
|
|
|
name = strstr(commit->buffer, field);
|
|
if (!name)
|
|
return;
|
|
name += strlen(field);
|
|
name_end = strchrnul(name, '<');
|
|
if (*name_end)
|
|
name_end--;
|
|
while (isspace(*name_end) && name <= name_end)
|
|
name_end--;
|
|
if (name_end < name || name + MAX_GITNAME <= name_end)
|
|
return;
|
|
memcpy(name_buf, name, name_end - name + 1);
|
|
name_buf[name_end - name + 1] = '\0';
|
|
|
|
elem = string_list_lookup(people, name_buf);
|
|
if (!elem) {
|
|
elem = string_list_insert(people, name_buf);
|
|
elem->util = (void *)0;
|
|
}
|
|
elem->util = (void*)(util_as_integral(elem) + 1);
|
|
}
|
|
|
|
static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
|
|
{
|
|
const struct string_list_item *a = a_, *b = b_;
|
|
return util_as_integral(b) - util_as_integral(a);
|
|
}
|
|
|
|
static void add_people_count(struct strbuf *out, struct string_list *people)
|
|
{
|
|
if (people->nr == 1)
|
|
strbuf_addf(out, "%s", people->items[0].string);
|
|
else if (people->nr == 2)
|
|
strbuf_addf(out, "%s (%d) and %s (%d)",
|
|
people->items[0].string,
|
|
(int)util_as_integral(&people->items[0]),
|
|
people->items[1].string,
|
|
(int)util_as_integral(&people->items[1]));
|
|
else if (people->nr)
|
|
strbuf_addf(out, "%s (%d) and others",
|
|
people->items[0].string,
|
|
(int)util_as_integral(&people->items[0]));
|
|
}
|
|
|
|
static void credit_people(struct strbuf *out,
|
|
struct string_list *them,
|
|
int kind)
|
|
{
|
|
const char *label;
|
|
const char *me;
|
|
|
|
if (kind == 'a') {
|
|
label = "\nBy ";
|
|
me = git_author_info(IDENT_NO_DATE);
|
|
} else {
|
|
label = "\nvia ";
|
|
me = git_committer_info(IDENT_NO_DATE);
|
|
}
|
|
|
|
if (!them->nr ||
|
|
(them->nr == 1 &&
|
|
me &&
|
|
(me = skip_prefix(me, them->items->string)) != NULL &&
|
|
skip_prefix(me, " <")))
|
|
return;
|
|
strbuf_addstr(out, label);
|
|
add_people_count(out, them);
|
|
}
|
|
|
|
static void add_people_info(struct strbuf *out,
|
|
struct string_list *authors,
|
|
struct string_list *committers)
|
|
{
|
|
if (authors->nr)
|
|
qsort(authors->items,
|
|
authors->nr, sizeof(authors->items[0]),
|
|
cmp_string_list_util_as_integral);
|
|
if (committers->nr)
|
|
qsort(committers->items,
|
|
committers->nr, sizeof(committers->items[0]),
|
|
cmp_string_list_util_as_integral);
|
|
|
|
credit_people(out, authors, 'a');
|
|
credit_people(out, committers, 'c');
|
|
}
|
|
|
|
static void shortlog(const char *name,
|
|
struct origin_data *origin_data,
|
|
struct commit *head,
|
|
struct rev_info *rev, int limit,
|
|
struct strbuf *out)
|
|
{
|
|
int i, count = 0;
|
|
struct commit *commit;
|
|
struct object *branch;
|
|
struct string_list subjects = STRING_LIST_INIT_DUP;
|
|
struct string_list authors = STRING_LIST_INIT_DUP;
|
|
struct string_list committers = STRING_LIST_INIT_DUP;
|
|
int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
const unsigned char *sha1 = origin_data->sha1;
|
|
|
|
branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40);
|
|
if (!branch || branch->type != OBJ_COMMIT)
|
|
return;
|
|
|
|
setup_revisions(0, NULL, rev, NULL);
|
|
add_pending_object(rev, branch, name);
|
|
add_pending_object(rev, &head->object, "^HEAD");
|
|
head->object.flags |= UNINTERESTING;
|
|
if (prepare_revision_walk(rev))
|
|
die("revision walk setup failed");
|
|
while ((commit = get_revision(rev)) != NULL) {
|
|
struct pretty_print_context ctx = {0};
|
|
|
|
if (commit->parents && commit->parents->next) {
|
|
/* do not list a merge but count committer */
|
|
record_person('c', &committers, commit);
|
|
continue;
|
|
}
|
|
if (!count)
|
|
/* the 'tip' committer */
|
|
record_person('c', &committers, commit);
|
|
record_person('a', &authors, commit);
|
|
count++;
|
|
if (subjects.nr > limit)
|
|
continue;
|
|
|
|
format_commit_message(commit, "%s", &sb, &ctx);
|
|
strbuf_ltrim(&sb);
|
|
|
|
if (!sb.len)
|
|
string_list_append(&subjects,
|
|
sha1_to_hex(commit->object.sha1));
|
|
else
|
|
string_list_append(&subjects, strbuf_detach(&sb, NULL));
|
|
}
|
|
|
|
add_people_info(out, &authors, &committers);
|
|
if (count > limit)
|
|
strbuf_addf(out, "\n* %s: (%d commits)\n", name, count);
|
|
else
|
|
strbuf_addf(out, "\n* %s:\n", name);
|
|
|
|
if (origin_data->is_local_branch && use_branch_desc)
|
|
add_branch_desc(out, name);
|
|
|
|
for (i = 0; i < subjects.nr; i++)
|
|
if (i >= limit)
|
|
strbuf_addf(out, " ...\n");
|
|
else
|
|
strbuf_addf(out, " %s\n", subjects.items[i].string);
|
|
|
|
clear_commit_marks((struct commit *)branch, flags);
|
|
clear_commit_marks(head, flags);
|
|
free_commit_list(rev->commits);
|
|
rev->commits = NULL;
|
|
rev->pending.nr = 0;
|
|
|
|
string_list_clear(&authors, 0);
|
|
string_list_clear(&committers, 0);
|
|
string_list_clear(&subjects, 0);
|
|
}
|
|
|
|
static void fmt_merge_msg_title(struct strbuf *out,
|
|
const char *current_branch) {
|
|
int i = 0;
|
|
char *sep = "";
|
|
|
|
strbuf_addstr(out, "Merge ");
|
|
for (i = 0; i < srcs.nr; i++) {
|
|
struct src_data *src_data = srcs.items[i].util;
|
|
const char *subsep = "";
|
|
|
|
strbuf_addstr(out, sep);
|
|
sep = "; ";
|
|
|
|
if (src_data->head_status == 1) {
|
|
strbuf_addstr(out, srcs.items[i].string);
|
|
continue;
|
|
}
|
|
if (src_data->head_status == 3) {
|
|
subsep = ", ";
|
|
strbuf_addstr(out, "HEAD");
|
|
}
|
|
if (src_data->branch.nr) {
|
|
strbuf_addstr(out, subsep);
|
|
subsep = ", ";
|
|
print_joined("branch ", "branches ", &src_data->branch,
|
|
out);
|
|
}
|
|
if (src_data->r_branch.nr) {
|
|
strbuf_addstr(out, subsep);
|
|
subsep = ", ";
|
|
print_joined("remote-tracking branch ", "remote-tracking branches ",
|
|
&src_data->r_branch, out);
|
|
}
|
|
if (src_data->tag.nr) {
|
|
strbuf_addstr(out, subsep);
|
|
subsep = ", ";
|
|
print_joined("tag ", "tags ", &src_data->tag, out);
|
|
}
|
|
if (src_data->generic.nr) {
|
|
strbuf_addstr(out, subsep);
|
|
print_joined("commit ", "commits ", &src_data->generic,
|
|
out);
|
|
}
|
|
if (strcmp(".", srcs.items[i].string))
|
|
strbuf_addf(out, " of %s", srcs.items[i].string);
|
|
}
|
|
|
|
if (!strcmp("master", current_branch))
|
|
strbuf_addch(out, '\n');
|
|
else
|
|
strbuf_addf(out, " into %s\n", current_branch);
|
|
}
|
|
|
|
static void fmt_tag_signature(struct strbuf *tagbuf,
|
|
struct strbuf *sig,
|
|
const char *buf,
|
|
unsigned long len)
|
|
{
|
|
const char *tag_body = strstr(buf, "\n\n");
|
|
if (tag_body) {
|
|
tag_body += 2;
|
|
strbuf_add(tagbuf, tag_body, buf + len - tag_body);
|
|
}
|
|
strbuf_complete_line(tagbuf);
|
|
strbuf_add_lines(tagbuf, "# ", sig->buf, sig->len);
|
|
}
|
|
|
|
static void fmt_merge_msg_sigs(struct strbuf *out)
|
|
{
|
|
int i, tag_number = 0, first_tag = 0;
|
|
struct strbuf tagbuf = STRBUF_INIT;
|
|
|
|
for (i = 0; i < origins.nr; i++) {
|
|
unsigned char *sha1 = origins.items[i].util;
|
|
enum object_type type;
|
|
unsigned long size, len;
|
|
char *buf = read_sha1_file(sha1, &type, &size);
|
|
struct strbuf sig = STRBUF_INIT;
|
|
|
|
if (!buf || type != OBJ_TAG)
|
|
goto next;
|
|
len = parse_signature(buf, size);
|
|
|
|
if (size == len)
|
|
; /* merely annotated */
|
|
else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig)) {
|
|
if (!sig.len)
|
|
strbuf_addstr(&sig, "gpg verification failed.\n");
|
|
}
|
|
|
|
if (!tag_number++) {
|
|
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
|
first_tag = i;
|
|
} else {
|
|
if (tag_number == 2) {
|
|
struct strbuf tagline = STRBUF_INIT;
|
|
strbuf_addf(&tagline, "\n# %s\n",
|
|
origins.items[first_tag].string);
|
|
strbuf_insert(&tagbuf, 0, tagline.buf,
|
|
tagline.len);
|
|
strbuf_release(&tagline);
|
|
}
|
|
strbuf_addf(&tagbuf, "\n# %s\n",
|
|
origins.items[i].string);
|
|
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
|
}
|
|
strbuf_release(&sig);
|
|
next:
|
|
free(buf);
|
|
}
|
|
if (tagbuf.len) {
|
|
strbuf_addch(out, '\n');
|
|
strbuf_addbuf(out, &tagbuf);
|
|
}
|
|
strbuf_release(&tagbuf);
|
|
}
|
|
|
|
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
|
struct fmt_merge_msg_opts *opts)
|
|
{
|
|
int i = 0, pos = 0;
|
|
unsigned char head_sha1[20];
|
|
const char *current_branch;
|
|
void *current_branch_to_free;
|
|
|
|
/* get current branch */
|
|
current_branch = current_branch_to_free =
|
|
resolve_refdup("HEAD", head_sha1, 1, NULL);
|
|
if (!current_branch)
|
|
die("No current branch");
|
|
if (!prefixcmp(current_branch, "refs/heads/"))
|
|
current_branch += 11;
|
|
|
|
/* get a line */
|
|
while (pos < in->len) {
|
|
int len;
|
|
char *newline, *p = in->buf + pos;
|
|
|
|
newline = strchr(p, '\n');
|
|
len = newline ? newline - p : strlen(p);
|
|
pos += len + !!newline;
|
|
i++;
|
|
p[len] = 0;
|
|
if (handle_line(p))
|
|
die ("Error in line %d: %.*s", i, len, p);
|
|
}
|
|
|
|
if (opts->add_title && srcs.nr)
|
|
fmt_merge_msg_title(out, current_branch);
|
|
|
|
if (origins.nr)
|
|
fmt_merge_msg_sigs(out);
|
|
|
|
if (opts->shortlog_len) {
|
|
struct commit *head;
|
|
struct rev_info rev;
|
|
|
|
head = lookup_commit_or_die(head_sha1, "HEAD");
|
|
init_revisions(&rev, NULL);
|
|
rev.commit_format = CMIT_FMT_ONELINE;
|
|
rev.ignore_merges = 1;
|
|
rev.limited = 1;
|
|
|
|
if (suffixcmp(out->buf, "\n"))
|
|
strbuf_addch(out, '\n');
|
|
|
|
for (i = 0; i < origins.nr; i++)
|
|
shortlog(origins.items[i].string,
|
|
origins.items[i].util,
|
|
head, &rev, opts->shortlog_len, out);
|
|
}
|
|
|
|
strbuf_complete_line(out);
|
|
free(current_branch_to_free);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *inpath = NULL;
|
|
const char *message = NULL;
|
|
int shortlog_len = -1;
|
|
struct option options[] = {
|
|
{ OPTION_INTEGER, 0, "log", &shortlog_len, "n",
|
|
"populate log with at most <n> entries from shortlog",
|
|
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
|
|
{ OPTION_INTEGER, 0, "summary", &shortlog_len, "n",
|
|
"alias for --log (deprecated)",
|
|
PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL,
|
|
DEFAULT_MERGE_LOG_LEN },
|
|
OPT_STRING('m', "message", &message, "text",
|
|
"use <text> as start of message"),
|
|
OPT_FILENAME('F', "file", &inpath, "file to read from"),
|
|
OPT_END()
|
|
};
|
|
|
|
FILE *in = stdin;
|
|
struct strbuf input = STRBUF_INIT, output = STRBUF_INIT;
|
|
int ret;
|
|
struct fmt_merge_msg_opts opts;
|
|
|
|
git_config(fmt_merge_msg_config, NULL);
|
|
argc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,
|
|
0);
|
|
if (argc > 0)
|
|
usage_with_options(fmt_merge_msg_usage, options);
|
|
if (shortlog_len < 0)
|
|
shortlog_len = (merge_log_config > 0) ? merge_log_config : 0;
|
|
|
|
if (inpath && strcmp(inpath, "-")) {
|
|
in = fopen(inpath, "r");
|
|
if (!in)
|
|
die_errno("cannot open '%s'", inpath);
|
|
}
|
|
|
|
if (strbuf_read(&input, fileno(in), 0) < 0)
|
|
die_errno("could not read input file");
|
|
|
|
if (message)
|
|
strbuf_addstr(&output, message);
|
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
opts.add_title = !message;
|
|
opts.shortlog_len = shortlog_len;
|
|
|
|
ret = fmt_merge_msg(&input, &output, &opts);
|
|
if (ret)
|
|
return ret;
|
|
write_in_full(STDOUT_FILENO, output.buf, output.len);
|
|
return 0;
|
|
}
|