]>
Commit | Line | Data |
---|---|---|
25f38f06 | 1 | #include "builtin.h" |
00449f99 JS |
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 = | |
1b1dd23f | 9 | "git fmt-merge-msg [--log] [--no-log] [--file <file>]"; |
00449f99 | 10 | |
96f1e58f | 11 | static int merge_summary; |
00449f99 | 12 | |
ef90d6d4 | 13 | static int fmt_merge_msg_config(const char *key, const char *value, void *cb) |
00449f99 | 14 | { |
6cd9cfef SG |
15 | static int found_merge_log = 0; |
16 | if (!strcmp("merge.log", key)) { | |
17 | found_merge_log = 1; | |
18 | merge_summary = git_config_bool(key, value); | |
19 | } | |
20 | if (!found_merge_log && !strcmp("merge.summary", key)) | |
00449f99 JS |
21 | merge_summary = git_config_bool(key, value); |
22 | return 0; | |
23 | } | |
24 | ||
25 | struct list { | |
26 | char **list; | |
27 | void **payload; | |
28 | unsigned nr, alloc; | |
29 | }; | |
30 | ||
31 | static void append_to_list(struct list *list, char *value, void *payload) | |
32 | { | |
33 | if (list->nr == list->alloc) { | |
34 | list->alloc += 32; | |
83572c1a JF |
35 | list->list = xrealloc(list->list, sizeof(char *) * list->alloc); |
36 | list->payload = xrealloc(list->payload, | |
00449f99 JS |
37 | sizeof(char *) * list->alloc); |
38 | } | |
39 | list->payload[list->nr] = payload; | |
40 | list->list[list->nr++] = value; | |
41 | } | |
42 | ||
43 | static int find_in_list(struct list *list, char *value) | |
44 | { | |
45 | int i; | |
46 | ||
47 | for (i = 0; i < list->nr; i++) | |
48 | if (!strcmp(list->list[i], value)) | |
49 | return i; | |
50 | ||
51 | return -1; | |
52 | } | |
53 | ||
54 | static void free_list(struct list *list) | |
55 | { | |
56 | int i; | |
57 | ||
58 | if (list->alloc == 0) | |
59 | return; | |
60 | ||
61 | for (i = 0; i < list->nr; i++) { | |
62 | free(list->list[i]); | |
4cac42b1 | 63 | free(list->payload[i]); |
00449f99 JS |
64 | } |
65 | free(list->list); | |
66 | free(list->payload); | |
67 | list->nr = list->alloc = 0; | |
68 | } | |
69 | ||
70 | struct src_data { | |
71 | struct list branch, tag, r_branch, generic; | |
72 | int head_status; | |
73 | }; | |
74 | ||
75 | static struct list srcs = { NULL, NULL, 0, 0}; | |
76 | static struct list origins = { NULL, NULL, 0, 0}; | |
77 | ||
78 | static int handle_line(char *line) | |
79 | { | |
80 | int i, len = strlen(line); | |
81 | unsigned char *sha1; | |
82 | char *src, *origin; | |
83 | struct src_data *src_data; | |
e918c6ab | 84 | int pulling_head = 0; |
00449f99 JS |
85 | |
86 | if (len < 43 || line[40] != '\t') | |
87 | return 1; | |
88 | ||
cc44c765 | 89 | if (!prefixcmp(line + 41, "not-for-merge")) |
00449f99 JS |
90 | return 0; |
91 | ||
92 | if (line[41] != '\t') | |
93 | return 2; | |
94 | ||
95 | line[40] = 0; | |
96 | sha1 = xmalloc(20); | |
97 | i = get_sha1(line, sha1); | |
98 | line[40] = '\t'; | |
99 | if (i) | |
100 | return 3; | |
101 | ||
102 | if (line[len - 1] == '\n') | |
103 | line[len - 1] = 0; | |
104 | line += 42; | |
105 | ||
106 | src = strstr(line, " of "); | |
107 | if (src) { | |
108 | *src = 0; | |
109 | src += 4; | |
e918c6ab JH |
110 | pulling_head = 0; |
111 | } else { | |
112 | src = line; | |
113 | pulling_head = 1; | |
114 | } | |
00449f99 JS |
115 | |
116 | i = find_in_list(&srcs, src); | |
117 | if (i < 0) { | |
118 | i = srcs.nr; | |
9befac47 | 119 | append_to_list(&srcs, xstrdup(src), |
00449f99 JS |
120 | xcalloc(1, sizeof(struct src_data))); |
121 | } | |
122 | src_data = srcs.payload[i]; | |
123 | ||
e918c6ab | 124 | if (pulling_head) { |
9befac47 | 125 | origin = xstrdup(src); |
e918c6ab | 126 | src_data->head_status |= 1; |
cc44c765 | 127 | } else if (!prefixcmp(line, "branch ")) { |
9befac47 | 128 | origin = xstrdup(line + 7); |
00449f99 JS |
129 | append_to_list(&src_data->branch, origin, NULL); |
130 | src_data->head_status |= 2; | |
cc44c765 | 131 | } else if (!prefixcmp(line, "tag ")) { |
00449f99 | 132 | origin = line; |
9befac47 | 133 | append_to_list(&src_data->tag, xstrdup(origin + 4), NULL); |
00449f99 | 134 | src_data->head_status |= 2; |
cc44c765 | 135 | } else if (!prefixcmp(line, "remote branch ")) { |
9befac47 | 136 | origin = xstrdup(line + 14); |
00449f99 JS |
137 | append_to_list(&src_data->r_branch, origin, NULL); |
138 | src_data->head_status |= 2; | |
00449f99 | 139 | } else { |
9befac47 SP |
140 | origin = xstrdup(src); |
141 | append_to_list(&src_data->generic, xstrdup(line), NULL); | |
00449f99 JS |
142 | src_data->head_status |= 2; |
143 | } | |
144 | ||
145 | if (!strcmp(".", src) || !strcmp(src, origin)) { | |
146 | int len = strlen(origin); | |
147 | if (origin[0] == '\'' && origin[len - 1] == '\'') { | |
182af834 PH |
148 | origin = xmemdupz(origin + 1, len - 2); |
149 | } else { | |
9befac47 | 150 | origin = xstrdup(origin); |
182af834 | 151 | } |
00449f99 | 152 | } else { |
2d7320d0 | 153 | char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5); |
00449f99 JS |
154 | sprintf(new_origin, "%s of %s", origin, src); |
155 | origin = new_origin; | |
156 | } | |
157 | append_to_list(&origins, origin, sha1); | |
158 | return 0; | |
159 | } | |
160 | ||
161 | static void print_joined(const char *singular, const char *plural, | |
0b9a969e | 162 | struct list *list, struct strbuf *out) |
00449f99 JS |
163 | { |
164 | if (list->nr == 0) | |
165 | return; | |
166 | if (list->nr == 1) { | |
0b9a969e | 167 | strbuf_addf(out, "%s%s", singular, list->list[0]); |
00449f99 JS |
168 | } else { |
169 | int i; | |
0b9a969e | 170 | strbuf_addstr(out, plural); |
00449f99 | 171 | for (i = 0; i < list->nr - 1; i++) |
0b9a969e MV |
172 | strbuf_addf(out, "%s%s", i > 0 ? ", " : "", list->list[i]); |
173 | strbuf_addf(out, " and %s", list->list[list->nr - 1]); | |
00449f99 JS |
174 | } |
175 | } | |
176 | ||
177 | static void shortlog(const char *name, unsigned char *sha1, | |
0b9a969e MV |
178 | struct commit *head, struct rev_info *rev, int limit, |
179 | struct strbuf *out) | |
00449f99 JS |
180 | { |
181 | int i, count = 0; | |
182 | struct commit *commit; | |
183 | struct object *branch; | |
184 | struct list subjects = { NULL, NULL, 0, 0 }; | |
7dc0fe3b | 185 | int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED; |
00449f99 JS |
186 | |
187 | branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40); | |
1974632c | 188 | if (!branch || branch->type != OBJ_COMMIT) |
00449f99 JS |
189 | return; |
190 | ||
191 | setup_revisions(0, NULL, rev, NULL); | |
192 | rev->ignore_merges = 1; | |
193 | add_pending_object(rev, branch, name); | |
194 | add_pending_object(rev, &head->object, "^HEAD"); | |
195 | head->object.flags |= UNINTERESTING; | |
3d51e1b5 MK |
196 | if (prepare_revision_walk(rev)) |
197 | die("revision walk setup failed"); | |
00449f99 JS |
198 | while ((commit = get_revision(rev)) != NULL) { |
199 | char *oneline, *bol, *eol; | |
200 | ||
201 | /* ignore merges */ | |
202 | if (commit->parents && commit->parents->next) | |
203 | continue; | |
204 | ||
205 | count++; | |
206 | if (subjects.nr > limit) | |
207 | continue; | |
208 | ||
209 | bol = strstr(commit->buffer, "\n\n"); | |
6a28518a LT |
210 | if (bol) { |
211 | unsigned char c; | |
212 | do { | |
213 | c = *++bol; | |
214 | } while (isspace(c)); | |
215 | if (!c) | |
216 | bol = NULL; | |
217 | } | |
218 | ||
00449f99 | 219 | if (!bol) { |
9befac47 | 220 | append_to_list(&subjects, xstrdup(sha1_to_hex( |
00449f99 JS |
221 | commit->object.sha1)), |
222 | NULL); | |
223 | continue; | |
224 | } | |
225 | ||
00449f99 | 226 | eol = strchr(bol, '\n'); |
00449f99 | 227 | if (eol) { |
182af834 PH |
228 | oneline = xmemdupz(bol, eol - bol); |
229 | } else { | |
9befac47 | 230 | oneline = xstrdup(bol); |
182af834 | 231 | } |
00449f99 JS |
232 | append_to_list(&subjects, oneline, NULL); |
233 | } | |
234 | ||
235 | if (count > limit) | |
0b9a969e | 236 | strbuf_addf(out, "\n* %s: (%d commits)\n", name, count); |
00449f99 | 237 | else |
0b9a969e | 238 | strbuf_addf(out, "\n* %s:\n", name); |
00449f99 JS |
239 | |
240 | for (i = 0; i < subjects.nr; i++) | |
241 | if (i >= limit) | |
0b9a969e | 242 | strbuf_addf(out, " ...\n"); |
00449f99 | 243 | else |
0b9a969e | 244 | strbuf_addf(out, " %s\n", subjects.list[i]); |
00449f99 JS |
245 | |
246 | clear_commit_marks((struct commit *)branch, flags); | |
247 | clear_commit_marks(head, flags); | |
248 | free_commit_list(rev->commits); | |
249 | rev->commits = NULL; | |
250 | rev->pending.nr = 0; | |
251 | ||
252 | free_list(&subjects); | |
253 | } | |
254 | ||
0b9a969e MV |
255 | int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) { |
256 | int limit = 20, i = 0, pos = 0; | |
00449f99 | 257 | char line[1024]; |
0b9a969e | 258 | char *p = line, *sep = ""; |
00449f99 | 259 | unsigned char head_sha1[20]; |
ed378ec7 | 260 | const char *current_branch; |
00449f99 | 261 | |
00449f99 | 262 | /* get current branch */ |
8da19775 | 263 | current_branch = resolve_ref("HEAD", head_sha1, 1, NULL); |
6b1f8c32 LT |
264 | if (!current_branch) |
265 | die("No current branch"); | |
cc44c765 | 266 | if (!prefixcmp(current_branch, "refs/heads/")) |
00449f99 JS |
267 | current_branch += 11; |
268 | ||
0b9a969e MV |
269 | /* get a line */ |
270 | while (pos < in->len) { | |
271 | int len; | |
272 | char *newline; | |
273 | ||
274 | p = in->buf + pos; | |
275 | newline = strchr(p, '\n'); | |
276 | len = newline ? newline - p : strlen(p); | |
277 | pos += len + !!newline; | |
00449f99 | 278 | i++; |
0b9a969e MV |
279 | p[len] = 0; |
280 | if (handle_line(p)) | |
281 | die ("Error in line %d: %.*s", i, len, p); | |
00449f99 JS |
282 | } |
283 | ||
0b9a969e | 284 | strbuf_addstr(out, "Merge "); |
00449f99 JS |
285 | for (i = 0; i < srcs.nr; i++) { |
286 | struct src_data *src_data = srcs.payload[i]; | |
287 | const char *subsep = ""; | |
288 | ||
0b9a969e | 289 | strbuf_addstr(out, sep); |
00449f99 JS |
290 | sep = "; "; |
291 | ||
292 | if (src_data->head_status == 1) { | |
0b9a969e | 293 | strbuf_addstr(out, srcs.list[i]); |
00449f99 JS |
294 | continue; |
295 | } | |
296 | if (src_data->head_status == 3) { | |
297 | subsep = ", "; | |
0b9a969e | 298 | strbuf_addstr(out, "HEAD"); |
00449f99 JS |
299 | } |
300 | if (src_data->branch.nr) { | |
0b9a969e | 301 | strbuf_addstr(out, subsep); |
00449f99 | 302 | subsep = ", "; |
0b9a969e MV |
303 | print_joined("branch ", "branches ", &src_data->branch, |
304 | out); | |
00449f99 JS |
305 | } |
306 | if (src_data->r_branch.nr) { | |
0b9a969e | 307 | strbuf_addstr(out, subsep); |
00449f99 JS |
308 | subsep = ", "; |
309 | print_joined("remote branch ", "remote branches ", | |
0b9a969e | 310 | &src_data->r_branch, out); |
00449f99 JS |
311 | } |
312 | if (src_data->tag.nr) { | |
0b9a969e | 313 | strbuf_addstr(out, subsep); |
00449f99 | 314 | subsep = ", "; |
0b9a969e | 315 | print_joined("tag ", "tags ", &src_data->tag, out); |
00449f99 JS |
316 | } |
317 | if (src_data->generic.nr) { | |
0b9a969e MV |
318 | strbuf_addstr(out, subsep); |
319 | print_joined("commit ", "commits ", &src_data->generic, | |
320 | out); | |
00449f99 JS |
321 | } |
322 | if (strcmp(".", srcs.list[i])) | |
0b9a969e | 323 | strbuf_addf(out, " of %s", srcs.list[i]); |
00449f99 JS |
324 | } |
325 | ||
326 | if (!strcmp("master", current_branch)) | |
0b9a969e | 327 | strbuf_addch(out, '\n'); |
00449f99 | 328 | else |
0b9a969e | 329 | strbuf_addf(out, " into %s\n", current_branch); |
00449f99 JS |
330 | |
331 | if (merge_summary) { | |
332 | struct commit *head; | |
333 | struct rev_info rev; | |
334 | ||
335 | head = lookup_commit(head_sha1); | |
0b9a969e | 336 | init_revisions(&rev, NULL); |
00449f99 JS |
337 | rev.commit_format = CMIT_FMT_ONELINE; |
338 | rev.ignore_merges = 1; | |
339 | rev.limited = 1; | |
340 | ||
341 | for (i = 0; i < origins.nr; i++) | |
342 | shortlog(origins.list[i], origins.payload[i], | |
0b9a969e | 343 | head, &rev, limit, out); |
00449f99 | 344 | } |
0b9a969e MV |
345 | return 0; |
346 | } | |
347 | ||
348 | int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) | |
349 | { | |
350 | FILE *in = stdin; | |
351 | struct strbuf input, output; | |
352 | int ret; | |
353 | ||
354 | git_config(fmt_merge_msg_config, NULL); | |
355 | ||
356 | while (argc > 1) { | |
357 | if (!strcmp(argv[1], "--log") || !strcmp(argv[1], "--summary")) | |
358 | merge_summary = 1; | |
359 | else if (!strcmp(argv[1], "--no-log") | |
360 | || !strcmp(argv[1], "--no-summary")) | |
361 | merge_summary = 0; | |
362 | else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) { | |
363 | if (argc < 3) | |
364 | die ("Which file?"); | |
365 | if (!strcmp(argv[2], "-")) | |
366 | in = stdin; | |
367 | else { | |
368 | fclose(in); | |
369 | in = fopen(argv[2], "r"); | |
370 | if (!in) | |
371 | die("cannot open %s", argv[2]); | |
372 | } | |
373 | argc--; argv++; | |
374 | } else | |
375 | break; | |
376 | argc--; argv++; | |
377 | } | |
378 | ||
379 | if (argc > 1) | |
380 | usage(fmt_merge_msg_usage); | |
00449f99 | 381 | |
0b9a969e MV |
382 | strbuf_init(&input, 0); |
383 | if (strbuf_read(&input, fileno(in), 0) < 0) | |
384 | die("could not read input file %s", strerror(errno)); | |
385 | strbuf_init(&output, 0); | |
00449f99 | 386 | |
0b9a969e MV |
387 | ret = fmt_merge_msg(merge_summary, &input, &output); |
388 | if (ret) | |
389 | return ret; | |
390 | printf("%s", output.buf); | |
00449f99 JS |
391 | return 0; |
392 | } |