builtin-apply: stronger indent-with-on-tab fixing
[git/jbf-maint.git] / builtin-fmt-merge-msg.c
blob6163bd4975e3e361e36ffc89ea4c91d0edd02949
1 #include "builtin.h"
2 #include "cache.h"
3 #include "commit.h"
4 #include "diff.h"
5 #include "revision.h"
6 #include "tag.h"
8 static const char *fmt_merge_msg_usage =
9 "git-fmt-merge-msg [--summary] [--no-summary] [--file <file>]";
11 static int merge_summary;
13 static int fmt_merge_msg_config(const char *key, const char *value)
15 if (!strcmp("merge.summary", key))
16 merge_summary = git_config_bool(key, value);
17 return 0;
20 struct list {
21 char **list;
22 void **payload;
23 unsigned nr, alloc;
26 static void append_to_list(struct list *list, char *value, void *payload)
28 if (list->nr == list->alloc) {
29 list->alloc += 32;
30 list->list = xrealloc(list->list, sizeof(char *) * list->alloc);
31 list->payload = xrealloc(list->payload,
32 sizeof(char *) * list->alloc);
34 list->payload[list->nr] = payload;
35 list->list[list->nr++] = value;
38 static int find_in_list(struct list *list, char *value)
40 int i;
42 for (i = 0; i < list->nr; i++)
43 if (!strcmp(list->list[i], value))
44 return i;
46 return -1;
49 static void free_list(struct list *list)
51 int i;
53 if (list->alloc == 0)
54 return;
56 for (i = 0; i < list->nr; i++) {
57 free(list->list[i]);
58 free(list->payload[i]);
60 free(list->list);
61 free(list->payload);
62 list->nr = list->alloc = 0;
65 struct src_data {
66 struct list branch, tag, r_branch, generic;
67 int head_status;
70 static struct list srcs = { NULL, NULL, 0, 0};
71 static struct list origins = { NULL, NULL, 0, 0};
73 static int handle_line(char *line)
75 int i, len = strlen(line);
76 unsigned char *sha1;
77 char *src, *origin;
78 struct src_data *src_data;
79 int pulling_head = 0;
81 if (len < 43 || line[40] != '\t')
82 return 1;
84 if (!prefixcmp(line + 41, "not-for-merge"))
85 return 0;
87 if (line[41] != '\t')
88 return 2;
90 line[40] = 0;
91 sha1 = xmalloc(20);
92 i = get_sha1(line, sha1);
93 line[40] = '\t';
94 if (i)
95 return 3;
97 if (line[len - 1] == '\n')
98 line[len - 1] = 0;
99 line += 42;
101 src = strstr(line, " of ");
102 if (src) {
103 *src = 0;
104 src += 4;
105 pulling_head = 0;
106 } else {
107 src = line;
108 pulling_head = 1;
111 i = find_in_list(&srcs, src);
112 if (i < 0) {
113 i = srcs.nr;
114 append_to_list(&srcs, xstrdup(src),
115 xcalloc(1, sizeof(struct src_data)));
117 src_data = srcs.payload[i];
119 if (pulling_head) {
120 origin = xstrdup(src);
121 src_data->head_status |= 1;
122 } else if (!prefixcmp(line, "branch ")) {
123 origin = xstrdup(line + 7);
124 append_to_list(&src_data->branch, origin, NULL);
125 src_data->head_status |= 2;
126 } else if (!prefixcmp(line, "tag ")) {
127 origin = line;
128 append_to_list(&src_data->tag, xstrdup(origin + 4), NULL);
129 src_data->head_status |= 2;
130 } else if (!prefixcmp(line, "remote branch ")) {
131 origin = xstrdup(line + 14);
132 append_to_list(&src_data->r_branch, origin, NULL);
133 src_data->head_status |= 2;
134 } else {
135 origin = xstrdup(src);
136 append_to_list(&src_data->generic, xstrdup(line), NULL);
137 src_data->head_status |= 2;
140 if (!strcmp(".", src) || !strcmp(src, origin)) {
141 int len = strlen(origin);
142 if (origin[0] == '\'' && origin[len - 1] == '\'') {
143 origin = xmemdupz(origin + 1, len - 2);
144 } else {
145 origin = xstrdup(origin);
147 } else {
148 char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5);
149 sprintf(new_origin, "%s of %s", origin, src);
150 origin = new_origin;
152 append_to_list(&origins, origin, sha1);
153 return 0;
156 static void print_joined(const char *singular, const char *plural,
157 struct list *list)
159 if (list->nr == 0)
160 return;
161 if (list->nr == 1) {
162 printf("%s%s", singular, list->list[0]);
163 } else {
164 int i;
165 printf("%s", plural);
166 for (i = 0; i < list->nr - 1; i++)
167 printf("%s%s", i > 0 ? ", " : "", list->list[i]);
168 printf(" and %s", list->list[list->nr - 1]);
172 static void shortlog(const char *name, unsigned char *sha1,
173 struct commit *head, struct rev_info *rev, int limit)
175 int i, count = 0;
176 struct commit *commit;
177 struct object *branch;
178 struct list subjects = { NULL, NULL, 0, 0 };
179 int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
181 branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40);
182 if (!branch || branch->type != OBJ_COMMIT)
183 return;
185 setup_revisions(0, NULL, rev, NULL);
186 rev->ignore_merges = 1;
187 add_pending_object(rev, branch, name);
188 add_pending_object(rev, &head->object, "^HEAD");
189 head->object.flags |= UNINTERESTING;
190 prepare_revision_walk(rev);
191 while ((commit = get_revision(rev)) != NULL) {
192 char *oneline, *bol, *eol;
194 /* ignore merges */
195 if (commit->parents && commit->parents->next)
196 continue;
198 count++;
199 if (subjects.nr > limit)
200 continue;
202 bol = strstr(commit->buffer, "\n\n");
203 if (!bol) {
204 append_to_list(&subjects, xstrdup(sha1_to_hex(
205 commit->object.sha1)),
206 NULL);
207 continue;
210 bol += 2;
211 eol = strchr(bol, '\n');
212 if (eol) {
213 oneline = xmemdupz(bol, eol - bol);
214 } else {
215 oneline = xstrdup(bol);
217 append_to_list(&subjects, oneline, NULL);
220 if (count > limit)
221 printf("\n* %s: (%d commits)\n", name, count);
222 else
223 printf("\n* %s:\n", name);
225 for (i = 0; i < subjects.nr; i++)
226 if (i >= limit)
227 printf(" ...\n");
228 else
229 printf(" %s\n", subjects.list[i]);
231 clear_commit_marks((struct commit *)branch, flags);
232 clear_commit_marks(head, flags);
233 free_commit_list(rev->commits);
234 rev->commits = NULL;
235 rev->pending.nr = 0;
237 free_list(&subjects);
240 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
242 int limit = 20, i = 0;
243 char line[1024];
244 FILE *in = stdin;
245 const char *sep = "";
246 unsigned char head_sha1[20];
247 const char *current_branch;
249 git_config(fmt_merge_msg_config);
251 while (argc > 1) {
252 if (!strcmp(argv[1], "--summary"))
253 merge_summary = 1;
254 else if (!strcmp(argv[1], "--no-summary"))
255 merge_summary = 0;
256 else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
257 if (argc < 3)
258 die ("Which file?");
259 if (!strcmp(argv[2], "-"))
260 in = stdin;
261 else {
262 fclose(in);
263 in = fopen(argv[2], "r");
264 if (!in)
265 die("cannot open %s", argv[2]);
267 argc--; argv++;
268 } else
269 break;
270 argc--; argv++;
273 if (argc > 1)
274 usage(fmt_merge_msg_usage);
276 /* get current branch */
277 current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
278 if (!current_branch)
279 die("No current branch");
280 if (!prefixcmp(current_branch, "refs/heads/"))
281 current_branch += 11;
283 while (fgets(line, sizeof(line), in)) {
284 i++;
285 if (line[0] == 0)
286 continue;
287 if (handle_line(line))
288 die ("Error in line %d: %s", i, line);
291 printf("Merge ");
292 for (i = 0; i < srcs.nr; i++) {
293 struct src_data *src_data = srcs.payload[i];
294 const char *subsep = "";
296 printf(sep);
297 sep = "; ";
299 if (src_data->head_status == 1) {
300 printf(srcs.list[i]);
301 continue;
303 if (src_data->head_status == 3) {
304 subsep = ", ";
305 printf("HEAD");
307 if (src_data->branch.nr) {
308 printf(subsep);
309 subsep = ", ";
310 print_joined("branch ", "branches ", &src_data->branch);
312 if (src_data->r_branch.nr) {
313 printf(subsep);
314 subsep = ", ";
315 print_joined("remote branch ", "remote branches ",
316 &src_data->r_branch);
318 if (src_data->tag.nr) {
319 printf(subsep);
320 subsep = ", ";
321 print_joined("tag ", "tags ", &src_data->tag);
323 if (src_data->generic.nr) {
324 printf(subsep);
325 print_joined("commit ", "commits ", &src_data->generic);
327 if (strcmp(".", srcs.list[i]))
328 printf(" of %s", srcs.list[i]);
331 if (!strcmp("master", current_branch))
332 putchar('\n');
333 else
334 printf(" into %s\n", current_branch);
336 if (merge_summary) {
337 struct commit *head;
338 struct rev_info rev;
340 head = lookup_commit(head_sha1);
341 init_revisions(&rev, prefix);
342 rev.commit_format = CMIT_FMT_ONELINE;
343 rev.ignore_merges = 1;
344 rev.limited = 1;
346 for (i = 0; i < origins.nr; i++)
347 shortlog(origins.list[i], origins.payload[i],
348 head, &rev, limit);
351 /* No cleanup yet; is standalone anyway */
353 return 0;