Merge branch 'jc/format-patch-encoding'
[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
4175e9e3 30static struct cmt_fmt_map {
6cdfd179
EW
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{
60fcc2e6
JS
444 while (commit) {
445 struct commit_list *parents;
f8f9c73c 446
60fcc2e6
JS
447 if (!(mark & commit->object.flags))
448 return;
58ecf5c1 449
60fcc2e6
JS
450 commit->object.flags &= ~mark;
451
452 parents = commit->parents;
453 if (!parents)
454 return;
455
456 while ((parents = parents->next))
457 clear_commit_marks(parents->item, mark);
458
459 commit = commit->parents->item;
f8f9c73c
JH
460 }
461}
462
e3bc7a3b
LT
463/*
464 * Generic support for pretty-printing the header
465 */
674d1727 466static int get_one_line(const char *msg)
e3bc7a3b
LT
467{
468 int ret = 0;
469
674d1727 470 for (;;) {
e3bc7a3b 471 char c = *msg++;
684958ae
LT
472 if (!c)
473 break;
e3bc7a3b
LT
474 ret++;
475 if (c == '\n')
476 break;
e3bc7a3b
LT
477 }
478 return ret;
479}
480
f7e68b29 481/* High bit set, or ISO-2022-INT */
4593fb84 482int non_ascii(int ch)
f7e68b29
JH
483{
484 ch = (ch & 0xff);
485 return ((ch & 0x80) || (ch == 0x1b));
486}
487
cdd406e3
JH
488static int is_rfc2047_special(char ch)
489{
f7e68b29 490 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
cdd406e3
JH
491}
492
674d1727 493static void add_rfc2047(struct strbuf *sb, const char *line, int len,
f7e68b29 494 const char *encoding)
cdd406e3 495{
674d1727 496 int i, last;
cdd406e3 497
674d1727 498 for (i = 0; i < len; i++) {
f7e68b29
JH
499 int ch = line[i];
500 if (non_ascii(ch))
674d1727
PH
501 goto needquote;
502 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
503 goto needquote;
cdd406e3 504 }
674d1727
PH
505 strbuf_add(sb, line, len);
506 return;
507
508needquote:
8b6087fb 509 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
674d1727
PH
510 strbuf_addf(sb, "=?%s?q?", encoding);
511 for (i = last = 0; i < len; i++) {
0da46771 512 unsigned ch = line[i] & 0xFF;
996e2d6e
KH
513 /*
514 * We encode ' ' using '=20' even though rfc2047
515 * allows using '_' for readability. Unfortunately,
516 * many programs do not understand this and just
517 * leave the underscore in place.
518 */
519 if (is_rfc2047_special(ch) || ch == ' ') {
674d1727
PH
520 strbuf_add(sb, line + last, i - last);
521 strbuf_addf(sb, "=%02X", ch);
522 last = i + 1;
cdd406e3 523 }
cdd406e3 524 }
674d1727
PH
525 strbuf_add(sb, line + last, len - last);
526 strbuf_addstr(sb, "?=");
cdd406e3
JH
527}
528
674d1727 529static void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
a7b02ccf 530 const char *line, enum date_mode dmode,
f7e68b29 531 const char *encoding)
e3bc7a3b
LT
532{
533 char *date;
5de36bfe 534 int namelen;
e3bc7a3b 535 unsigned long time;
674d1727 536 int tz;
ff56fe1c 537 const char *filler = " ";
e3bc7a3b 538
d87449c5 539 if (fmt == CMIT_FMT_ONELINE)
674d1727 540 return;
e3bc7a3b
LT
541 date = strchr(line, '>');
542 if (!date)
674d1727 543 return;
e3bc7a3b
LT
544 namelen = ++date - line;
545 time = strtoul(date, &date, 10);
546 tz = strtol(date, NULL, 10);
547
3eefc189 548 if (fmt == CMIT_FMT_EMAIL) {
cdd406e3
JH
549 char *name_tail = strchr(line, '<');
550 int display_name_length;
551 if (!name_tail)
674d1727 552 return;
cdd406e3
JH
553 while (line < name_tail && isspace(name_tail[-1]))
554 name_tail--;
555 display_name_length = name_tail - line;
3eefc189 556 filler = "";
674d1727
PH
557 strbuf_addstr(sb, "From: ");
558 add_rfc2047(sb, line, display_name_length, encoding);
559 strbuf_add(sb, name_tail, namelen - display_name_length);
560 strbuf_addch(sb, '\n');
8b6087fb 561 } else {
674d1727 562 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
cdd406e3
JH
563 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
564 filler, namelen, line);
3eefc189 565 }
ff56fe1c
JH
566 switch (fmt) {
567 case CMIT_FMT_MEDIUM:
674d1727 568 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, dmode));
ff56fe1c 569 break;
3eefc189 570 case CMIT_FMT_EMAIL:
674d1727 571 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
3eefc189 572 break;
ff56fe1c 573 case CMIT_FMT_FULLER:
674d1727 574 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
ff56fe1c
JH
575 break;
576 default:
577 /* notin' */
578 break;
579 }
000182ea
LT
580}
581
3eefc189 582static int is_empty_line(const char *line, int *len_p)
000182ea 583{
3eefc189 584 int len = *len_p;
000182ea
LT
585 while (len && isspace(line[len-1]))
586 len--;
3eefc189 587 *len_p = len;
000182ea 588 return !len;
e3bc7a3b
LT
589}
590
674d1727
PH
591static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
592 const struct commit *commit, int abbrev)
28342a5d 593{
f2d42275 594 struct commit_list *parent = commit->parents;
d87449c5 595
3eefc189
JH
596 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
597 !parent || !parent->next)
674d1727 598 return;
f2d42275 599
674d1727 600 strbuf_addstr(sb, "Merge:");
f2d42275
JH
601
602 while (parent) {
603 struct commit *p = parent->item;
14763e7b
EW
604 const char *hex = NULL;
605 const char *dots;
606 if (abbrev)
607 hex = find_unique_abbrev(p->object.sha1, abbrev);
608 if (!hex)
609 hex = sha1_to_hex(p->object.sha1);
610 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
f2d42275
JH
611 parent = parent->next;
612
674d1727 613 strbuf_addf(sb, " %s%s", hex, dots);
28342a5d 614 }
674d1727 615 strbuf_addch(sb, '\n');
28342a5d
LT
616}
617
52883fbd
JH
618static char *get_header(const struct commit *commit, const char *key)
619{
620 int key_len = strlen(key);
621 const char *line = commit->buffer;
622
623 for (;;) {
624 const char *eol = strchr(line, '\n'), *next;
625
626 if (line == eol)
627 return NULL;
628 if (!eol) {
629 eol = line + strlen(line);
630 next = NULL;
631 } else
632 next = eol + 1;
e102d435
AR
633 if (eol - line > key_len &&
634 !strncmp(line, key, key_len) &&
635 line[key_len] == ' ') {
182af834 636 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
52883fbd
JH
637 }
638 line = next;
639 }
640}
641
3a55602e 642static char *replace_encoding_header(char *buf, const char *encoding)
53af9816 643{
a08f23ab
PH
644 struct strbuf tmp;
645 size_t start, len;
646 char *cp = buf;
647
648 /* guess if there is an encoding header before a \n\n */
649 while (strncmp(cp, "encoding ", strlen("encoding "))) {
650 cp = strchr(cp, '\n');
651 if (!cp || *++cp == '\n')
652 return buf;
653 }
654 start = cp - buf;
655 cp = strchr(cp, '\n');
656 if (!cp)
53af9816 657 return buf; /* should not happen but be defensive */
a08f23ab 658 len = cp + 1 - (buf + start);
53af9816 659
a08f23ab
PH
660 strbuf_init(&tmp, 0);
661 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
53af9816
JH
662 if (is_encoding_utf8(encoding)) {
663 /* we have re-coded to UTF-8; drop the header */
c76689df 664 strbuf_remove(&tmp, start, len);
a08f23ab
PH
665 } else {
666 /* just replaces XXXX in 'encoding XXXX\n' */
667 strbuf_splice(&tmp, start + strlen("encoding "),
668 len - strlen("encoding \n"),
669 encoding, strlen(encoding));
53af9816 670 }
b315c5c0 671 return strbuf_detach(&tmp, NULL);
53af9816
JH
672}
673
f7e68b29 674static char *logmsg_reencode(const struct commit *commit,
3a55602e 675 const char *output_encoding)
52883fbd 676{
3a55602e
SP
677 static const char *utf8 = "utf-8";
678 const char *use_encoding;
d2c11a38 679 char *encoding;
52883fbd
JH
680 char *out;
681
f7e68b29 682 if (!*output_encoding)
52883fbd 683 return NULL;
d2c11a38 684 encoding = get_header(commit, "encoding");
3a55602e
SP
685 use_encoding = encoding ? encoding : utf8;
686 if (!strcmp(use_encoding, output_encoding))
c4640fe8
MC
687 if (encoding) /* we'll strip encoding header later */
688 out = xstrdup(commit->buffer);
689 else
690 return NULL; /* nothing to do */
e90068a9
JH
691 else
692 out = reencode_string(commit->buffer,
3a55602e 693 output_encoding, use_encoding);
53af9816
JH
694 if (out)
695 out = replace_encoding_header(out, output_encoding);
696
3a55602e 697 free(encoding);
52883fbd
JH
698 return out;
699}
700
e52a5de4
JS
701static void fill_person(struct interp *table, const char *msg, int len)
702{
703 int start, end, tz = 0;
704 unsigned long date;
705 char *ep;
706
707 /* parse name */
708 for (end = 0; end < len && msg[end] != '<'; end++)
709 ; /* do nothing */
710 start = end + 1;
711 while (end > 0 && isspace(msg[end - 1]))
712 end--;
182af834 713 table[0].value = xmemdupz(msg, end);
e52a5de4
JS
714
715 if (start >= len)
716 return;
717
718 /* parse email */
719 for (end = start + 1; end < len && msg[end] != '>'; end++)
720 ; /* do nothing */
721
722 if (end >= len)
723 return;
724
182af834 725 table[1].value = xmemdupz(msg + start, end - start);
e52a5de4
JS
726
727 /* parse date */
728 for (start = end + 1; start < len && isspace(msg[start]); start++)
729 ; /* do nothing */
730 if (start >= len)
731 return;
732 date = strtoul(msg + start, &ep, 10);
733 if (msg + start == ep)
734 return;
735
182af834 736 table[5].value = xmemdupz(msg + start, ep - (msg + start));
e52a5de4
JS
737
738 /* parse tz */
739 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
740 ; /* do nothing */
741 if (start + 1 < len) {
742 tz = strtoul(msg + start + 1, NULL, 10);
743 if (msg[start] == '-')
744 tz = -tz;
745 }
746
73013afd
JH
747 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
748 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
749 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
ee8f838e 750 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
e52a5de4
JS
751}
752
674d1727
PH
753void format_commit_message(const struct commit *commit,
754 const void *format, struct strbuf *sb)
e52a5de4
JS
755{
756 struct interp table[] = {
757 { "%H" }, /* commit hash */
758 { "%h" }, /* abbreviated commit hash */
759 { "%T" }, /* tree hash */
760 { "%t" }, /* abbreviated tree hash */
761 { "%P" }, /* parent hashes */
762 { "%p" }, /* abbreviated parent hashes */
763 { "%an" }, /* author name */
764 { "%ae" }, /* author email */
765 { "%ad" }, /* author date */
766 { "%aD" }, /* author date, RFC2822 style */
767 { "%ar" }, /* author date, relative */
768 { "%at" }, /* author date, UNIX timestamp */
ee8f838e 769 { "%ai" }, /* author date, ISO 8601 */
e52a5de4
JS
770 { "%cn" }, /* committer name */
771 { "%ce" }, /* committer email */
772 { "%cd" }, /* committer date */
773 { "%cD" }, /* committer date, RFC2822 style */
774 { "%cr" }, /* committer date, relative */
775 { "%ct" }, /* committer date, UNIX timestamp */
ee8f838e 776 { "%ci" }, /* committer date, ISO 8601 */
e52a5de4
JS
777 { "%e" }, /* encoding */
778 { "%s" }, /* subject */
779 { "%b" }, /* body */
780 { "%Cred" }, /* red */
781 { "%Cgreen" }, /* green */
782 { "%Cblue" }, /* blue */
783 { "%Creset" }, /* reset color */
199c45bf
JH
784 { "%n" }, /* newline */
785 { "%m" }, /* left/right/bottom */
e52a5de4
JS
786 };
787 enum interp_index {
788 IHASH = 0, IHASH_ABBREV,
789 ITREE, ITREE_ABBREV,
790 IPARENTS, IPARENTS_ABBREV,
791 IAUTHOR_NAME, IAUTHOR_EMAIL,
792 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
ee8f838e 793 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
e52a5de4
JS
794 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
795 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
796 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
ee8f838e 797 ICOMMITTER_ISO8601,
e52a5de4
JS
798 IENCODING,
799 ISUBJECT,
800 IBODY,
801 IRED, IGREEN, IBLUE, IRESET_COLOR,
199c45bf
JH
802 INEWLINE,
803 ILEFT_RIGHT,
e52a5de4
JS
804 };
805 struct commit_list *p;
806 char parents[1024];
674d1727 807 unsigned long len;
e52a5de4
JS
808 int i;
809 enum { HEADER, SUBJECT, BODY } state;
7b95089c 810 const char *msg = commit->buffer;
e52a5de4 811
199c45bf 812 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
e52a5de4
JS
813 die("invalid interp table!");
814
815 /* these are independent of the commit */
816 interp_set_entry(table, IRED, "\033[31m");
817 interp_set_entry(table, IGREEN, "\033[32m");
818 interp_set_entry(table, IBLUE, "\033[34m");
819 interp_set_entry(table, IRESET_COLOR, "\033[m");
820 interp_set_entry(table, INEWLINE, "\n");
821
822 /* these depend on the commit */
823 if (!commit->object.parsed)
824 parse_object(commit->object.sha1);
825 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
826 interp_set_entry(table, IHASH_ABBREV,
827 find_unique_abbrev(commit->object.sha1,
828 DEFAULT_ABBREV));
829 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
830 interp_set_entry(table, ITREE_ABBREV,
831 find_unique_abbrev(commit->tree->object.sha1,
832 DEFAULT_ABBREV));
199c45bf
JH
833 interp_set_entry(table, ILEFT_RIGHT,
834 (commit->object.flags & BOUNDARY)
835 ? "-"
836 : (commit->object.flags & SYMMETRIC_LEFT)
837 ? "<"
838 : ">");
542e165c
JH
839
840 parents[1] = 0;
e52a5de4
JS
841 for (i = 0, p = commit->parents;
842 p && i < sizeof(parents) - 1;
843 p = p->next)
542e165c 844 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
e52a5de4 845 sha1_to_hex(p->item->object.sha1));
542e165c
JH
846 interp_set_entry(table, IPARENTS, parents + 1);
847
848 parents[1] = 0;
e52a5de4
JS
849 for (i = 0, p = commit->parents;
850 p && i < sizeof(parents) - 1;
851 p = p->next)
542e165c 852 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
e52a5de4
JS
853 find_unique_abbrev(p->item->object.sha1,
854 DEFAULT_ABBREV));
542e165c 855 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
e52a5de4
JS
856
857 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
858 int eol;
859 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
860 ; /* do nothing */
861
862 if (state == SUBJECT) {
182af834 863 table[ISUBJECT].value = xmemdupz(msg + i, eol - i);
e52a5de4
JS
864 i = eol;
865 }
866 if (i == eol) {
867 state++;
868 /* strip empty lines */
869 while (msg[eol + 1] == '\n')
870 eol++;
871 } else if (!prefixcmp(msg + i, "author "))
872 fill_person(table + IAUTHOR_NAME,
873 msg + i + 7, eol - i - 7);
874 else if (!prefixcmp(msg + i, "committer "))
875 fill_person(table + ICOMMITTER_NAME,
876 msg + i + 10, eol - i - 10);
877 else if (!prefixcmp(msg + i, "encoding "))
6a5ea2d0 878 table[IENCODING].value =
182af834 879 xmemdupz(msg + i + 9, eol - i - 9);
e52a5de4
JS
880 i = eol;
881 }
882 if (msg[i])
883 table[IBODY].value = xstrdup(msg + i);
e52a5de4 884
674d1727
PH
885 len = interpolate(sb->buf + sb->len, strbuf_avail(sb),
886 format, table, ARRAY_SIZE(table));
887 if (len > strbuf_avail(sb)) {
888 strbuf_grow(sb, len);
889 interpolate(sb->buf + sb->len, strbuf_avail(sb) + 1,
890 format, table, ARRAY_SIZE(table));
891 }
892 strbuf_setlen(sb, sb->len + len);
e52a5de4 893 interp_clear_table(table, ARRAY_SIZE(table));
e52a5de4
JS
894}
895
4234a761
JH
896static void pp_header(enum cmit_fmt fmt,
897 int abbrev,
898 enum date_mode dmode,
899 const char *encoding,
900 const struct commit *commit,
901 const char **msg_p,
674d1727 902 struct strbuf *sb)
4234a761
JH
903{
904 int parents_shown = 0;
905
906 for (;;) {
907 const char *line = *msg_p;
674d1727 908 int linelen = get_one_line(*msg_p);
4234a761
JH
909
910 if (!linelen)
911 return;
912 *msg_p += linelen;
4234a761
JH
913
914 if (linelen == 1)
915 /* End of header */
916 return;
917
4234a761 918 if (fmt == CMIT_FMT_RAW) {
674d1727 919 strbuf_add(sb, line, linelen);
4234a761
JH
920 continue;
921 }
922
923 if (!memcmp(line, "parent ", 7)) {
924 if (linelen != 48)
925 die("bad parent line in commit");
926 continue;
927 }
928
929 if (!parents_shown) {
930 struct commit_list *parent;
931 int num;
932 for (parent = commit->parents, num = 0;
933 parent;
934 parent = parent->next, num++)
935 ;
936 /* with enough slop */
674d1727
PH
937 strbuf_grow(sb, num * 50 + 20);
938 add_merge_info(fmt, sb, commit, abbrev);
4234a761
JH
939 parents_shown = 1;
940 }
941
942 /*
943 * MEDIUM == DEFAULT shows only author with dates.
944 * FULL shows both authors but not dates.
945 * FULLER shows both authors and dates.
946 */
947 if (!memcmp(line, "author ", 7)) {
8b6087fb 948 strbuf_grow(sb, linelen + 80);
674d1727 949 add_user_info("Author", fmt, sb, line + 7, dmode, encoding);
4234a761 950 }
4234a761
JH
951 if (!memcmp(line, "committer ", 10) &&
952 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
8b6087fb 953 strbuf_grow(sb, linelen + 80);
674d1727 954 add_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
4234a761
JH
955 }
956 }
957}
958
959static void pp_title_line(enum cmit_fmt fmt,
960 const char **msg_p,
674d1727 961 struct strbuf *sb,
4234a761
JH
962 const char *subject,
963 const char *after_subject,
964 const char *encoding,
965 int plain_non_ascii)
966{
674d1727 967 struct strbuf title;
4234a761 968
674d1727
PH
969 strbuf_init(&title, 80);
970
4234a761
JH
971 for (;;) {
972 const char *line = *msg_p;
674d1727 973 int linelen = get_one_line(line);
4234a761 974
674d1727 975 *msg_p += linelen;
4234a761
JH
976 if (!linelen || is_empty_line(line, &linelen))
977 break;
978
674d1727
PH
979 strbuf_grow(&title, linelen + 2);
980 if (title.len) {
4234a761 981 if (fmt == CMIT_FMT_EMAIL) {
674d1727 982 strbuf_addch(&title, '\n');
4234a761 983 }
674d1727 984 strbuf_addch(&title, ' ');
4234a761 985 }
674d1727 986 strbuf_add(&title, line, linelen);
4234a761
JH
987 }
988
8b6087fb 989 strbuf_grow(sb, title.len + 1024);
4234a761 990 if (subject) {
674d1727
PH
991 strbuf_addstr(sb, subject);
992 add_rfc2047(sb, title.buf, title.len, encoding);
4234a761 993 } else {
674d1727 994 strbuf_addbuf(sb, &title);
4234a761 995 }
674d1727
PH
996 strbuf_addch(sb, '\n');
997
4234a761
JH
998 if (plain_non_ascii) {
999 const char *header_fmt =
1000 "MIME-Version: 1.0\n"
1001 "Content-Type: text/plain; charset=%s\n"
1002 "Content-Transfer-Encoding: 8bit\n";
674d1727 1003 strbuf_addf(sb, header_fmt, encoding);
4234a761
JH
1004 }
1005 if (after_subject) {
674d1727 1006 strbuf_addstr(sb, after_subject);
4234a761 1007 }
4234a761 1008 if (fmt == CMIT_FMT_EMAIL) {
674d1727 1009 strbuf_addch(sb, '\n');
4234a761 1010 }
674d1727 1011 strbuf_release(&title);
4234a761
JH
1012}
1013
1014static void pp_remainder(enum cmit_fmt fmt,
1015 const char **msg_p,
674d1727 1016 struct strbuf *sb,
4234a761
JH
1017 int indent)
1018{
1019 int first = 1;
1020 for (;;) {
1021 const char *line = *msg_p;
674d1727 1022 int linelen = get_one_line(line);
4234a761 1023 *msg_p += linelen;
4234a761
JH
1024
1025 if (!linelen)
1026 break;
1027
1028 if (is_empty_line(line, &linelen)) {
1029 if (first)
1030 continue;
1031 if (fmt == CMIT_FMT_SHORT)
1032 break;
1033 }
1034 first = 0;
1035
674d1727 1036 strbuf_grow(sb, linelen + indent + 20);
4234a761 1037 if (indent) {
674d1727
PH
1038 memset(sb->buf + sb->len, ' ', indent);
1039 strbuf_setlen(sb, sb->len + indent);
4234a761 1040 }
674d1727
PH
1041 strbuf_add(sb, line, linelen);
1042 strbuf_addch(sb, '\n');
4234a761 1043 }
e52a5de4
JS
1044}
1045
674d1727
PH
1046void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
1047 struct strbuf *sb, int abbrev,
1048 const char *subject, const char *after_subject,
4593fb84 1049 enum date_mode dmode, int plain_non_ascii)
e3bc7a3b 1050{
4234a761 1051 unsigned long beginning_of_body;
3eefc189 1052 int indent = 4;
3815f423 1053 const char *msg = commit->buffer;
f7e68b29 1054 char *reencoded;
3a55602e 1055 const char *encoding;
52883fbd 1056
674d1727
PH
1057 if (fmt == CMIT_FMT_USERFORMAT) {
1058 format_commit_message(commit, user_format, sb);
1059 return;
1060 }
e52a5de4 1061
f7e68b29
JH
1062 encoding = (git_log_output_encoding
1063 ? git_log_output_encoding
1064 : git_commit_encoding);
1065 if (!encoding)
1066 encoding = "utf-8";
1067 reencoded = logmsg_reencode(commit, encoding);
4234a761 1068 if (reencoded) {
d2c11a38 1069 msg = reencoded;
4234a761 1070 }
3eefc189 1071
3eefc189
JH
1072 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1073 indent = 0;
e3bc7a3b 1074
c831da66
JH
1075 /* After-subject is used to pass in Content-Type: multipart
1076 * MIME header; in that case we do not have to do the
1077 * plaintext content type even if the commit message has
1078 * non 7-bit ASCII character. Otherwise, check if we need
1079 * to say this is not a 7-bit ASCII.
1080 */
1081 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
0da46771
JH
1082 int i, ch, in_body;
1083
674d1727 1084 for (in_body = i = 0; (ch = msg[i]); i++) {
0da46771
JH
1085 if (!in_body) {
1086 /* author could be non 7-bit ASCII but
d2c11a38 1087 * the log may be so; skip over the
0da46771
JH
1088 * header part first.
1089 */
674d1727 1090 if (ch == '\n' && msg[i+1] == '\n')
0da46771
JH
1091 in_body = 1;
1092 }
f7e68b29 1093 else if (non_ascii(ch)) {
c831da66 1094 plain_non_ascii = 1;
0da46771
JH
1095 break;
1096 }
1097 }
c831da66
JH
1098 }
1099
674d1727 1100 pp_header(fmt, abbrev, dmode, encoding, commit, &msg, sb);
4234a761 1101 if (fmt != CMIT_FMT_ONELINE && !subject) {
674d1727 1102 strbuf_addch(sb, '\n');
80583c0e
JH
1103 }
1104
4234a761 1105 /* Skip excess blank lines at the beginning of body, if any... */
e3bc7a3b 1106 for (;;) {
674d1727 1107 int linelen = get_one_line(msg);
4234a761 1108 int ll = linelen;
e3bc7a3b
LT
1109 if (!linelen)
1110 break;
4234a761 1111 if (!is_empty_line(msg, &ll))
e3bc7a3b 1112 break;
e3bc7a3b 1113 msg += linelen;
4234a761 1114 }
000182ea 1115
4234a761 1116 /* These formats treat the title line specially. */
674d1727
PH
1117 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1118 pp_title_line(fmt, &msg, sb, subject,
1119 after_subject, encoding, plain_non_ascii);
4234a761 1120
674d1727
PH
1121 beginning_of_body = sb->len;
1122 if (fmt != CMIT_FMT_ONELINE)
1123 pp_remainder(fmt, &msg, sb, indent);
1124 strbuf_rtrim(sb);
4234a761 1125
40c2fe00
LT
1126 /* Make sure there is an EOLN for the non-oneline case */
1127 if (fmt != CMIT_FMT_ONELINE)
674d1727 1128 strbuf_addch(sb, '\n');
4234a761 1129
19b3bd3e 1130 /*
4234a761
JH
1131 * The caller may append additional body text in e-mail
1132 * format. Make sure we did not strip the blank line
1133 * between the header and the body.
19b3bd3e 1134 */
674d1727
PH
1135 if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1136 strbuf_addch(sb, '\n');
52883fbd 1137 free(reencoded);
e3bc7a3b 1138}
a3437b8c
JS
1139
1140struct commit *pop_commit(struct commit_list **stack)
1141{
1142 struct commit_list *top = *stack;
1143 struct commit *item = top ? top->item : NULL;
1144
1145 if (top) {
1146 *stack = top->next;
1147 free(top);
1148 }
1149 return item;
1150}
1151
6b6dcfc2
FK
1152void topo_sort_default_setter(struct commit *c, void *data)
1153{
d3ff6f55 1154 c->util = data;
6b6dcfc2
FK
1155}
1156
1157void *topo_sort_default_getter(struct commit *c)
1158{
d3ff6f55 1159 return c->util;
6b6dcfc2
FK
1160}
1161
ab580ace
JS
1162/*
1163 * Performs an in-place topological sort on the list supplied.
1164 */
4c8725f1 1165void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2
FK
1166{
1167 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1168 topo_sort_default_getter);
1169}
1170
1171void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1172 topo_sort_set_fn_t setter,
1173 topo_sort_get_fn_t getter)
ab580ace
JS
1174{
1175 struct commit_list * next = *list;
2ed02887 1176 struct commit_list * work = NULL, **insert;
ab580ace
JS
1177 struct commit_list ** pptr = list;
1178 struct sort_node * nodes;
1179 struct sort_node * next_nodes;
1180 int count = 0;
1181
1182 /* determine the size of the list */
1183 while (next) {
1184 next = next->next;
1185 count++;
1186 }
a6080a0a 1187
7d6fb370
EW
1188 if (!count)
1189 return;
ab580ace
JS
1190 /* allocate an array to help sort the list */
1191 nodes = xcalloc(count, sizeof(*nodes));
1192 /* link the list to the array */
1193 next_nodes = nodes;
1194 next=*list;
1195 while (next) {
1196 next_nodes->list_item = next;
6b6dcfc2 1197 setter(next->item, next_nodes);
ab580ace
JS
1198 next_nodes++;
1199 next = next->next;
1200 }
1201 /* update the indegree */
1202 next=*list;
1203 while (next) {
1204 struct commit_list * parents = next->item->parents;
1205 while (parents) {
1206 struct commit * parent=parents->item;
6b6dcfc2
FK
1207 struct sort_node * pn = (struct sort_node *) getter(parent);
1208
ab580ace
JS
1209 if (pn)
1210 pn->indegree++;
1211 parents=parents->next;
1212 }
1213 next=next->next;
1214 }
a6080a0a 1215 /*
674d1727
PH
1216 * find the tips
1217 *
1218 * tips are nodes not reachable from any other node in the list
1219 *
1220 * the tips serve as a starting set for the work queue.
1221 */
ab580ace 1222 next=*list;
2ed02887 1223 insert = &work;
ab580ace 1224 while (next) {
6b6dcfc2 1225 struct sort_node * node = (struct sort_node *) getter(next->item);
ab580ace
JS
1226
1227 if (node->indegree == 0) {
2ed02887 1228 insert = &commit_list_insert(next->item, insert)->next;
ab580ace
JS
1229 }
1230 next=next->next;
1231 }
4c8725f1 1232
ab580ace 1233 /* process the list in topological order */
4c8725f1
JH
1234 if (!lifo)
1235 sort_by_date(&work);
ab580ace
JS
1236 while (work) {
1237 struct commit * work_item = pop_commit(&work);
6b6dcfc2 1238 struct sort_node * work_node = (struct sort_node *) getter(work_item);
ab580ace
JS
1239 struct commit_list * parents = work_item->parents;
1240
1241 while (parents) {
1242 struct commit * parent=parents->item;
6b6dcfc2
FK
1243 struct sort_node * pn = (struct sort_node *) getter(parent);
1244
ab580ace 1245 if (pn) {
6b6dcfc2 1246 /*
a6080a0a 1247 * parents are only enqueued for emission
674d1727
PH
1248 * when all their children have been emitted thereby
1249 * guaranteeing topological order.
1250 */
ab580ace 1251 pn->indegree--;
4c8725f1
JH
1252 if (!pn->indegree) {
1253 if (!lifo)
1254 insert_by_date(parent, &work);
1255 else
1256 commit_list_insert(parent, &work);
1257 }
ab580ace
JS
1258 }
1259 parents=parents->next;
1260 }
1261 /*
674d1727
PH
1262 * work_item is a commit all of whose children
1263 * have already been emitted. we can emit it now.
1264 */
ab580ace
JS
1265 *pptr = work_node->list_item;
1266 pptr = &(*pptr)->next;
1267 *pptr = NULL;
6b6dcfc2 1268 setter(work_item, NULL);
ab580ace
JS
1269 }
1270 free(nodes);
1271}
7c6f8aaf 1272
1295228d 1273/* merge-base stuff */
7c6f8aaf 1274
577ed5c2
JH
1275/* bits #0..15 in revision.h */
1276#define PARENT1 (1u<<16)
1277#define PARENT2 (1u<<17)
1278#define STALE (1u<<18)
1279#define RESULT (1u<<19)
7c6f8aaf 1280
1295228d
JH
1281static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1282
7c6f8aaf
JS
1283static struct commit *interesting(struct commit_list *list)
1284{
1285 while (list) {
1286 struct commit *commit = list->item;
1287 list = list->next;
542ccefe 1288 if (commit->object.flags & STALE)
7c6f8aaf
JS
1289 continue;
1290 return commit;
1291 }
1292 return NULL;
1293}
1294
f3249438 1295static struct commit_list *merge_bases(struct commit *one, struct commit *two)
7c6f8aaf
JS
1296{
1297 struct commit_list *list = NULL;
1298 struct commit_list *result = NULL;
7c6f8aaf 1299
f3249438
JH
1300 if (one == two)
1301 /* We do not mark this even with RESULT so we do not
1302 * have to clean it up.
1303 */
1304 return commit_list_insert(one, &result);
7c6f8aaf 1305
f3249438
JH
1306 parse_commit(one);
1307 parse_commit(two);
7c6f8aaf 1308
f3249438
JH
1309 one->object.flags |= PARENT1;
1310 two->object.flags |= PARENT2;
1311 insert_by_date(one, &list);
1312 insert_by_date(two, &list);
7c6f8aaf
JS
1313
1314 while (interesting(list)) {
f3249438 1315 struct commit *commit;
7c6f8aaf 1316 struct commit_list *parents;
f3249438
JH
1317 struct commit_list *n;
1318 int flags;
7c6f8aaf 1319
f3249438
JH
1320 commit = list->item;
1321 n = list->next;
1322 free(list);
1323 list = n;
7c6f8aaf 1324
f3249438
JH
1325 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1326 if (flags == (PARENT1 | PARENT2)) {
1327 if (!(commit->object.flags & RESULT)) {
1328 commit->object.flags |= RESULT;
1329 insert_by_date(commit, &result);
1330 }
542ccefe
JH
1331 /* Mark parents of a found merge stale */
1332 flags |= STALE;
7c6f8aaf
JS
1333 }
1334 parents = commit->parents;
1335 while (parents) {
1336 struct commit *p = parents->item;
1337 parents = parents->next;
1338 if ((p->object.flags & flags) == flags)
1339 continue;
1340 parse_commit(p);
1341 p->object.flags |= flags;
1342 insert_by_date(p, &list);
1343 }
1344 }
1345
f3249438 1346 /* Clean up the result to remove stale ones */
1295228d 1347 free_commit_list(list);
f3249438
JH
1348 list = result; result = NULL;
1349 while (list) {
1350 struct commit_list *n = list->next;
1351 if (!(list->item->object.flags & STALE))
1352 insert_by_date(list->item, &result);
1353 free(list);
1354 list = n;
1355 }
1356 return result;
1357}
7c6f8aaf 1358
f3249438 1359struct commit_list *get_merge_bases(struct commit *one,
674d1727 1360 struct commit *two, int cleanup)
f3249438 1361{
f3249438
JH
1362 struct commit_list *list;
1363 struct commit **rslt;
1364 struct commit_list *result;
1365 int cnt, i, j;
1366
1367 result = merge_bases(one, two);
1368 if (one == two)
1369 return result;
1370 if (!result || !result->next) {
1371 if (cleanup) {
1372 clear_commit_marks(one, all_flags);
1373 clear_commit_marks(two, all_flags);
7c6f8aaf 1374 }
f3249438 1375 return result;
7c6f8aaf
JS
1376 }
1377
f3249438
JH
1378 /* There are more than one */
1379 cnt = 0;
1380 list = result;
1381 while (list) {
1382 list = list->next;
1383 cnt++;
1384 }
1385 rslt = xcalloc(cnt, sizeof(*rslt));
1386 for (list = result, i = 0; list; list = list->next)
1387 rslt[i++] = list->item;
1388 free_commit_list(result);
1389
1390 clear_commit_marks(one, all_flags);
1391 clear_commit_marks(two, all_flags);
1392 for (i = 0; i < cnt - 1; i++) {
1393 for (j = i+1; j < cnt; j++) {
1394 if (!rslt[i] || !rslt[j])
1395 continue;
1396 result = merge_bases(rslt[i], rslt[j]);
1397 clear_commit_marks(rslt[i], all_flags);
1398 clear_commit_marks(rslt[j], all_flags);
1399 for (list = result; list; list = list->next) {
1400 if (rslt[i] == list->item)
1401 rslt[i] = NULL;
1402 if (rslt[j] == list->item)
1403 rslt[j] = NULL;
1404 }
1405 }
58ecf5c1 1406 }
7c6f8aaf 1407
f3249438
JH
1408 /* Surviving ones in rslt[] are the independent results */
1409 result = NULL;
1410 for (i = 0; i < cnt; i++) {
1411 if (rslt[i])
1412 insert_by_date(rslt[i], &result);
1413 }
1414 free(rslt);
7c6f8aaf
JS
1415 return result;
1416}
2ecd2bbc 1417
03840fc3 1418int in_merge_bases(struct commit *commit, struct commit **reference, int num)
2ecd2bbc
JH
1419{
1420 struct commit_list *bases, *b;
1421 int ret = 0;
1422
03840fc3
JH
1423 if (num == 1)
1424 bases = get_merge_bases(commit, *reference, 1);
1425 else
1426 die("not yet");
2ecd2bbc 1427 for (b = bases; b; b = b->next) {
03840fc3 1428 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
2ecd2bbc
JH
1429 ret = 1;
1430 break;
1431 }
1432 }
1433
1434 free_commit_list(bases);
1435 return ret;
1436}