Introduce get_octopus_merge_bases() in commit.c
[git/git.git] / commit.c
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "pkt-line.h"
5 #include "utf8.h"
6 #include "diff.h"
7 #include "revision.h"
8
9 int save_commit_buffer = 1;
10
11 const char *commit_type = "commit";
12
13 static struct commit *check_commit(struct object *obj,
14 const unsigned char *sha1,
15 int quiet)
16 {
17 if (obj->type != OBJ_COMMIT) {
18 if (!quiet)
19 error("Object %s is a %s, not a commit",
20 sha1_to_hex(sha1), typename(obj->type));
21 return NULL;
22 }
23 return (struct commit *) obj;
24 }
25
26 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
27 int quiet)
28 {
29 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
30
31 if (!obj)
32 return NULL;
33 return check_commit(obj, sha1, quiet);
34 }
35
36 struct commit *lookup_commit_reference(const unsigned char *sha1)
37 {
38 return lookup_commit_reference_gently(sha1, 0);
39 }
40
41 struct commit *lookup_commit(const unsigned char *sha1)
42 {
43 struct object *obj = lookup_object(sha1);
44 if (!obj)
45 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
46 if (!obj->type)
47 obj->type = OBJ_COMMIT;
48 return check_commit(obj, sha1, 0);
49 }
50
51 static unsigned long parse_commit_date(const char *buf, const char *tail)
52 {
53 unsigned long date;
54 const char *dateptr;
55
56 if (buf + 6 >= tail)
57 return 0;
58 if (memcmp(buf, "author", 6))
59 return 0;
60 while (buf < tail && *buf++ != '\n')
61 /* nada */;
62 if (buf + 9 >= tail)
63 return 0;
64 if (memcmp(buf, "committer", 9))
65 return 0;
66 while (buf < tail && *buf++ != '>')
67 /* nada */;
68 if (buf >= tail)
69 return 0;
70 dateptr = buf;
71 while (buf < tail && *buf++ != '\n')
72 /* nada */;
73 if (buf >= tail)
74 return 0;
75 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
76 date = strtoul(dateptr, NULL, 10);
77 if (date == ULONG_MAX)
78 date = 0;
79 return date;
80 }
81
82 static struct commit_graft **commit_graft;
83 static int commit_graft_alloc, commit_graft_nr;
84
85 static int commit_graft_pos(const unsigned char *sha1)
86 {
87 int lo, hi;
88 lo = 0;
89 hi = commit_graft_nr;
90 while (lo < hi) {
91 int mi = (lo + hi) / 2;
92 struct commit_graft *graft = commit_graft[mi];
93 int cmp = hashcmp(sha1, graft->sha1);
94 if (!cmp)
95 return mi;
96 if (cmp < 0)
97 hi = mi;
98 else
99 lo = mi + 1;
100 }
101 return -lo - 1;
102 }
103
104 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
105 {
106 int pos = commit_graft_pos(graft->sha1);
107
108 if (0 <= pos) {
109 if (ignore_dups)
110 free(graft);
111 else {
112 free(commit_graft[pos]);
113 commit_graft[pos] = graft;
114 }
115 return 1;
116 }
117 pos = -pos - 1;
118 if (commit_graft_alloc <= ++commit_graft_nr) {
119 commit_graft_alloc = alloc_nr(commit_graft_alloc);
120 commit_graft = xrealloc(commit_graft,
121 sizeof(*commit_graft) *
122 commit_graft_alloc);
123 }
124 if (pos < commit_graft_nr)
125 memmove(commit_graft + pos + 1,
126 commit_graft + pos,
127 (commit_graft_nr - pos - 1) *
128 sizeof(*commit_graft));
129 commit_graft[pos] = graft;
130 return 0;
131 }
132
133 struct commit_graft *read_graft_line(char *buf, int len)
134 {
135 /* The format is just "Commit Parent1 Parent2 ...\n" */
136 int i;
137 struct commit_graft *graft = NULL;
138
139 if (buf[len-1] == '\n')
140 buf[--len] = 0;
141 if (buf[0] == '#' || buf[0] == '\0')
142 return NULL;
143 if ((len + 1) % 41) {
144 bad_graft_data:
145 error("bad graft data: %s", buf);
146 free(graft);
147 return NULL;
148 }
149 i = (len + 1) / 41 - 1;
150 graft = xmalloc(sizeof(*graft) + 20 * i);
151 graft->nr_parent = i;
152 if (get_sha1_hex(buf, graft->sha1))
153 goto bad_graft_data;
154 for (i = 40; i < len; i += 41) {
155 if (buf[i] != ' ')
156 goto bad_graft_data;
157 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
158 goto bad_graft_data;
159 }
160 return graft;
161 }
162
163 int read_graft_file(const char *graft_file)
164 {
165 FILE *fp = fopen(graft_file, "r");
166 char buf[1024];
167 if (!fp)
168 return -1;
169 while (fgets(buf, sizeof(buf), fp)) {
170 /* The format is just "Commit Parent1 Parent2 ...\n" */
171 int len = strlen(buf);
172 struct commit_graft *graft = read_graft_line(buf, len);
173 if (!graft)
174 continue;
175 if (register_commit_graft(graft, 1))
176 error("duplicate graft data: %s", buf);
177 }
178 fclose(fp);
179 return 0;
180 }
181
182 static void prepare_commit_graft(void)
183 {
184 static int commit_graft_prepared;
185 char *graft_file;
186
187 if (commit_graft_prepared)
188 return;
189 graft_file = get_graft_file();
190 read_graft_file(graft_file);
191 /* make sure shallows are read */
192 is_repository_shallow();
193 commit_graft_prepared = 1;
194 }
195
196 struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
197 {
198 int pos;
199 prepare_commit_graft();
200 pos = commit_graft_pos(sha1);
201 if (pos < 0)
202 return NULL;
203 return commit_graft[pos];
204 }
205
206 int write_shallow_commits(int fd, int use_pack_protocol)
207 {
208 int i, count = 0;
209 for (i = 0; i < commit_graft_nr; i++)
210 if (commit_graft[i]->nr_parent < 0) {
211 const char *hex =
212 sha1_to_hex(commit_graft[i]->sha1);
213 count++;
214 if (use_pack_protocol)
215 packet_write(fd, "shallow %s", hex);
216 else {
217 if (write_in_full(fd, hex, 40) != 40)
218 break;
219 if (write_in_full(fd, "\n", 1) != 1)
220 break;
221 }
222 }
223 return count;
224 }
225
226 int unregister_shallow(const unsigned char *sha1)
227 {
228 int pos = commit_graft_pos(sha1);
229 if (pos < 0)
230 return -1;
231 if (pos + 1 < commit_graft_nr)
232 memcpy(commit_graft + pos, commit_graft + pos + 1,
233 sizeof(struct commit_graft *)
234 * (commit_graft_nr - pos - 1));
235 commit_graft_nr--;
236 return 0;
237 }
238
239 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
240 {
241 char *tail = buffer;
242 char *bufptr = buffer;
243 unsigned char parent[20];
244 struct commit_list **pptr;
245 struct commit_graft *graft;
246
247 if (item->object.parsed)
248 return 0;
249 item->object.parsed = 1;
250 tail += size;
251 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
252 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
253 if (get_sha1_hex(bufptr + 5, parent) < 0)
254 return error("bad tree pointer in commit %s",
255 sha1_to_hex(item->object.sha1));
256 item->tree = lookup_tree(parent);
257 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
258 pptr = &item->parents;
259
260 graft = lookup_commit_graft(item->object.sha1);
261 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
262 struct commit *new_parent;
263
264 if (tail <= bufptr + 48 ||
265 get_sha1_hex(bufptr + 7, parent) ||
266 bufptr[47] != '\n')
267 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
268 bufptr += 48;
269 if (graft)
270 continue;
271 new_parent = lookup_commit(parent);
272 if (new_parent)
273 pptr = &commit_list_insert(new_parent, pptr)->next;
274 }
275 if (graft) {
276 int i;
277 struct commit *new_parent;
278 for (i = 0; i < graft->nr_parent; i++) {
279 new_parent = lookup_commit(graft->parent[i]);
280 if (!new_parent)
281 continue;
282 pptr = &commit_list_insert(new_parent, pptr)->next;
283 }
284 }
285 item->date = parse_commit_date(bufptr, tail);
286
287 return 0;
288 }
289
290 int parse_commit(struct commit *item)
291 {
292 enum object_type type;
293 void *buffer;
294 unsigned long size;
295 int ret;
296
297 if (!item)
298 return -1;
299 if (item->object.parsed)
300 return 0;
301 buffer = read_sha1_file(item->object.sha1, &type, &size);
302 if (!buffer)
303 return error("Could not read %s",
304 sha1_to_hex(item->object.sha1));
305 if (type != OBJ_COMMIT) {
306 free(buffer);
307 return error("Object %s not a commit",
308 sha1_to_hex(item->object.sha1));
309 }
310 ret = parse_commit_buffer(item, buffer, size);
311 if (save_commit_buffer && !ret) {
312 item->buffer = buffer;
313 return 0;
314 }
315 free(buffer);
316 return ret;
317 }
318
319 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
320 {
321 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
322 new_list->item = item;
323 new_list->next = *list_p;
324 *list_p = new_list;
325 return new_list;
326 }
327
328 unsigned commit_list_count(const struct commit_list *l)
329 {
330 unsigned c = 0;
331 for (; l; l = l->next )
332 c++;
333 return c;
334 }
335
336 void free_commit_list(struct commit_list *list)
337 {
338 while (list) {
339 struct commit_list *temp = list;
340 list = temp->next;
341 free(temp);
342 }
343 }
344
345 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
346 {
347 struct commit_list **pp = list;
348 struct commit_list *p;
349 while ((p = *pp) != NULL) {
350 if (p->item->date < item->date) {
351 break;
352 }
353 pp = &p->next;
354 }
355 return commit_list_insert(item, pp);
356 }
357
358
359 void sort_by_date(struct commit_list **list)
360 {
361 struct commit_list *ret = NULL;
362 while (*list) {
363 insert_by_date((*list)->item, &ret);
364 *list = (*list)->next;
365 }
366 *list = ret;
367 }
368
369 struct commit *pop_most_recent_commit(struct commit_list **list,
370 unsigned int mark)
371 {
372 struct commit *ret = (*list)->item;
373 struct commit_list *parents = ret->parents;
374 struct commit_list *old = *list;
375
376 *list = (*list)->next;
377 free(old);
378
379 while (parents) {
380 struct commit *commit = parents->item;
381 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
382 commit->object.flags |= mark;
383 insert_by_date(commit, list);
384 }
385 parents = parents->next;
386 }
387 return ret;
388 }
389
390 void clear_commit_marks(struct commit *commit, unsigned int mark)
391 {
392 while (commit) {
393 struct commit_list *parents;
394
395 if (!(mark & commit->object.flags))
396 return;
397
398 commit->object.flags &= ~mark;
399
400 parents = commit->parents;
401 if (!parents)
402 return;
403
404 while ((parents = parents->next))
405 clear_commit_marks(parents->item, mark);
406
407 commit = commit->parents->item;
408 }
409 }
410
411 struct commit *pop_commit(struct commit_list **stack)
412 {
413 struct commit_list *top = *stack;
414 struct commit *item = top ? top->item : NULL;
415
416 if (top) {
417 *stack = top->next;
418 free(top);
419 }
420 return item;
421 }
422
423 /*
424 * Performs an in-place topological sort on the list supplied.
425 */
426 void sort_in_topological_order(struct commit_list ** list, int lifo)
427 {
428 struct commit_list *next, *orig = *list;
429 struct commit_list *work, **insert;
430 struct commit_list **pptr;
431
432 if (!orig)
433 return;
434 *list = NULL;
435
436 /* Mark them and clear the indegree */
437 for (next = orig; next; next = next->next) {
438 struct commit *commit = next->item;
439 commit->object.flags |= TOPOSORT;
440 commit->indegree = 0;
441 }
442
443 /* update the indegree */
444 for (next = orig; next; next = next->next) {
445 struct commit_list * parents = next->item->parents;
446 while (parents) {
447 struct commit *parent = parents->item;
448
449 if (parent->object.flags & TOPOSORT)
450 parent->indegree++;
451 parents = parents->next;
452 }
453 }
454
455 /*
456 * find the tips
457 *
458 * tips are nodes not reachable from any other node in the list
459 *
460 * the tips serve as a starting set for the work queue.
461 */
462 work = NULL;
463 insert = &work;
464 for (next = orig; next; next = next->next) {
465 struct commit *commit = next->item;
466
467 if (!commit->indegree)
468 insert = &commit_list_insert(commit, insert)->next;
469 }
470
471 /* process the list in topological order */
472 if (!lifo)
473 sort_by_date(&work);
474
475 pptr = list;
476 *list = NULL;
477 while (work) {
478 struct commit *commit;
479 struct commit_list *parents, *work_item;
480
481 work_item = work;
482 work = work_item->next;
483 work_item->next = NULL;
484
485 commit = work_item->item;
486 for (parents = commit->parents; parents ; parents = parents->next) {
487 struct commit *parent=parents->item;
488
489 if (!(parent->object.flags & TOPOSORT))
490 continue;
491
492 /*
493 * parents are only enqueued for emission
494 * when all their children have been emitted thereby
495 * guaranteeing topological order.
496 */
497 if (!--parent->indegree) {
498 if (!lifo)
499 insert_by_date(parent, &work);
500 else
501 commit_list_insert(parent, &work);
502 }
503 }
504 /*
505 * work_item is a commit all of whose children
506 * have already been emitted. we can emit it now.
507 */
508 commit->object.flags &= ~TOPOSORT;
509 *pptr = work_item;
510 pptr = &work_item->next;
511 }
512 }
513
514 /* merge-base stuff */
515
516 /* bits #0..15 in revision.h */
517 #define PARENT1 (1u<<16)
518 #define PARENT2 (1u<<17)
519 #define STALE (1u<<18)
520 #define RESULT (1u<<19)
521
522 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
523
524 static struct commit *interesting(struct commit_list *list)
525 {
526 while (list) {
527 struct commit *commit = list->item;
528 list = list->next;
529 if (commit->object.flags & STALE)
530 continue;
531 return commit;
532 }
533 return NULL;
534 }
535
536 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
537 {
538 struct commit_list *list = NULL;
539 struct commit_list *result = NULL;
540
541 if (one == two)
542 /* We do not mark this even with RESULT so we do not
543 * have to clean it up.
544 */
545 return commit_list_insert(one, &result);
546
547 if (parse_commit(one))
548 return NULL;
549 if (parse_commit(two))
550 return NULL;
551
552 one->object.flags |= PARENT1;
553 two->object.flags |= PARENT2;
554 insert_by_date(one, &list);
555 insert_by_date(two, &list);
556
557 while (interesting(list)) {
558 struct commit *commit;
559 struct commit_list *parents;
560 struct commit_list *n;
561 int flags;
562
563 commit = list->item;
564 n = list->next;
565 free(list);
566 list = n;
567
568 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
569 if (flags == (PARENT1 | PARENT2)) {
570 if (!(commit->object.flags & RESULT)) {
571 commit->object.flags |= RESULT;
572 insert_by_date(commit, &result);
573 }
574 /* Mark parents of a found merge stale */
575 flags |= STALE;
576 }
577 parents = commit->parents;
578 while (parents) {
579 struct commit *p = parents->item;
580 parents = parents->next;
581 if ((p->object.flags & flags) == flags)
582 continue;
583 if (parse_commit(p))
584 return NULL;
585 p->object.flags |= flags;
586 insert_by_date(p, &list);
587 }
588 }
589
590 /* Clean up the result to remove stale ones */
591 free_commit_list(list);
592 list = result; result = NULL;
593 while (list) {
594 struct commit_list *n = list->next;
595 if (!(list->item->object.flags & STALE))
596 insert_by_date(list->item, &result);
597 free(list);
598 list = n;
599 }
600 return result;
601 }
602
603 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
604 {
605 struct commit_list *i, *j, *k, *ret = NULL;
606 struct commit_list **pptr = &ret;
607
608 for (i = in; i; i = i->next) {
609 if (!ret)
610 pptr = &commit_list_insert(i->item, pptr)->next;
611 else {
612 struct commit_list *new = NULL, *end = NULL;
613
614 for (j = ret; j; j = j->next) {
615 struct commit_list *bases;
616 bases = get_merge_bases(i->item, j->item, 1);
617 if (!new)
618 new = bases;
619 else
620 end->next = bases;
621 for (k = bases; k; k = k->next)
622 end = k;
623 }
624 ret = new;
625 }
626 }
627 return ret;
628 }
629
630 struct commit_list *get_merge_bases(struct commit *one,
631 struct commit *two, int cleanup)
632 {
633 struct commit_list *list;
634 struct commit **rslt;
635 struct commit_list *result;
636 int cnt, i, j;
637
638 result = merge_bases(one, two);
639 if (one == two)
640 return result;
641 if (!result || !result->next) {
642 if (cleanup) {
643 clear_commit_marks(one, all_flags);
644 clear_commit_marks(two, all_flags);
645 }
646 return result;
647 }
648
649 /* There are more than one */
650 cnt = 0;
651 list = result;
652 while (list) {
653 list = list->next;
654 cnt++;
655 }
656 rslt = xcalloc(cnt, sizeof(*rslt));
657 for (list = result, i = 0; list; list = list->next)
658 rslt[i++] = list->item;
659 free_commit_list(result);
660
661 clear_commit_marks(one, all_flags);
662 clear_commit_marks(two, all_flags);
663 for (i = 0; i < cnt - 1; i++) {
664 for (j = i+1; j < cnt; j++) {
665 if (!rslt[i] || !rslt[j])
666 continue;
667 result = merge_bases(rslt[i], rslt[j]);
668 clear_commit_marks(rslt[i], all_flags);
669 clear_commit_marks(rslt[j], all_flags);
670 for (list = result; list; list = list->next) {
671 if (rslt[i] == list->item)
672 rslt[i] = NULL;
673 if (rslt[j] == list->item)
674 rslt[j] = NULL;
675 }
676 }
677 }
678
679 /* Surviving ones in rslt[] are the independent results */
680 result = NULL;
681 for (i = 0; i < cnt; i++) {
682 if (rslt[i])
683 insert_by_date(rslt[i], &result);
684 }
685 free(rslt);
686 return result;
687 }
688
689 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
690 {
691 struct commit_list *bases, *b;
692 int ret = 0;
693
694 if (num == 1)
695 bases = get_merge_bases(commit, *reference, 1);
696 else
697 die("not yet");
698 for (b = bases; b; b = b->next) {
699 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
700 ret = 1;
701 break;
702 }
703 }
704
705 free_commit_list(bases);
706 return ret;
707 }