From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jun 2012 15:33:30 +0000 (-0700)
Subject: Merge branch 'jc/fmt-merge-msg-people'
X-Git-Tag: v1.7.11-rc3~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d844808bb2d3c8df0eba23ec1950bc9cf2727452?ds=inline;hp=-c

Merge branch 'jc/fmt-merge-msg-people'

Tone down the lines that credit people involved and make them
comments, so that integrators who edit their merge messages can
still make use of the information, but lazy ones will not leave
the unverified guesses placed on the "via" line.

* jc/fmt-merge-msg-people:
fmt-merge-msg: make attribution into comment lines
---

d844808bb2d3c8df0eba23ec1950bc9cf2727452
diff --combined builtin/fmt-merge-msg.c
index bf93b043b7,c90f6d685d..2c4d435da1
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@@ -55,48 -55,7 +55,48 @@@ static void init_src_data(struct src_da
  static struct string_list srcs = STRING_LIST_INIT_DUP;
  static struct string_list origins = STRING_LIST_INIT_DUP;
  
 -static int handle_line(char *line)
 +struct merge_parents {
 +	int alloc, nr;
 +	struct merge_parent {
 +		unsigned char given[20];
 +		unsigned char commit[20];
 +		unsigned char used;
 +	} *item;
 +};
 +
 +/*
 + * I know, I know, this is inefficient, but you won't be pulling and merging
 + * hundreds of heads at a time anyway.
 + */
 +static struct merge_parent *find_merge_parent(struct merge_parents *table,
 +					      unsigned char *given,
 +					      unsigned char *commit)
 +{
 +	int i;
 +	for (i = 0; i < table->nr; i++) {
 +		if (given && hashcmp(table->item[i].given, given))
 +			continue;
 +		if (commit && hashcmp(table->item[i].commit, commit))
 +			continue;
 +		return &table->item[i];
 +	}
 +	return NULL;
 +}
 +
 +static void add_merge_parent(struct merge_parents *table,
 +			     unsigned char *given,
 +			     unsigned char *commit)
 +{
 +	if (table->nr && find_merge_parent(table, given, commit))
 +		return;
 +	ALLOC_GROW(table->item, table->nr + 1, table->alloc);
 +	hashcpy(table->item[table->nr].given, given);
 +	hashcpy(table->item[table->nr].commit, commit);
 +	table->item[table->nr].used = 0;
 +	table->nr++;
 +}
 +
 +static int handle_line(char *line, struct merge_parents *merge_parents)
  {
  	int i, len = strlen(line);
  	struct origin_data *origin_data;
@@@ -104,7 -63,6 +104,7 @@@
  	struct src_data *src_data;
  	struct string_list_item *item;
  	int pulling_head = 0;
 +	unsigned char sha1[20];
  
  	if (len < 43 || line[40] != '\t')
  		return 1;
@@@ -115,15 -73,14 +115,15 @@@
  	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);
 +	i = get_sha1_hex(line, sha1);
 +	if (i)
  		return 3;
 -	}
 +
 +	if (!find_merge_parent(merge_parents, sha1, NULL))
 +		return 0; /* subsumed by other parents */
 +
 +	origin_data = xcalloc(1, sizeof(struct origin_data));
 +	hashcpy(origin_data->sha1, sha1);
  
  	if (line[len - 1] == '\n')
  		line[len - 1] = 0;
