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