Lift 16kB limit of log message output
[git/git.git] / commit.c
CommitLineData
8f1d2e6f 1#include "cache.h"
961784ee 2#include "tag.h"
175785e5 3#include "commit.h"
ed09aef0 4#include "pkt-line.h"
52883fbd 5#include "utf8.h"
e52a5de4 6#include "interpolate.h"
199c45bf
JH
7#include "diff.h"
8#include "revision.h"
175785e5 9
60ab26de
LT
10int save_commit_buffer = 1;
11
ab580ace
JS
12struct sort_node
13{
14 /*
55c3eb43
TS
15 * the number of children of the associated commit
16 * that also occur in the list being sorted.
17 */
ab580ace
JS
18 unsigned int indegree;
19
20 /*
55c3eb43
TS
21 * reference to original list item that we will re-use
22 * on output.
23 */
ab580ace
JS
24 struct commit_list * list_item;
25
26};
27
175785e5
DB
28const char *commit_type = "commit";
29
6cdfd179
EW
30struct cmt_fmt_map {
31 const char *n;
32 size_t cmp_len;
33 enum cmit_fmt v;
34} cmt_fmts[] = {
35 { "raw", 1, CMIT_FMT_RAW },
36 { "medium", 1, CMIT_FMT_MEDIUM },
37 { "short", 1, CMIT_FMT_SHORT },
328b710d 38 { "email", 1, CMIT_FMT_EMAIL },
6cdfd179
EW
39 { "full", 5, CMIT_FMT_FULL },
40 { "fuller", 5, CMIT_FMT_FULLER },
41 { "oneline", 1, CMIT_FMT_ONELINE },
e52a5de4 42 { "format:", 7, CMIT_FMT_USERFORMAT},
6cdfd179
EW
43};
44
e52a5de4
JS
45static char *user_format;
46
9b66ec04
LT
47enum cmit_fmt get_commit_format(const char *arg)
48{
6cdfd179
EW
49 int i;
50
51 if (!arg || !*arg)
9b66ec04 52 return CMIT_FMT_DEFAULT;
6cdfd179
EW
53 if (*arg == '=')
54 arg++;
e52a5de4
JS
55 if (!prefixcmp(arg, "format:")) {
56 if (user_format)
57 free(user_format);
58 user_format = xstrdup(arg + 7);
59 return CMIT_FMT_USERFORMAT;
60 }
6cdfd179 61 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
b6936205
EW
62 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
63 !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
6cdfd179
EW
64 return cmt_fmts[i].v;
65 }
66
67 die("invalid --pretty format: %s", arg);
9b66ec04
LT
68}
69
f76412ed
JH
70static struct commit *check_commit(struct object *obj,
71 const unsigned char *sha1,
72 int quiet)
961784ee 73{
1974632c 74 if (obj->type != OBJ_COMMIT) {
f76412ed
JH
75 if (!quiet)
76 error("Object %s is a %s, not a commit",
885a86ab 77 sha1_to_hex(sha1), typename(obj->type));
961784ee
LT
78 return NULL;
79 }
80 return (struct commit *) obj;
81}
82
f76412ed
JH
83struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
84 int quiet)
961784ee 85{
9534f40b 86 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
87
88 if (!obj)
89 return NULL;
f76412ed
JH
90 return check_commit(obj, sha1, quiet);
91}
92
93struct commit *lookup_commit_reference(const unsigned char *sha1)
94{
95 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
96}
97
5d6ccf5c 98struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
99{
100 struct object *obj = lookup_object(sha1);
100c5f3b
LT
101 if (!obj)
102 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
d1af002d 103 if (!obj->type)
1974632c 104 obj->type = OBJ_COMMIT;
f76412ed 105 return check_commit(obj, sha1, 0);
175785e5
DB
106}
107
108static unsigned long parse_commit_date(const char *buf)
109{
110 unsigned long date;
111
112 if (memcmp(buf, "author", 6))
113 return 0;
114 while (*buf++ != '\n')
115 /* nada */;
116 if (memcmp(buf, "committer", 9))
117 return 0;
118 while (*buf++ != '>')
119 /* nada */;
120 date = strtoul(buf, NULL, 10);
121 if (date == ULONG_MAX)
122 date = 0;
123 return date;
124}
125
5040f17e 126static struct commit_graft **commit_graft;
5da5c8f4
JH
127static int commit_graft_alloc, commit_graft_nr;
128
129static int commit_graft_pos(const unsigned char *sha1)
130{
131 int lo, hi;
132 lo = 0;
133 hi = commit_graft_nr;
134 while (lo < hi) {
135 int mi = (lo + hi) / 2;
136 struct commit_graft *graft = commit_graft[mi];
a89fccd2 137 int cmp = hashcmp(sha1, graft->sha1);
5da5c8f4
JH
138 if (!cmp)
139 return mi;
140 if (cmp < 0)
141 hi = mi;
142 else
143 lo = mi + 1;
144 }
145 return -lo - 1;
146}
147
5040f17e
JH
148int register_commit_graft(struct commit_graft *graft, int ignore_dups)
149{
150 int pos = commit_graft_pos(graft->sha1);
a6080a0a 151
5040f17e
JH
152 if (0 <= pos) {
153 if (ignore_dups)
154 free(graft);
155 else {
156 free(commit_graft[pos]);
157 commit_graft[pos] = graft;
158 }
159 return 1;
160 }
161 pos = -pos - 1;
162 if (commit_graft_alloc <= ++commit_graft_nr) {
163 commit_graft_alloc = alloc_nr(commit_graft_alloc);
164 commit_graft = xrealloc(commit_graft,
165 sizeof(*commit_graft) *
166 commit_graft_alloc);
167 }
168 if (pos < commit_graft_nr)
169 memmove(commit_graft + pos + 1,
170 commit_graft + pos,
171 (commit_graft_nr - pos - 1) *
172 sizeof(*commit_graft));
173 commit_graft[pos] = graft;
174 return 0;
175}
176
177struct commit_graft *read_graft_line(char *buf, int len)
178{
179 /* The format is just "Commit Parent1 Parent2 ...\n" */
180 int i;
181 struct commit_graft *graft = NULL;
182
183 if (buf[len-1] == '\n')
184 buf[--len] = 0;
360204c3 185 if (buf[0] == '#' || buf[0] == '\0')
5bc4ce58 186 return NULL;
5040f17e
JH
187 if ((len + 1) % 41) {
188 bad_graft_data:
189 error("bad graft data: %s", buf);
190 free(graft);
191 return NULL;
192 }
193 i = (len + 1) / 41 - 1;
194 graft = xmalloc(sizeof(*graft) + 20 * i);
195 graft->nr_parent = i;
196 if (get_sha1_hex(buf, graft->sha1))
197 goto bad_graft_data;
198 for (i = 40; i < len; i += 41) {
199 if (buf[i] != ' ')
200 goto bad_graft_data;
201 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
202 goto bad_graft_data;
203 }
204 return graft;
205}
206
207int read_graft_file(const char *graft_file)
5da5c8f4 208{
5da5c8f4
JH
209 FILE *fp = fopen(graft_file, "r");
210 char buf[1024];
5040f17e
JH
211 if (!fp)
212 return -1;
5da5c8f4
JH
213 while (fgets(buf, sizeof(buf), fp)) {
214 /* The format is just "Commit Parent1 Parent2 ...\n" */
215 int len = strlen(buf);
5040f17e 216 struct commit_graft *graft = read_graft_line(buf, len);
5bc4ce58
JH
217 if (!graft)
218 continue;
5040f17e 219 if (register_commit_graft(graft, 1))
5da5c8f4 220 error("duplicate graft data: %s", buf);
5da5c8f4
JH
221 }
222 fclose(fp);
5040f17e
JH
223 return 0;
224}
225
226static void prepare_commit_graft(void)
227{
228 static int commit_graft_prepared;
229 char *graft_file;
230
231 if (commit_graft_prepared)
232 return;
233 graft_file = get_graft_file();
234 read_graft_file(graft_file);
ed09aef0
JS
235 /* make sure shallows are read */
236 is_repository_shallow();
5040f17e 237 commit_graft_prepared = 1;
5da5c8f4
JH
238}
239
240static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
241{
242 int pos;
5040f17e 243 prepare_commit_graft();
5da5c8f4
JH
244 pos = commit_graft_pos(sha1);
245 if (pos < 0)
246 return NULL;
247 return commit_graft[pos];
248}
249
ed09aef0
JS
250int write_shallow_commits(int fd, int use_pack_protocol)
251{
252 int i, count = 0;
253 for (i = 0; i < commit_graft_nr; i++)
254 if (commit_graft[i]->nr_parent < 0) {
255 const char *hex =
256 sha1_to_hex(commit_graft[i]->sha1);
257 count++;
258 if (use_pack_protocol)
259 packet_write(fd, "shallow %s", hex);
260 else {
93822c22
AW
261 if (write_in_full(fd, hex, 40) != 40)
262 break;
263 if (write_in_full(fd, "\n", 1) != 1)
264 break;
ed09aef0
JS
265 }
266 }
267 return count;
268}
269
f53514bc
JS
270int unregister_shallow(const unsigned char *sha1)
271{
272 int pos = commit_graft_pos(sha1);
273 if (pos < 0)
274 return -1;
275 if (pos + 1 < commit_graft_nr)
276 memcpy(commit_graft + pos, commit_graft + pos + 1,
277 sizeof(struct commit_graft *)
278 * (commit_graft_nr - pos - 1));
279 commit_graft_nr--;
280 return 0;
281}
282
bd2c39f5 283int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
175785e5 284{
3b44f15a 285 char *tail = buffer;
f7cc77d7 286 char *bufptr = buffer;
175785e5 287 unsigned char parent[20];
6c88be16 288 struct commit_list **pptr;
5da5c8f4 289 struct commit_graft *graft;
27dedf0c 290 unsigned n_refs = 0;
bd2c39f5 291
175785e5
DB
292 if (item->object.parsed)
293 return 0;
294 item->object.parsed = 1;
3b44f15a
JH
295 tail += size;
296 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
f7cc77d7 297 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
3b44f15a 298 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde8
JH
299 return error("bad tree pointer in commit %s",
300 sha1_to_hex(item->object.sha1));
175785e5 301 item->tree = lookup_tree(parent);
235ac407 302 if (item->tree)
27dedf0c 303 n_refs++;
175785e5 304 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 305 pptr = &item->parents;
5da5c8f4
JH
306
307 graft = lookup_commit_graft(item->object.sha1);
3b44f15a 308 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
f7cc77d7
LT
309 struct commit *new_parent;
310
3b44f15a
JH
311 if (tail <= bufptr + 48 ||
312 get_sha1_hex(bufptr + 7, parent) ||
313 bufptr[47] != '\n')
f7cc77d7 314 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4
JH
315 bufptr += 48;
316 if (graft)
317 continue;
f7cc77d7 318 new_parent = lookup_commit(parent);
235ac407 319 if (new_parent) {
6c88be16 320 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 321 n_refs++;
235ac407 322 }
5da5c8f4
JH
323 }
324 if (graft) {
325 int i;
326 struct commit *new_parent;
327 for (i = 0; i < graft->nr_parent; i++) {
328 new_parent = lookup_commit(graft->parent[i]);
329 if (!new_parent)
330 continue;
331 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 332 n_refs++;
5da5c8f4 333 }
175785e5
DB
334 }
335 item->date = parse_commit_date(bufptr);
27dedf0c
JH
336
337 if (track_object_refs) {
338 unsigned i = 0;
339 struct commit_list *p;
340 struct object_refs *refs = alloc_object_refs(n_refs);
341 if (item->tree)
342 refs->ref[i++] = &item->tree->object;
343 for (p = item->parents; p; p = p->next)
344 refs->ref[i++] = &p->item->object;
345 set_object_refs(&item->object, refs);
346 }
347
175785e5
DB
348 return 0;
349}
350
bd2c39f5
NP
351int parse_commit(struct commit *item)
352{
21666f1a 353 enum object_type type;
bd2c39f5
NP
354 void *buffer;
355 unsigned long size;
356 int ret;
357
358 if (item->object.parsed)
359 return 0;
21666f1a 360 buffer = read_sha1_file(item->object.sha1, &type, &size);
bd2c39f5
NP
361 if (!buffer)
362 return error("Could not read %s",
363 sha1_to_hex(item->object.sha1));
21666f1a 364 if (type != OBJ_COMMIT) {
bd2c39f5
NP
365 free(buffer);
366 return error("Object %s not a commit",
367 sha1_to_hex(item->object.sha1));
368 }
369 ret = parse_commit_buffer(item, buffer, size);
60ab26de 370 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
371 item->buffer = buffer;
372 return 0;
373 }
bd2c39f5
NP
374 free(buffer);
375 return ret;
376}
377
ac5155ef 378struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 379{
812666c8 380 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
381 new_list->item = item;
382 new_list->next = *list_p;
383 *list_p = new_list;
ac5155ef 384 return new_list;
dd97f850
DB
385}
386
175785e5
DB
387void free_commit_list(struct commit_list *list)
388{
389 while (list) {
390 struct commit_list *temp = list;
391 list = temp->next;
392 free(temp);
393 }
394}
dd97f850 395
f755494c 396struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
397{
398 struct commit_list **pp = list;
399 struct commit_list *p;
400 while ((p = *pp) != NULL) {
401 if (p->item->date < item->date) {
402 break;
403 }
404 pp = &p->next;
405 }
f755494c 406 return commit_list_insert(item, pp);
dd97f850
DB
407}
408
a6080a0a 409
dd97f850
DB
410void sort_by_date(struct commit_list **list)
411{
412 struct commit_list *ret = NULL;
413 while (*list) {
f755494c 414 insert_by_date((*list)->item, &ret);
dd97f850
DB
415 *list = (*list)->next;
416 }
417 *list = ret;
418}
419
58e28af6
DB
420struct commit *pop_most_recent_commit(struct commit_list **list,
421 unsigned int mark)
dd97f850
DB
422{
423 struct commit *ret = (*list)->item;
424 struct commit_list *parents = ret->parents;
425 struct commit_list *old = *list;
426
427 *list = (*list)->next;
428 free(old);
429
430 while (parents) {
4056c091 431 struct commit *commit = parents->item;
58e28af6
DB
432 parse_commit(commit);
433 if (!(commit->object.flags & mark)) {
434 commit->object.flags |= mark;
f755494c 435 insert_by_date(commit, list);
4056c091 436 }
dd97f850
DB
437 parents = parents->next;
438 }
439 return ret;
440}
e3bc7a3b 441
f8f9c73c
JH
442void clear_commit_marks(struct commit *commit, unsigned int mark)
443{
444 struct commit_list *parents;
445
f8f9c73c 446 commit->object.flags &= ~mark;
58ecf5c1 447 parents = commit->parents;
f8f9c73c 448 while (parents) {
160b7983 449 struct commit *parent = parents->item;
58ecf5c1
JH
450
451 /* Have we already cleared this? */
452 if (mark & parent->object.flags)
160b7983 453 clear_commit_marks(parent, mark);
f8f9c73c
JH
454 parents = parents->next;
455 }
456}
457
e3bc7a3b
LT
458/*
459 * Generic support for pretty-printing the header
460 */
461static int get_one_line(const char *msg, unsigned long len)
462{
463 int ret = 0;
464
465 while (len--) {
466 char c = *msg++;
684958ae
LT
467 if (!c)
468 break;
e3bc7a3b
LT
469 ret++;
470 if (c == '\n')
471 break;
e3bc7a3b
LT
472 }
473 return ret;
474}
475
f7e68b29
JH
476/* High bit set, or ISO-2022-INT */
477static int non_ascii(int ch)
478{
479 ch = (ch & 0xff);
480 return ((ch & 0x80) || (ch == 0x1b));
481}
482
cdd406e3
JH
483static int is_rfc2047_special(char ch)
484{
f7e68b29 485 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
cdd406e3
JH
486}
487
f7e68b29
JH
488static int add_rfc2047(char *buf, const char *line, int len,
489 const char *encoding)
cdd406e3
JH
490{
491 char *bp = buf;
492 int i, needquote;
f7e68b29
JH
493 char q_encoding[128];
494 const char *q_encoding_fmt = "=?%s?q?";
cdd406e3
JH
495
496 for (i = needquote = 0; !needquote && i < len; i++) {
f7e68b29
JH
497 int ch = line[i];
498 if (non_ascii(ch))
cdd406e3
JH
499 needquote++;
500 if ((i + 1 < len) &&
501 (ch == '=' && line[i+1] == '?'))
502 needquote++;
503 }
504 if (!needquote)
505 return sprintf(buf, "%.*s", len, line);
506
f7e68b29
JH
507 i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
508 if (sizeof(q_encoding) < i)
509 die("Insanely long encoding name %s", encoding);
510 memcpy(bp, q_encoding, i);
511 bp += i;
cdd406e3 512 for (i = 0; i < len; i++) {
0da46771 513 unsigned ch = line[i] & 0xFF;
996e2d6e
KH
514 /*
515 * We encode ' ' using '=20' even though rfc2047
516 * allows using '_' for readability. Unfortunately,
517 * many programs do not understand this and just
518 * leave the underscore in place.
519 */
520 if (is_rfc2047_special(ch) || ch == ' ') {
cdd406e3
JH
521 sprintf(bp, "=%02X", ch);
522 bp += 3;
523 }
cdd406e3
JH
524 else
525 *bp++ = ch;
526 }
527 memcpy(bp, "?=", 2);
528 bp += 2;
529 return bp - buf;
530}
531
3dfb9278 532static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
a7b02ccf 533 const char *line, enum date_mode dmode,
f7e68b29 534 const char *encoding)
e3bc7a3b
LT
535{
536 char *date;
5de36bfe 537 int namelen;
e3bc7a3b 538 unsigned long time;
000182ea 539 int tz, ret;
ff56fe1c 540 const char *filler = " ";
e3bc7a3b 541
d87449c5
JH
542 if (fmt == CMIT_FMT_ONELINE)
543 return 0;
e3bc7a3b
LT
544 date = strchr(line, '>');
545 if (!date)
546 return 0;
547 namelen = ++date - line;
548 time = strtoul(date, &date, 10);
549 tz = strtol(date, NULL, 10);
550
3eefc189 551 if (fmt == CMIT_FMT_EMAIL) {
cdd406e3
JH
552 char *name_tail = strchr(line, '<');
553 int display_name_length;
554 if (!name_tail)
555 return 0;
556 while (line < name_tail && isspace(name_tail[-1]))
557 name_tail--;
558 display_name_length = name_tail - line;
3eefc189 559 filler = "";
cdd406e3
JH
560 strcpy(buf, "From: ");
561 ret = strlen(buf);
f7e68b29
JH
562 ret += add_rfc2047(buf + ret, line, display_name_length,
563 encoding);
cdd406e3
JH
564 memcpy(buf + ret, name_tail, namelen - display_name_length);
565 ret += namelen - display_name_length;
566 buf[ret++] = '\n';
567 }
568 else {
569 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
570 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
571 filler, namelen, line);
3eefc189 572 }
ff56fe1c
JH
573 switch (fmt) {
574 case CMIT_FMT_MEDIUM:
3dfb9278 575 ret += sprintf(buf + ret, "Date: %s\n",
a7b02ccf 576 show_date(time, tz, dmode));
ff56fe1c 577 break;
3eefc189 578 case CMIT_FMT_EMAIL:
2a387043
JH
579 ret += sprintf(buf + ret, "Date: %s\n",
580 show_rfc2822_date(time, tz));
3eefc189 581 break;
ff56fe1c 582 case CMIT_FMT_FULLER:
3dfb9278 583 ret += sprintf(buf + ret, "%sDate: %s\n", what,
a7b02ccf 584 show_date(time, tz, dmode));
ff56fe1c
JH
585 break;
586 default:
587 /* notin' */
588 break;
589 }
000182ea
LT
590 return ret;
591}
592
3eefc189 593static int is_empty_line(const char *line, int *len_p)
000182ea 594{
3eefc189 595 int len = *len_p;
000182ea
LT
596 while (len && isspace(line[len-1]))
597 len--;
3eefc189 598 *len_p = len;
000182ea 599 return !len;
e3bc7a3b
LT
600}
601
f2d42275 602static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
28342a5d 603{
f2d42275
JH
604 struct commit_list *parent = commit->parents;
605 int offset;
d87449c5 606
3eefc189
JH
607 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
608 !parent || !parent->next)
f2d42275
JH
609 return 0;
610
611 offset = sprintf(buf, "Merge:");
612
613 while (parent) {
614 struct commit *p = parent->item;
14763e7b
EW
615 const char *hex = NULL;
616 const char *dots;
617 if (abbrev)
618 hex = find_unique_abbrev(p->object.sha1, abbrev);
619 if (!hex)
620 hex = sha1_to_hex(p->object.sha1);
621 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
f2d42275
JH
622 parent = parent->next;
623
6bfb27a0 624 offset += sprintf(buf + offset, " %s%s", hex, dots);
28342a5d 625 }
f2d42275 626 buf[offset++] = '\n';
28342a5d
LT
627 return offset;
628}
629
52883fbd
JH
630static char *get_header(const struct commit *commit, const char *key)
631{
632 int key_len = strlen(key);
633 const char *line = commit->buffer;
634
635 for (;;) {
636 const char *eol = strchr(line, '\n'), *next;
637
638 if (line == eol)
639 return NULL;
640 if (!eol) {
641 eol = line + strlen(line);
642 next = NULL;
643 } else
644 next = eol + 1;
e102d435
AR
645 if (eol - line > key_len &&
646 !strncmp(line, key, key_len) &&
647 line[key_len] == ' ') {
52883fbd
JH
648 int len = eol - line - key_len;
649 char *ret = xmalloc(len);
650 memcpy(ret, line + key_len + 1, len - 1);
651 ret[len - 1] = '\0';
652 return ret;
653 }
654 line = next;
655 }
656}
657
3a55602e 658static char *replace_encoding_header(char *buf, const char *encoding)
53af9816
JH
659{
660 char *encoding_header = strstr(buf, "\nencoding ");
d0e50cb4 661 char *header_end = strstr(buf, "\n\n");
53af9816
JH
662 char *end_of_encoding_header;
663 int encoding_header_pos;
664 int encoding_header_len;
665 int new_len;
666 int need_len;
667 int buflen = strlen(buf) + 1;
668
d0e50cb4
JK
669 if (!header_end)
670 header_end = buf + buflen;
671 if (!encoding_header || encoding_header >= header_end)
672 return buf;
53af9816
JH
673 encoding_header++;
674 end_of_encoding_header = strchr(encoding_header, '\n');
675 if (!end_of_encoding_header)
676 return buf; /* should not happen but be defensive */
677 end_of_encoding_header++;
678
679 encoding_header_len = end_of_encoding_header - encoding_header;
680 encoding_header_pos = encoding_header - buf;
681
682 if (is_encoding_utf8(encoding)) {
683 /* we have re-coded to UTF-8; drop the header */
684 memmove(encoding_header, end_of_encoding_header,
685 buflen - (encoding_header_pos + encoding_header_len));
686 return buf;
687 }
688 new_len = strlen(encoding);
689 need_len = new_len + strlen("encoding \n");
690 if (encoding_header_len < need_len) {
691 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
692 encoding_header = buf + encoding_header_pos;
693 end_of_encoding_header = encoding_header + encoding_header_len;
694 }
695 memmove(end_of_encoding_header + (need_len - encoding_header_len),
696 end_of_encoding_header,
697 buflen - (encoding_header_pos + encoding_header_len));
698 memcpy(encoding_header + 9, encoding, strlen(encoding));
699 encoding_header[9 + new_len] = '\n';
700 return buf;
701}
702
f7e68b29 703static char *logmsg_reencode(const struct commit *commit,
3a55602e 704 const char *output_encoding)
52883fbd 705{
3a55602e
SP
706 static const char *utf8 = "utf-8";
707 const char *use_encoding;
d2c11a38 708 char *encoding;
52883fbd
JH
709 char *out;
710
f7e68b29 711 if (!*output_encoding)
52883fbd 712 return NULL;
d2c11a38 713 encoding = get_header(commit, "encoding");
3a55602e
SP
714 use_encoding = encoding ? encoding : utf8;
715 if (!strcmp(use_encoding, output_encoding))
567fb65e 716 out = xstrdup(commit->buffer);
e90068a9
JH
717 else
718 out = reencode_string(commit->buffer,
3a55602e 719 output_encoding, use_encoding);
53af9816
JH
720 if (out)
721 out = replace_encoding_header(out, output_encoding);
722
3a55602e 723 free(encoding);
52883fbd
JH
724 return out;
725}
726
e52a5de4
JS
727static void fill_person(struct interp *table, const char *msg, int len)
728{
729 int start, end, tz = 0;
730 unsigned long date;
731 char *ep;
732
733 /* parse name */
734 for (end = 0; end < len && msg[end] != '<'; end++)
735 ; /* do nothing */
736 start = end + 1;
737 while (end > 0 && isspace(msg[end - 1]))
738 end--;
739 table[0].value = xstrndup(msg, end);
740
741 if (start >= len)
742 return;
743
744 /* parse email */
745 for (end = start + 1; end < len && msg[end] != '>'; end++)
746 ; /* do nothing */
747
748 if (end >= len)
749 return;
750
751 table[1].value = xstrndup(msg + start, end - start);
752
753 /* parse date */
754 for (start = end + 1; start < len && isspace(msg[start]); start++)
755 ; /* do nothing */
756 if (start >= len)
757 return;
758 date = strtoul(msg + start, &ep, 10);
759 if (msg + start == ep)
760 return;
761
4621af37 762 table[5].value = xstrndup(msg + start, ep - (msg + start));
e52a5de4
JS
763
764 /* parse tz */
765 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
766 ; /* do nothing */
767 if (start + 1 < len) {
768 tz = strtoul(msg + start + 1, NULL, 10);
769 if (msg[start] == '-')
770 tz = -tz;
771 }
772
773 interp_set_entry(table, 2, show_date(date, tz, 0));
774 interp_set_entry(table, 3, show_rfc2822_date(date, tz));
775 interp_set_entry(table, 4, show_date(date, tz, 1));
776}
777
778static long format_commit_message(const struct commit *commit,
80583c0e 779 const char *msg, char **buf_p, unsigned long *space_p)
e52a5de4
JS
780{
781 struct interp table[] = {
782 { "%H" }, /* commit hash */
783 { "%h" }, /* abbreviated commit hash */
784 { "%T" }, /* tree hash */
785 { "%t" }, /* abbreviated tree hash */
786 { "%P" }, /* parent hashes */
787 { "%p" }, /* abbreviated parent hashes */
788 { "%an" }, /* author name */
789 { "%ae" }, /* author email */
790 { "%ad" }, /* author date */
791 { "%aD" }, /* author date, RFC2822 style */
792 { "%ar" }, /* author date, relative */
793 { "%at" }, /* author date, UNIX timestamp */
794 { "%cn" }, /* committer name */
795 { "%ce" }, /* committer email */
796 { "%cd" }, /* committer date */
797 { "%cD" }, /* committer date, RFC2822 style */
798 { "%cr" }, /* committer date, relative */
799 { "%ct" }, /* committer date, UNIX timestamp */
800 { "%e" }, /* encoding */
801 { "%s" }, /* subject */
802 { "%b" }, /* body */
803 { "%Cred" }, /* red */
804 { "%Cgreen" }, /* green */
805 { "%Cblue" }, /* blue */
806 { "%Creset" }, /* reset color */
199c45bf
JH
807 { "%n" }, /* newline */
808 { "%m" }, /* left/right/bottom */
e52a5de4
JS
809 };
810 enum interp_index {
811 IHASH = 0, IHASH_ABBREV,
812 ITREE, ITREE_ABBREV,
813 IPARENTS, IPARENTS_ABBREV,
814 IAUTHOR_NAME, IAUTHOR_EMAIL,
815 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
816 IAUTHOR_TIMESTAMP,
817 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
818 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
819 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
820 IENCODING,
821 ISUBJECT,
822 IBODY,
823 IRED, IGREEN, IBLUE, IRESET_COLOR,
199c45bf
JH
824 INEWLINE,
825 ILEFT_RIGHT,
e52a5de4
JS
826 };
827 struct commit_list *p;
828 char parents[1024];
829 int i;
830 enum { HEADER, SUBJECT, BODY } state;
831
199c45bf 832 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
e52a5de4
JS
833 die("invalid interp table!");
834
835 /* these are independent of the commit */
836 interp_set_entry(table, IRED, "\033[31m");
837 interp_set_entry(table, IGREEN, "\033[32m");
838 interp_set_entry(table, IBLUE, "\033[34m");
839 interp_set_entry(table, IRESET_COLOR, "\033[m");
840 interp_set_entry(table, INEWLINE, "\n");
841
842 /* these depend on the commit */
843 if (!commit->object.parsed)
844 parse_object(commit->object.sha1);
845 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
846 interp_set_entry(table, IHASH_ABBREV,
847 find_unique_abbrev(commit->object.sha1,
848 DEFAULT_ABBREV));
849 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
850 interp_set_entry(table, ITREE_ABBREV,
851 find_unique_abbrev(commit->tree->object.sha1,
852 DEFAULT_ABBREV));
199c45bf
JH
853 interp_set_entry(table, ILEFT_RIGHT,
854 (commit->object.flags & BOUNDARY)
855 ? "-"
856 : (commit->object.flags & SYMMETRIC_LEFT)
857 ? "<"
858 : ">");
542e165c
JH
859
860 parents[1] = 0;
e52a5de4
JS
861 for (i = 0, p = commit->parents;
862 p && i < sizeof(parents) - 1;
863 p = p->next)
542e165c 864 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
e52a5de4 865 sha1_to_hex(p->item->object.sha1));
542e165c
JH
866 interp_set_entry(table, IPARENTS, parents + 1);
867
868 parents[1] = 0;
e52a5de4
JS
869 for (i = 0, p = commit->parents;
870 p && i < sizeof(parents) - 1;
871 p = p->next)
542e165c 872 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
e52a5de4
JS
873 find_unique_abbrev(p->item->object.sha1,
874 DEFAULT_ABBREV));
542e165c 875 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
e52a5de4
JS
876
877 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
878 int eol;
879 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
880 ; /* do nothing */
881
882 if (state == SUBJECT) {
883 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
884 i = eol;
885 }
886 if (i == eol) {
887 state++;
888 /* strip empty lines */
889 while (msg[eol + 1] == '\n')
890 eol++;
891 } else if (!prefixcmp(msg + i, "author "))
892 fill_person(table + IAUTHOR_NAME,
893 msg + i + 7, eol - i - 7);
894 else if (!prefixcmp(msg + i, "committer "))
895 fill_person(table + ICOMMITTER_NAME,
896 msg + i + 10, eol - i - 10);
897 else if (!prefixcmp(msg + i, "encoding "))
6a5ea2d0
JK
898 table[IENCODING].value =
899 xstrndup(msg + i + 9, eol - i - 9);
e52a5de4
JS
900 i = eol;
901 }
902 if (msg[i])
903 table[IBODY].value = xstrdup(msg + i);
904 for (i = 0; i < ARRAY_SIZE(table); i++)
905 if (!table[i].value)
906 interp_set_entry(table, i, "<unknown>");
907
80583c0e
JH
908 do {
909 char *buf = *buf_p;
910 unsigned long space = *space_p;
911
912 space = interpolate(buf, space, user_format,
913 table, ARRAY_SIZE(table));
914 if (!space)
915 break;
916 buf = xrealloc(buf, space);
917 *buf_p = buf;
918 *space_p = space;
919 } while (1);
e52a5de4
JS
920 interp_clear_table(table, ARRAY_SIZE(table));
921
80583c0e 922 return strlen(*buf_p);
e52a5de4
JS
923}
924
52883fbd
JH
925unsigned long pretty_print_commit(enum cmit_fmt fmt,
926 const struct commit *commit,
927 unsigned long len,
80583c0e 928 char **buf_p, unsigned long *space_p,
3dfb9278 929 int abbrev, const char *subject,
52883fbd 930 const char *after_subject,
a7b02ccf 931 enum date_mode dmode)
e3bc7a3b 932{
f3a47405 933 int hdr = 1, body = 0, seen_title = 0;
e3bc7a3b 934 unsigned long offset = 0;
3eefc189 935 int indent = 4;
f2d42275 936 int parents_shown = 0;
3815f423 937 const char *msg = commit->buffer;
c831da66 938 int plain_non_ascii = 0;
f7e68b29 939 char *reencoded;
3a55602e 940 const char *encoding;
80583c0e
JH
941 char *buf;
942 unsigned long space, slop;
52883fbd 943
e52a5de4 944 if (fmt == CMIT_FMT_USERFORMAT)
80583c0e 945 return format_commit_message(commit, msg, buf_p, space_p);
e52a5de4 946
f7e68b29
JH
947 encoding = (git_log_output_encoding
948 ? git_log_output_encoding
949 : git_commit_encoding);
950 if (!encoding)
951 encoding = "utf-8";
952 reencoded = logmsg_reencode(commit, encoding);
d2c11a38
JH
953 if (reencoded)
954 msg = reencoded;
3eefc189 955
3eefc189
JH
956 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
957 indent = 0;
e3bc7a3b 958
c831da66
JH
959 /* After-subject is used to pass in Content-Type: multipart
960 * MIME header; in that case we do not have to do the
961 * plaintext content type even if the commit message has
962 * non 7-bit ASCII character. Otherwise, check if we need
963 * to say this is not a 7-bit ASCII.
964 */
965 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
0da46771
JH
966 int i, ch, in_body;
967
968 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
969 if (!in_body) {
970 /* author could be non 7-bit ASCII but
d2c11a38 971 * the log may be so; skip over the
0da46771
JH
972 * header part first.
973 */
974 if (ch == '\n' &&
975 i + 1 < len && msg[i+1] == '\n')
976 in_body = 1;
977 }
f7e68b29 978 else if (non_ascii(ch)) {
c831da66 979 plain_non_ascii = 1;
0da46771
JH
980 break;
981 }
982 }
c831da66
JH
983 }
984
80583c0e
JH
985 space = *space_p;
986 buf = *buf_p;
987
988 /*
989 * We do not want to repeatedly realloc below, so
990 * preallocate with enough slop to hold MIME headers,
991 * "Subject: " prefix, etc.
992 */
993 slop = 1000;
994 if (subject)
995 slop += strlen(subject);
996 if (after_subject)
997 slop += strlen(after_subject);
998 if (space < strlen(msg) + slop) {
999 space = strlen(msg) + slop;
1000 buf = xrealloc(buf, space);
1001 *space_p = space;
1002 *buf_p = buf;
1003 }
1004
e3bc7a3b
LT
1005 for (;;) {
1006 const char *line = msg;
1007 int linelen = get_one_line(msg, len);
1008
1009 if (!linelen)
1010 break;
1011
80583c0e 1012 /* 20 would cover indent and leave us some slop */
e3bc7a3b 1013 if (offset + linelen + 20 > space) {
80583c0e
JH
1014 space = offset + linelen + 20;
1015 buf = xrealloc(buf, space);
1016 *buf_p = buf;
1017 *space_p = space;
e3bc7a3b
LT
1018 }
1019
1020 msg += linelen;
1021 len -= linelen;
e3bc7a3b 1022 if (hdr) {
000182ea
LT
1023 if (linelen == 1) {
1024 hdr = 0;
3eefc189 1025 if ((fmt != CMIT_FMT_ONELINE) && !subject)
d87449c5 1026 buf[offset++] = '\n';
000182ea
LT
1027 continue;
1028 }
1029 if (fmt == CMIT_FMT_RAW) {
1030 memcpy(buf + offset, line, linelen);
1031 offset += linelen;
1032 continue;
1033 }
28342a5d
LT
1034 if (!memcmp(line, "parent ", 7)) {
1035 if (linelen != 48)
1036 die("bad parent line in commit");
f2d42275 1037 continue;
28342a5d 1038 }
ff56fe1c 1039
f2d42275
JH
1040 if (!parents_shown) {
1041 offset += add_merge_info(fmt, buf + offset,
1042 commit, abbrev);
1043 parents_shown = 1;
1044 continue;
1045 }
ff56fe1c
JH
1046 /*
1047 * MEDIUM == DEFAULT shows only author with dates.
1048 * FULL shows both authors but not dates.
1049 * FULLER shows both authors and dates.
1050 */
e3bc7a3b 1051 if (!memcmp(line, "author ", 7))
ff56fe1c
JH
1052 offset += add_user_info("Author", fmt,
1053 buf + offset,
3dfb9278 1054 line + 7,
a7b02ccf 1055 dmode,
f7e68b29 1056 encoding);
ff56fe1c
JH
1057 if (!memcmp(line, "committer ", 10) &&
1058 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
1059 offset += add_user_info("Commit", fmt,
1060 buf + offset,
3dfb9278 1061 line + 10,
a7b02ccf 1062 dmode,
f7e68b29 1063 encoding);
e3bc7a3b
LT
1064 continue;
1065 }
000182ea 1066
19b3bd3e
RS
1067 if (!subject)
1068 body = 1;
1069
3eefc189 1070 if (is_empty_line(line, &linelen)) {
f3a47405
LH
1071 if (!seen_title)
1072 continue;
000182ea
LT
1073 if (!body)
1074 continue;
3eefc189
JH
1075 if (subject)
1076 continue;
000182ea
LT
1077 if (fmt == CMIT_FMT_SHORT)
1078 break;
000182ea 1079 }
d87449c5 1080
f3a47405 1081 seen_title = 1;
3eefc189 1082 if (subject) {
53f420ef
JH
1083 int slen = strlen(subject);
1084 memcpy(buf + offset, subject, slen);
1085 offset += slen;
f7e68b29
JH
1086 offset += add_rfc2047(buf + offset, line, linelen,
1087 encoding);
cdd406e3
JH
1088 }
1089 else {
1090 memset(buf + offset, ' ', indent);
1091 memcpy(buf + offset + indent, line, linelen);
1092 offset += linelen + indent;
3eefc189 1093 }
3eefc189 1094 buf[offset++] = '\n';
d87449c5
JH
1095 if (fmt == CMIT_FMT_ONELINE)
1096 break;
c831da66 1097 if (subject && plain_non_ascii) {
f7e68b29
JH
1098 int sz;
1099 char header[512];
1100 const char *header_fmt =
0ab564be 1101 "MIME-Version: 1.0\n"
f7e68b29 1102 "Content-Type: text/plain; charset=%s\n"
cdd406e3 1103 "Content-Transfer-Encoding: 8bit\n";
f7e68b29
JH
1104 sz = snprintf(header, sizeof(header), header_fmt,
1105 encoding);
1106 if (sizeof(header) < sz)
1107 die("Encoding name %s too long", encoding);
1108 memcpy(buf + offset, header, sz);
1109 offset += sz;
cdd406e3 1110 }
698ce6f8
JS
1111 if (after_subject) {
1112 int slen = strlen(after_subject);
1113 if (slen > space - offset - 1)
1114 slen = space - offset - 1;
1115 memcpy(buf + offset, after_subject, slen);
1116 offset += slen;
1117 after_subject = NULL;
1118 }
3eefc189 1119 subject = NULL;
d87449c5 1120 }
40c2fe00
LT
1121 while (offset && isspace(buf[offset-1]))
1122 offset--;
1123 /* Make sure there is an EOLN for the non-oneline case */
1124 if (fmt != CMIT_FMT_ONELINE)
1125 buf[offset++] = '\n';
19b3bd3e
RS
1126 /*
1127 * make sure there is another EOLN to separate the headers from whatever
1128 * body the caller appends if we haven't already written a body
1129 */
1130 if (fmt == CMIT_FMT_EMAIL && !body)
1131 buf[offset++] = '\n';
e3bc7a3b 1132 buf[offset] = '\0';
52883fbd
JH
1133
1134 free(reencoded);
e3bc7a3b
LT
1135 return offset;
1136}
a3437b8c
JS
1137
1138struct commit *pop_commit(struct commit_list **stack)
1139{
1140 struct commit_list *top = *stack;
1141 struct commit *item = top ? top->item : NULL;
1142
1143 if (top) {
1144 *stack = top->next;
1145 free(top);
1146 }
1147 return item;
1148}
1149
6b6dcfc2
FK
1150void topo_sort_default_setter(struct commit *c, void *data)
1151{
d3ff6f55 1152 c->util = data;
6b6dcfc2
FK
1153}
1154
1155void *topo_sort_default_getter(struct commit *c)
1156{
d3ff6f55 1157 return c->util;
6b6dcfc2
FK
1158}
1159
ab580ace
JS
1160/*
1161 * Performs an in-place topological sort on the list supplied.
1162 */
4c8725f1 1163void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2
FK
1164{
1165 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1166 topo_sort_default_getter);
1167}
1168
1169void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1170 topo_sort_set_fn_t setter,
1171 topo_sort_get_fn_t getter)
ab580ace
JS
1172{
1173 struct commit_list * next = *list;
2ed02887 1174 struct commit_list * work = NULL, **insert;
ab580ace
JS
1175 struct commit_list ** pptr = list;
1176 struct sort_node * nodes;
1177 struct sort_node * next_nodes;
1178 int count = 0;
1179
1180 /* determine the size of the list */
1181 while (next) {
1182 next = next->next;
1183 count++;
1184 }
a6080a0a 1185
7d6fb370
EW
1186 if (!count)
1187 return;
ab580ace
JS
1188 /* allocate an array to help sort the list */
1189 nodes = xcalloc(count, sizeof(*nodes));
1190 /* link the list to the array */
1191 next_nodes = nodes;
1192 next=*list;
1193 while (next) {
1194 next_nodes->list_item = next;
6b6dcfc2 1195 setter(next->item, next_nodes);
ab580ace
JS
1196 next_nodes++;
1197 next = next->next;
1198 }
1199 /* update the indegree */
1200 next=*list;
1201 while (next) {
1202 struct commit_list * parents = next->item->parents;
1203 while (parents) {
1204 struct commit * parent=parents->item;
6b6dcfc2
FK
1205 struct sort_node * pn = (struct sort_node *) getter(parent);
1206
ab580ace
JS
1207 if (pn)
1208 pn->indegree++;
1209 parents=parents->next;
1210 }
1211 next=next->next;
1212 }
a6080a0a 1213 /*
ab580ace
JS
1214 * find the tips
1215 *
a6080a0a
JH
1216 * tips are nodes not reachable from any other node in the list
1217 *
ab580ace
JS
1218 * the tips serve as a starting set for the work queue.
1219 */
1220 next=*list;
2ed02887 1221 insert = &work;
ab580ace 1222 while (next) {
6b6dcfc2 1223 struct sort_node * node = (struct sort_node *) getter(next->item);
ab580ace
JS
1224
1225 if (node->indegree == 0) {
2ed02887 1226 insert = &commit_list_insert(next->item, insert)->next;
ab580ace
JS
1227 }
1228 next=next->next;
1229 }
4c8725f1 1230
ab580ace 1231 /* process the list in topological order */
4c8725f1
JH
1232 if (!lifo)
1233 sort_by_date(&work);
ab580ace
JS
1234 while (work) {
1235 struct commit * work_item = pop_commit(&work);
6b6dcfc2 1236 struct sort_node * work_node = (struct sort_node *) getter(work_item);
ab580ace
JS
1237 struct commit_list * parents = work_item->parents;
1238
1239 while (parents) {
1240 struct commit * parent=parents->item;
6b6dcfc2
FK
1241 struct sort_node * pn = (struct sort_node *) getter(parent);
1242
ab580ace 1243 if (pn) {
6b6dcfc2 1244 /*
a6080a0a 1245 * parents are only enqueued for emission
ab580ace
JS
1246 * when all their children have been emitted thereby
1247 * guaranteeing topological order.
1248 */
1249 pn->indegree--;
4c8725f1
JH
1250 if (!pn->indegree) {
1251 if (!lifo)
1252 insert_by_date(parent, &work);
1253 else
1254 commit_list_insert(parent, &work);
1255 }
ab580ace
JS
1256 }
1257 parents=parents->next;
1258 }
1259 /*
1260 * work_item is a commit all of whose children
1261 * have already been emitted. we can emit it now.
1262 */
1263 *pptr = work_node->list_item;
1264 pptr = &(*pptr)->next;
1265 *pptr = NULL;
6b6dcfc2 1266 setter(work_item, NULL);
ab580ace
JS
1267 }
1268 free(nodes);
1269}
7c6f8aaf 1270
1295228d 1271/* merge-base stuff */
7c6f8aaf 1272
577ed5c2
JH
1273/* bits #0..15 in revision.h */
1274#define PARENT1 (1u<<16)
1275#define PARENT2 (1u<<17)
1276#define STALE (1u<<18)
1277#define RESULT (1u<<19)
7c6f8aaf 1278
1295228d
JH
1279static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1280
7c6f8aaf
JS
1281static struct commit *interesting(struct commit_list *list)
1282{
1283 while (list) {
1284 struct commit *commit = list->item;
1285 list = list->next;
542ccefe 1286 if (commit->object.flags & STALE)
7c6f8aaf
JS
1287 continue;
1288 return commit;
1289 }
1290 return NULL;
1291}
1292
f3249438 1293static struct commit_list *merge_bases(struct commit *one, struct commit *two)
7c6f8aaf
JS
1294{
1295 struct commit_list *list = NULL;
1296 struct commit_list *result = NULL;
7c6f8aaf 1297
f3249438
JH
1298 if (one == two)
1299 /* We do not mark this even with RESULT so we do not
1300 * have to clean it up.
1301 */
1302 return commit_list_insert(one, &result);
7c6f8aaf 1303
f3249438
JH
1304 parse_commit(one);
1305 parse_commit(two);
7c6f8aaf 1306
f3249438
JH
1307 one->object.flags |= PARENT1;
1308 two->object.flags |= PARENT2;
1309 insert_by_date(one, &list);
1310 insert_by_date(two, &list);
7c6f8aaf
JS
1311
1312 while (interesting(list)) {
f3249438 1313 struct commit *commit;
7c6f8aaf 1314 struct commit_list *parents;
f3249438
JH
1315 struct commit_list *n;
1316 int flags;
7c6f8aaf 1317
f3249438
JH
1318 commit = list->item;
1319 n = list->next;
1320 free(list);
1321 list = n;
7c6f8aaf 1322
f3249438
JH
1323 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1324 if (flags == (PARENT1 | PARENT2)) {
1325 if (!(commit->object.flags & RESULT)) {
1326 commit->object.flags |= RESULT;
1327 insert_by_date(commit, &result);
1328 }
542ccefe
JH
1329 /* Mark parents of a found merge stale */
1330 flags |= STALE;
7c6f8aaf
JS
1331 }
1332 parents = commit->parents;
1333 while (parents) {
1334 struct commit *p = parents->item;
1335 parents = parents->next;
1336 if ((p->object.flags & flags) == flags)
1337 continue;
1338 parse_commit(p);
1339 p->object.flags |= flags;
1340 insert_by_date(p, &list);
1341 }
1342 }
1343
f3249438 1344 /* Clean up the result to remove stale ones */
1295228d 1345 free_commit_list(list);
f3249438
JH
1346 list = result; result = NULL;
1347 while (list) {
1348 struct commit_list *n = list->next;
1349 if (!(list->item->object.flags & STALE))
1350 insert_by_date(list->item, &result);
1351 free(list);
1352 list = n;
1353 }
1354 return result;
1355}
7c6f8aaf 1356
f3249438
JH
1357struct commit_list *get_merge_bases(struct commit *one,
1358 struct commit *two,
1359 int cleanup)
1360{
f3249438
JH
1361 struct commit_list *list;
1362 struct commit **rslt;
1363 struct commit_list *result;
1364 int cnt, i, j;
1365
1366 result = merge_bases(one, two);
1367 if (one == two)
1368 return result;
1369 if (!result || !result->next) {
1370 if (cleanup) {
1371 clear_commit_marks(one, all_flags);
1372 clear_commit_marks(two, all_flags);
7c6f8aaf 1373 }
f3249438 1374 return result;
7c6f8aaf
JS
1375 }
1376
f3249438
JH
1377 /* There are more than one */
1378 cnt = 0;
1379 list = result;
1380 while (list) {
1381 list = list->next;
1382 cnt++;
1383 }
1384 rslt = xcalloc(cnt, sizeof(*rslt));
1385 for (list = result, i = 0; list; list = list->next)
1386 rslt[i++] = list->item;
1387 free_commit_list(result);
1388
1389 clear_commit_marks(one, all_flags);
1390 clear_commit_marks(two, all_flags);
1391 for (i = 0; i < cnt - 1; i++) {
1392 for (j = i+1; j < cnt; j++) {
1393 if (!rslt[i] || !rslt[j])
1394 continue;
1395 result = merge_bases(rslt[i], rslt[j]);
1396 clear_commit_marks(rslt[i], all_flags);
1397 clear_commit_marks(rslt[j], all_flags);
1398 for (list = result; list; list = list->next) {
1399 if (rslt[i] == list->item)
1400 rslt[i] = NULL;
1401 if (rslt[j] == list->item)
1402 rslt[j] = NULL;
1403 }
1404 }
58ecf5c1 1405 }
7c6f8aaf 1406
f3249438
JH
1407 /* Surviving ones in rslt[] are the independent results */
1408 result = NULL;
1409 for (i = 0; i < cnt; i++) {
1410 if (rslt[i])
1411 insert_by_date(rslt[i], &result);
1412 }
1413 free(rslt);
7c6f8aaf
JS
1414 return result;
1415}
2ecd2bbc 1416
03840fc3 1417int in_merge_bases(struct commit *commit, struct commit **reference, int num)
2ecd2bbc
JH
1418{
1419 struct commit_list *bases, *b;
1420 int ret = 0;
1421
03840fc3
JH
1422 if (num == 1)
1423 bases = get_merge_bases(commit, *reference, 1);
1424 else
1425 die("not yet");
2ecd2bbc 1426 for (b = bases; b; b = b->next) {
03840fc3 1427 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
2ecd2bbc
JH
1428 ret = 1;
1429 break;
1430 }
1431 }
1432
1433 free_commit_list(bases);
1434 return ret;
1435}