9 int save_commit_buffer
= 1;
11 const char *commit_type
= "commit";
13 static struct commit
*check_commit(struct object
*obj
,
14 const unsigned char *sha1
,
17 if (obj
->type
!= OBJ_COMMIT
) {
19 error("Object %s is a %s, not a commit",
20 sha1_to_hex(sha1
), typename(obj
->type
));
23 return (struct commit
*) obj
;
26 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
29 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
33 return check_commit(obj
, sha1
, quiet
);
36 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
38 return lookup_commit_reference_gently(sha1
, 0);
41 struct commit
*lookup_commit(const unsigned char *sha1
)
43 struct object
*obj
= lookup_object(sha1
);
45 return create_object(sha1
, OBJ_COMMIT
, alloc_commit_node());
47 obj
->type
= OBJ_COMMIT
;
48 return check_commit(obj
, sha1
, 0);
51 static unsigned long parse_commit_date(const char *buf
, const char *tail
)
58 if (memcmp(buf
, "author", 6))
60 while (buf
< tail
&& *buf
++ != '\n')
64 if (memcmp(buf
, "committer", 9))
66 while (buf
< tail
&& *buf
++ != '>')
71 while (buf
< tail
&& *buf
++ != '\n')
75 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
76 date
= strtoul(dateptr
, NULL
, 10);
77 if (date
== ULONG_MAX
)
82 static struct commit_graft
**commit_graft
;
83 static int commit_graft_alloc
, commit_graft_nr
;
85 static int commit_graft_pos(const unsigned char *sha1
)
91 int mi
= (lo
+ hi
) / 2;
92 struct commit_graft
*graft
= commit_graft
[mi
];
93 int cmp
= hashcmp(sha1
, graft
->sha1
);
104 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
106 int pos
= commit_graft_pos(graft
->sha1
);
112 free(commit_graft
[pos
]);
113 commit_graft
[pos
] = graft
;
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
) *
124 if (pos
< commit_graft_nr
)
125 memmove(commit_graft
+ pos
+ 1,
127 (commit_graft_nr
- pos
- 1) *
128 sizeof(*commit_graft
));
129 commit_graft
[pos
] = graft
;
133 struct commit_graft
*read_graft_line(char *buf
, int len
)
135 /* The format is just "Commit Parent1 Parent2 ...\n" */
137 struct commit_graft
*graft
= NULL
;
139 if (buf
[len
-1] == '\n')
141 if (buf
[0] == '#' || buf
[0] == '\0')
143 if ((len
+ 1) % 41) {
145 error("bad graft data: %s", buf
);
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
))
154 for (i
= 40; i
< len
; i
+= 41) {
157 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
163 int read_graft_file(const char *graft_file
)
165 FILE *fp
= fopen(graft_file
, "r");
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
);
175 if (register_commit_graft(graft
, 1))
176 error("duplicate graft data: %s", buf
);
182 static void prepare_commit_graft(void)
184 static int commit_graft_prepared
;
187 if (commit_graft_prepared
)
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;
196 struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
199 prepare_commit_graft();
200 pos
= commit_graft_pos(sha1
);
203 return commit_graft
[pos
];
206 int write_shallow_commits(int fd
, int use_pack_protocol
)
209 for (i
= 0; i
< commit_graft_nr
; i
++)
210 if (commit_graft
[i
]->nr_parent
< 0) {
212 sha1_to_hex(commit_graft
[i
]->sha1
);
214 if (use_pack_protocol
)
215 packet_write(fd
, "shallow %s", hex
);
217 if (write_in_full(fd
, hex
, 40) != 40)
219 if (write_in_full(fd
, "\n", 1) != 1)
226 int unregister_shallow(const unsigned char *sha1
)
228 int pos
= commit_graft_pos(sha1
);
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));
239 int parse_commit_buffer(struct commit
*item
, void *buffer
, unsigned long size
)
242 char *bufptr
= buffer
;
243 unsigned char parent
[20];
244 struct commit_list
**pptr
;
245 struct commit_graft
*graft
;
247 if (item
->object
.parsed
)
249 item
->object
.parsed
= 1;
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
;
260 graft
= lookup_commit_graft(item
->object
.sha1
);
261 while (bufptr
+ 48 < tail
&& !memcmp(bufptr
, "parent ", 7)) {
262 struct commit
*new_parent
;
264 if (tail
<= bufptr
+ 48 ||
265 get_sha1_hex(bufptr
+ 7, parent
) ||
267 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
271 new_parent
= lookup_commit(parent
);
273 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
277 struct commit
*new_parent
;
278 for (i
= 0; i
< graft
->nr_parent
; i
++) {
279 new_parent
= lookup_commit(graft
->parent
[i
]);
282 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
285 item
->date
= parse_commit_date(bufptr
, tail
);
290 int parse_commit(struct commit
*item
)
292 enum object_type type
;
299 if (item
->object
.parsed
)
301 buffer
= read_sha1_file(item
->object
.sha1
, &type
, &size
);
303 return error("Could not read %s",
304 sha1_to_hex(item
->object
.sha1
));
305 if (type
!= OBJ_COMMIT
) {
307 return error("Object %s not a commit",
308 sha1_to_hex(item
->object
.sha1
));
310 ret
= parse_commit_buffer(item
, buffer
, size
);
311 if (save_commit_buffer
&& !ret
) {
312 item
->buffer
= buffer
;
319 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
321 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
322 new_list
->item
= item
;
323 new_list
->next
= *list_p
;
328 unsigned commit_list_count(const struct commit_list
*l
)
331 for (; l
; l
= l
->next
)
336 void free_commit_list(struct commit_list
*list
)
339 struct commit_list
*temp
= list
;
345 struct commit_list
* insert_by_date(struct commit
*item
, struct commit_list
**list
)
347 struct commit_list
**pp
= list
;
348 struct commit_list
*p
;
349 while ((p
= *pp
) != NULL
) {
350 if (p
->item
->date
< item
->date
) {
355 return commit_list_insert(item
, pp
);
359 void sort_by_date(struct commit_list
**list
)
361 struct commit_list
*ret
= NULL
;
363 insert_by_date((*list
)->item
, &ret
);
364 *list
= (*list
)->next
;
369 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
372 struct commit
*ret
= (*list
)->item
;
373 struct commit_list
*parents
= ret
->parents
;
374 struct commit_list
*old
= *list
;
376 *list
= (*list
)->next
;
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
);
385 parents
= parents
->next
;
390 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
393 struct commit_list
*parents
;
395 if (!(mark
& commit
->object
.flags
))
398 commit
->object
.flags
&= ~mark
;
400 parents
= commit
->parents
;
404 while ((parents
= parents
->next
))
405 clear_commit_marks(parents
->item
, mark
);
407 commit
= commit
->parents
->item
;
411 struct commit
*pop_commit(struct commit_list
**stack
)
413 struct commit_list
*top
= *stack
;
414 struct commit
*item
= top
? top
->item
: NULL
;
424 * Performs an in-place topological sort on the list supplied.
426 void sort_in_topological_order(struct commit_list
** list
, int lifo
)
428 struct commit_list
*next
, *orig
= *list
;
429 struct commit_list
*work
, **insert
;
430 struct commit_list
**pptr
;
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;
443 /* update the indegree */
444 for (next
= orig
; next
; next
= next
->next
) {
445 struct commit_list
* parents
= next
->item
->parents
;
447 struct commit
*parent
= parents
->item
;
449 if (parent
->object
.flags
& TOPOSORT
)
451 parents
= parents
->next
;
458 * tips are nodes not reachable from any other node in the list
460 * the tips serve as a starting set for the work queue.
464 for (next
= orig
; next
; next
= next
->next
) {
465 struct commit
*commit
= next
->item
;
467 if (!commit
->indegree
)
468 insert
= &commit_list_insert(commit
, insert
)->next
;
471 /* process the list in topological order */
478 struct commit
*commit
;
479 struct commit_list
*parents
, *work_item
;
482 work
= work_item
->next
;
483 work_item
->next
= NULL
;
485 commit
= work_item
->item
;
486 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
487 struct commit
*parent
=parents
->item
;
489 if (!(parent
->object
.flags
& TOPOSORT
))
493 * parents are only enqueued for emission
494 * when all their children have been emitted thereby
495 * guaranteeing topological order.
497 if (!--parent
->indegree
) {
499 insert_by_date(parent
, &work
);
501 commit_list_insert(parent
, &work
);
505 * work_item is a commit all of whose children
506 * have already been emitted. we can emit it now.
508 commit
->object
.flags
&= ~TOPOSORT
;
510 pptr
= &work_item
->next
;
514 /* merge-base stuff */
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)
522 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
524 static struct commit
*interesting(struct commit_list
*list
)
527 struct commit
*commit
= list
->item
;
529 if (commit
->object
.flags
& STALE
)
536 static struct commit_list
*merge_bases(struct commit
*one
, struct commit
*two
)
538 struct commit_list
*list
= NULL
;
539 struct commit_list
*result
= NULL
;
542 /* We do not mark this even with RESULT so we do not
543 * have to clean it up.
545 return commit_list_insert(one
, &result
);
547 if (parse_commit(one
))
549 if (parse_commit(two
))
552 one
->object
.flags
|= PARENT1
;
553 two
->object
.flags
|= PARENT2
;
554 insert_by_date(one
, &list
);
555 insert_by_date(two
, &list
);
557 while (interesting(list
)) {
558 struct commit
*commit
;
559 struct commit_list
*parents
;
560 struct commit_list
*n
;
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
);
574 /* Mark parents of a found merge stale */
577 parents
= commit
->parents
;
579 struct commit
*p
= parents
->item
;
580 parents
= parents
->next
;
581 if ((p
->object
.flags
& flags
) == flags
)
585 p
->object
.flags
|= flags
;
586 insert_by_date(p
, &list
);
590 /* Clean up the result to remove stale ones */
591 free_commit_list(list
);
592 list
= result
; result
= NULL
;
594 struct commit_list
*n
= list
->next
;
595 if (!(list
->item
->object
.flags
& STALE
))
596 insert_by_date(list
->item
, &result
);
603 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
605 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
606 struct commit_list
**pptr
= &ret
;
608 for (i
= in
; i
; i
= i
->next
) {
610 pptr
= &commit_list_insert(i
->item
, pptr
)->next
;
612 struct commit_list
*new = NULL
, *end
= NULL
;
614 for (j
= ret
; j
; j
= j
->next
) {
615 struct commit_list
*bases
;
616 bases
= get_merge_bases(i
->item
, j
->item
, 1);
621 for (k
= bases
; k
; k
= k
->next
)
630 struct commit_list
*get_merge_bases(struct commit
*one
,
631 struct commit
*two
, int cleanup
)
633 struct commit_list
*list
;
634 struct commit
**rslt
;
635 struct commit_list
*result
;
638 result
= merge_bases(one
, two
);
641 if (!result
|| !result
->next
) {
643 clear_commit_marks(one
, all_flags
);
644 clear_commit_marks(two
, all_flags
);
649 /* There are more than one */
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
);
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
])
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
)
673 if (rslt
[j
] == list
->item
)
679 /* Surviving ones in rslt[] are the independent results */
681 for (i
= 0; i
< cnt
; i
++) {
683 insert_by_date(rslt
[i
], &result
);
689 int in_merge_bases(struct commit
*commit
, struct commit
**reference
, int num
)
691 struct commit_list
*bases
, *b
;
695 bases
= get_merge_bases(commit
, *reference
, 1);
698 for (b
= bases
; b
; b
= b
->next
) {
699 if (!hashcmp(commit
->object
.sha1
, b
->item
->object
.sha1
)) {
705 free_commit_list(bases
);