@@@ -230,7 -187,7 +230,7 @@@ static void add_branch_desc(struct strb
  static void record_person(int which, struct string_list *people,
  			  struct commit *commit)
  {
 -	char name_buf[MAX_GITNAME], *name, *name_end;
 +	char *name_buf, *name, *name_end;
  	struct string_list_item *elem;
  	const char *field = (which == 'a') ? "\nauthor " : "\ncommitter ";
  
@@@ -243,9 -200,10 +243,9 @@@
  		name_end--;
  	while (isspace(*name_end) && name <= name_end)
  		name_end--;
 -	if (name_end < name || name + MAX_GITNAME <= name_end)
 +	if (name_end < name)
  		return;
 -	memcpy(name_buf, name, name_end - name + 1);
 -	name_buf[name_end - name + 1] = '\0';
 +	name_buf = xmemdupz(name, name_end - name + 1);
  
  	elem = string_list_lookup(people, name_buf);
  	if (!elem) {
@@@ -253,7 -211,6 +253,7 @@@
  		elem->util = (void *)0;
  	}
  	elem->util = (void*)(util_as_integral(elem) + 1);
 +	free(name_buf);
  }
  
  static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
@@@ -286,10 -243,10 +286,10 @@@ static void credit_people(struct strbu
  	const char *me;
  
  	if (kind == 'a') {
- 		label = "\nBy ";
+ 		label = "\n# By ";
  		me = git_author_info(IDENT_NO_DATE);
  	} else {
- 		label = "\nvia ";
+ 		label = "\n# Via ";
  		me = git_committer_info(IDENT_NO_DATE);
  	}
  
@@@ -462,10 -419,7 +462,10 @@@ static void fmt_tag_signature(struct st
  		strbuf_add(tagbuf, tag_body, buf + len - tag_body);
  	}
  	strbuf_complete_line(tagbuf);
 -	strbuf_add_lines(tagbuf, "# ", sig->buf, sig->len);
 +	if (sig->len) {
 +		strbuf_addch(tagbuf, '\n');
 +		strbuf_add_lines(tagbuf, "# ", sig->buf, sig->len);
 +	}
  }
  
  static void fmt_merge_msg_sigs(struct strbuf *out)
@@@ -518,67 -472,6 +518,67 @@@
  	strbuf_release(&tagbuf);
  }
  
 +static void find_merge_parents(struct merge_parents *result,
 +			       struct strbuf *in, unsigned char *head)
 +{
 +	struct commit_list *parents, *next;
 +	struct commit *head_commit;
 +	int pos = 0, i, j;
 +
 +	parents = NULL;
 +	while (pos < in->len) {
 +		int len;
 +		char *p = in->buf + pos;
 +		char *newline = strchr(p, '\n');
 +		unsigned char sha1[20];
 +		struct commit *parent;
 +		struct object *obj;
 +
 +		len = newline ? newline - p : strlen(p);
 +		pos += len + !!newline;
 +
 +		if (len < 43 ||
 +		    get_sha1_hex(p, sha1) ||
 +		    p[40] != '\t' ||
 +		    p[41] != '\t')
 +			continue; /* skip not-for-merge */
 +		/*
 +		 * Do not use get_merge_parent() here; we do not have
 +		 * "name" here and we do not want to contaminate its
 +		 * util field yet.
 +		 */
 +		obj = parse_object(sha1);
 +		parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT);
 +		if (!parent)
 +			continue;
 +		commit_list_insert(parent, &parents);
 +		add_merge_parent(result, obj->sha1, parent->object.sha1);
 +	}
 +	head_commit = lookup_commit(head);
 +	if (head_commit)
 +		commit_list_insert(head_commit, &parents);
 +	parents = reduce_heads(parents);
 +
 +	while (parents) {
 +		for (i = 0; i < result->nr; i++)
 +			if (!hashcmp(result->item[i].commit,
 +				     parents->item->object.sha1))
 +				result->item[i].used = 1;
 +		next = parents->next;
 +		free(parents);
 +		parents = next;
 +	}
 +
 +	for (i = j = 0; i < result->nr; i++) {
 +		if (result->item[i].used) {
 +			if (i != j)
 +				result->item[j] = result->item[i];
 +			j++;
 +		}
 +	}
 +	result->nr = j;
 +}
 +
  int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
  		  struct fmt_merge_msg_opts *opts)
  {
@@@ -586,9 -479,6 +586,9 @@@
  	unsigned char head_sha1[20];
  	const char *current_branch;
  	void *current_branch_to_free;
 +	struct merge_parents merge_parents;
 +
 +	memset(&merge_parents, 0, sizeof(merge_parents));
  
  	/* get current branch */
  	current_branch = current_branch_to_free =
@@@ -598,8 -488,6 +598,8 @@@
  	if (!prefixcmp(current_branch, "refs/heads/"))
  		current_branch += 11;
  
 +	find_merge_parents(&merge_parents, in, head_sha1);
 +
  	/* get a line */
  	while (pos < in->len) {
  		int len;
@@@ -610,7 -498,7 +610,7 @@@
  		pos += len + !!newline;
  		i++;
  		p[len] = 0;
 -		if (handle_line(p))
 +		if (handle_line(p, &merge_parents))
  			die ("Error in line %d: %.*s", i, len, p);
  	}
  
@@@ -630,7 -518,8 +630,7 @@@
  		rev.ignore_merges = 1;
  		rev.limited = 1;
  
 -		if (suffixcmp(out->buf, "\n"))
 -			strbuf_addch(out, '\n');
 +		strbuf_complete_line(out);
  
  		for (i = 0; i < origins.nr; i++)
  			shortlog(origins.items[i].string,
@@@ -640,7 -529,6 +640,7 @@@
  
  	strbuf_complete_line(out);
  	free(current_branch_to_free);
 +	free(merge_parents.item);
  	return 0;
  }