Merge branch 'maint'
[git] / builtin-fmt-merge-msg.c
1 #include "builtin.h"
2 #include "cache.h"
3 #include "commit.h"
4 #include "diff.h"
5 #include "revision.h"
6 #include "tag.h"
7
8 static const char *fmt_merge_msg_usage =
9         "git-fmt-merge-msg [--summary] [--no-summary] [--file <file>]";
10
11 static int merge_summary;
12
13 static int fmt_merge_msg_config(const char *key, const char *value)
14 {
15         if (!strcmp("merge.summary", key))
16                 merge_summary = git_config_bool(key, value);
17         return 0;
18 }
19
20 struct list {
21         char **list;
22         void **payload;
23         unsigned nr, alloc;
24 };
25
26 static void append_to_list(struct list *list, char *value, void *payload)
27 {
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);
33         }
34         list->payload[list->nr] = payload;
35         list->list[list->nr++] = value;
36 }
37
38 static int find_in_list(struct list *list, char *value)
39 {
40         int i;
41
42         for (i = 0; i < list->nr; i++)
43                 if (!strcmp(list->list[i], value))
44                         return i;
45
46         return -1;
47 }
48
49 static void free_list(struct list *list)
50 {
51         int i;
52
53         if (list->alloc == 0)
54                 return;
55
56         for (i = 0; i < list->nr; i++) {
57                 free(list->list[i]);
58                 free(list->payload[i]);
59         }
60         free(list->list);
61         free(list->payload);
62         list->nr = list->alloc = 0;
63 }
64
65 struct src_data {
66         struct list branch, tag, r_branch, generic;
67         int head_status;
68 };
69
70 static struct list srcs = { NULL, NULL, 0, 0};
71 static struct list origins = { NULL, NULL, 0, 0};
72
73 static int handle_line(char *line)
74 {
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;
80
81         if (len < 43 || line[40] != '\t')
82                 return 1;
83
84         if (!prefixcmp(line + 41, "not-for-merge"))
85                 return 0;
86
87         if (line[41] != '\t')
88                 return 2;
89
90         line[40] = 0;
91         sha1 = xmalloc(20);
92         i = get_sha1(line, sha1);
93         line[40] = '\t';
94         if (i)
95                 return 3;
96
97         if (line[len - 1] == '\n')
98                 line[len - 1] = 0;
99         line += 42;
100
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;
109         }
110
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)));
116         }
117         src_data = srcs.payload[i];
118
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;
138         }
139
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);
146                 }
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;
151         }
152         append_to_list(&origins, origin, sha1);
153         return 0;
154 }
155
156 static void print_joined(const char *singular, const char *plural,
157                 struct list *list)
158 {
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]);
169         }
170 }
171
172 static void shortlog(const char *name, unsigned char *sha1,
173                 struct commit *head, struct rev_info *rev, int limit)
174 {
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;
180
181         branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40);
182         if (!branch || branch->type != OBJ_COMMIT)
183                 return;
184
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         if (prepare_revision_walk(rev))
191                 die("revision walk setup failed");
192         while ((commit = get_revision(rev)) != NULL) {
193                 char *oneline, *bol, *eol;
194
195                 /* ignore merges */
196                 if (commit->parents && commit->parents->next)
197                         continue;
198
199                 count++;
200                 if (subjects.nr > limit)
201                         continue;
202
203                 bol = strstr(commit->buffer, "\n\n");
204                 if (!bol) {
205                         append_to_list(&subjects, xstrdup(sha1_to_hex(
206                                                         commit->object.sha1)),
207                                         NULL);
208                         continue;
209                 }
210
211                 bol += 2;
212                 eol = strchr(bol, '\n');
213                 if (eol) {
214                         oneline = xmemdupz(bol, eol - bol);
215                 } else {
216                         oneline = xstrdup(bol);
217                 }
218                 append_to_list(&subjects, oneline, NULL);
219         }
220
221         if (count > limit)
222                 printf("\n* %s: (%d commits)\n", name, count);
223         else
224                 printf("\n* %s:\n", name);
225
226         for (i = 0; i < subjects.nr; i++)
227                 if (i >= limit)
228                         printf("  ...\n");
229                 else
230                         printf("  %s\n", subjects.list[i]);
231
232         clear_commit_marks((struct commit *)branch, flags);
233         clear_commit_marks(head, flags);
234         free_commit_list(rev->commits);
235         rev->commits = NULL;
236         rev->pending.nr = 0;
237
238         free_list(&subjects);
239 }
240
241 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
242 {
243         int limit = 20, i = 0;
244         char line[1024];
245         FILE *in = stdin;
246         const char *sep = "";
247         unsigned char head_sha1[20];
248         const char *current_branch;
249
250         git_config(fmt_merge_msg_config);
251
252         while (argc > 1) {
253                 if (!strcmp(argv[1], "--summary"))
254                         merge_summary = 1;
255                 else if (!strcmp(argv[1], "--no-summary"))
256                         merge_summary = 0;
257                 else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
258                         if (argc < 3)
259                                 die ("Which file?");
260                         if (!strcmp(argv[2], "-"))
261                                 in = stdin;
262                         else {
263                                 fclose(in);
264                                 in = fopen(argv[2], "r");
265                                 if (!in)
266                                         die("cannot open %s", argv[2]);
267                         }
268                         argc--; argv++;
269                 } else
270                         break;
271                 argc--; argv++;
272         }
273
274         if (argc > 1)
275                 usage(fmt_merge_msg_usage);
276
277         /* get current branch */
278         current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
279         if (!current_branch)
280                 die("No current branch");
281         if (!prefixcmp(current_branch, "refs/heads/"))
282                 current_branch += 11;
283
284         while (fgets(line, sizeof(line), in)) {
285                 i++;
286                 if (line[0] == 0)
287                         continue;
288                 if (handle_line(line))
289                         die ("Error in line %d: %s", i, line);
290         }
291
292         printf("Merge ");
293         for (i = 0; i < srcs.nr; i++) {
294                 struct src_data *src_data = srcs.payload[i];
295                 const char *subsep = "";
296
297                 printf(sep);
298                 sep = "; ";
299
300                 if (src_data->head_status == 1) {
301                         printf(srcs.list[i]);
302                         continue;
303                 }
304                 if (src_data->head_status == 3) {
305                         subsep = ", ";
306                         printf("HEAD");
307                 }
308                 if (src_data->branch.nr) {
309                         printf(subsep);
310                         subsep = ", ";
311                         print_joined("branch ", "branches ", &src_data->branch);
312                 }
313                 if (src_data->r_branch.nr) {
314                         printf(subsep);
315                         subsep = ", ";
316                         print_joined("remote branch ", "remote branches ",
317                                         &src_data->r_branch);
318                 }
319                 if (src_data->tag.nr) {
320                         printf(subsep);
321                         subsep = ", ";
322                         print_joined("tag ", "tags ", &src_data->tag);
323                 }
324                 if (src_data->generic.nr) {
325                         printf(subsep);
326                         print_joined("commit ", "commits ", &src_data->generic);
327                 }
328                 if (strcmp(".", srcs.list[i]))
329                         printf(" of %s", srcs.list[i]);
330         }
331
332         if (!strcmp("master", current_branch))
333                 putchar('\n');
334         else
335                 printf(" into %s\n", current_branch);
336
337         if (merge_summary) {
338                 struct commit *head;
339                 struct rev_info rev;
340
341                 head = lookup_commit(head_sha1);
342                 init_revisions(&rev, prefix);
343                 rev.commit_format = CMIT_FMT_ONELINE;
344                 rev.ignore_merges = 1;
345                 rev.limited = 1;
346
347                 for (i = 0; i < origins.nr; i++)
348                         shortlog(origins.list[i], origins.payload[i],
349                                         head, &rev, limit);
350         }
351
352         /* No cleanup yet; is standalone anyway */
353
354         return 0;
355 }