5 int save_commit_buffer
= 1;
10 * the number of children of the associated commit
11 * that also occur in the list being sorted.
13 unsigned int indegree
;
16 * reference to original list item that we will re-use
19 struct commit_list
* list_item
;
23 const char *commit_type
= "commit";
25 enum cmit_fmt
get_commit_format(const char *arg
)
28 return CMIT_FMT_DEFAULT
;
29 if (!strcmp(arg
, "=raw"))
31 if (!strcmp(arg
, "=medium"))
32 return CMIT_FMT_MEDIUM
;
33 if (!strcmp(arg
, "=short"))
34 return CMIT_FMT_SHORT
;
35 if (!strcmp(arg
, "=full"))
37 if (!strcmp(arg
, "=fuller"))
38 return CMIT_FMT_FULLER
;
39 if (!strcmp(arg
, "=oneline"))
40 return CMIT_FMT_ONELINE
;
41 die("invalid --pretty format");
44 static struct commit
*check_commit(struct object
*obj
,
45 const unsigned char *sha1
,
48 if (obj
->type
!= commit_type
) {
50 error("Object %s is a %s, not a commit",
51 sha1_to_hex(sha1
), obj
->type
);
54 return (struct commit
*) obj
;
57 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
60 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
64 return check_commit(obj
, sha1
, quiet
);
67 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
69 return lookup_commit_reference_gently(sha1
, 0);
72 struct commit
*lookup_commit(const unsigned char *sha1
)
74 struct object
*obj
= lookup_object(sha1
);
76 struct commit
*ret
= xmalloc(sizeof(struct commit
));
77 memset(ret
, 0, sizeof(struct commit
));
78 created_object(sha1
, &ret
->object
);
79 ret
->object
.type
= commit_type
;
83 obj
->type
= commit_type
;
84 return check_commit(obj
, sha1
, 0);
87 static unsigned long parse_commit_date(const char *buf
)
91 if (memcmp(buf
, "author", 6))
93 while (*buf
++ != '\n')
95 if (memcmp(buf
, "committer", 9))
99 date
= strtoul(buf
, NULL
, 10);
100 if (date
== ULONG_MAX
)
105 static struct commit_graft
{
106 unsigned char sha1
[20];
108 unsigned char parent
[0][20]; /* more */
110 static int commit_graft_alloc
, commit_graft_nr
;
112 static int commit_graft_pos(const unsigned char *sha1
)
116 hi
= commit_graft_nr
;
118 int mi
= (lo
+ hi
) / 2;
119 struct commit_graft
*graft
= commit_graft
[mi
];
120 int cmp
= memcmp(sha1
, graft
->sha1
, 20);
131 static void prepare_commit_graft(void)
133 char *graft_file
= get_graft_file();
134 FILE *fp
= fopen(graft_file
, "r");
137 commit_graft
= (struct commit_graft
**) "hack";
140 while (fgets(buf
, sizeof(buf
), fp
)) {
141 /* The format is just "Commit Parent1 Parent2 ...\n" */
142 int len
= strlen(buf
);
144 struct commit_graft
*graft
= NULL
;
146 if (buf
[len
-1] == '\n')
150 if ((len
+ 1) % 41) {
152 error("bad graft data: %s", buf
);
156 i
= (len
+ 1) / 41 - 1;
157 graft
= xmalloc(sizeof(*graft
) + 20 * i
);
158 graft
->nr_parent
= i
;
159 if (get_sha1_hex(buf
, graft
->sha1
))
161 for (i
= 40; i
< len
; i
+= 41) {
164 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
167 i
= commit_graft_pos(graft
->sha1
);
169 error("duplicate graft data: %s", buf
);
174 if (commit_graft_alloc
<= ++commit_graft_nr
) {
175 commit_graft_alloc
= alloc_nr(commit_graft_alloc
);
176 commit_graft
= xrealloc(commit_graft
,
177 sizeof(*commit_graft
) *
180 if (i
< commit_graft_nr
)
181 memmove(commit_graft
+ i
+ 1,
183 (commit_graft_nr
- i
- 1) *
184 sizeof(*commit_graft
));
185 commit_graft
[i
] = graft
;
190 static struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
194 prepare_commit_graft();
195 pos
= commit_graft_pos(sha1
);
198 return commit_graft
[pos
];
201 int parse_commit_buffer(struct commit
*item
, void *buffer
, unsigned long size
)
203 char *bufptr
= buffer
;
204 unsigned char parent
[20];
205 struct commit_list
**pptr
;
206 struct commit_graft
*graft
;
209 if (item
->object
.parsed
)
211 item
->object
.parsed
= 1;
212 if (memcmp(bufptr
, "tree ", 5))
213 return error("bogus commit object %s", sha1_to_hex(item
->object
.sha1
));
214 if (get_sha1_hex(bufptr
+ 5, parent
) < 0)
215 return error("bad tree pointer in commit %s",
216 sha1_to_hex(item
->object
.sha1
));
217 item
->tree
= lookup_tree(parent
);
220 bufptr
+= 46; /* "tree " + "hex sha1" + "\n" */
221 pptr
= &item
->parents
;
223 graft
= lookup_commit_graft(item
->object
.sha1
);
224 while (!memcmp(bufptr
, "parent ", 7)) {
225 struct commit
*new_parent
;
227 if (get_sha1_hex(bufptr
+ 7, parent
) || bufptr
[47] != '\n')
228 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
232 new_parent
= lookup_commit(parent
);
234 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
240 struct commit
*new_parent
;
241 for (i
= 0; i
< graft
->nr_parent
; i
++) {
242 new_parent
= lookup_commit(graft
->parent
[i
]);
245 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
249 item
->date
= parse_commit_date(bufptr
);
251 if (track_object_refs
) {
253 struct commit_list
*p
;
254 struct object_refs
*refs
= alloc_object_refs(n_refs
);
256 refs
->ref
[i
++] = &item
->tree
->object
;
257 for (p
= item
->parents
; p
; p
= p
->next
)
258 refs
->ref
[i
++] = &p
->item
->object
;
259 set_object_refs(&item
->object
, refs
);
265 int parse_commit(struct commit
*item
)
272 if (item
->object
.parsed
)
274 buffer
= read_sha1_file(item
->object
.sha1
, type
, &size
);
276 return error("Could not read %s",
277 sha1_to_hex(item
->object
.sha1
));
278 if (strcmp(type
, commit_type
)) {
280 return error("Object %s not a commit",
281 sha1_to_hex(item
->object
.sha1
));
283 ret
= parse_commit_buffer(item
, buffer
, size
);
284 if (save_commit_buffer
&& !ret
) {
285 item
->buffer
= buffer
;
292 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
294 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
295 new_list
->item
= item
;
296 new_list
->next
= *list_p
;
301 void free_commit_list(struct commit_list
*list
)
304 struct commit_list
*temp
= list
;
310 struct commit_list
* insert_by_date(struct commit
*item
, struct commit_list
**list
)
312 struct commit_list
**pp
= list
;
313 struct commit_list
*p
;
314 while ((p
= *pp
) != NULL
) {
315 if (p
->item
->date
< item
->date
) {
320 return commit_list_insert(item
, pp
);
324 void sort_by_date(struct commit_list
**list
)
326 struct commit_list
*ret
= NULL
;
328 insert_by_date((*list
)->item
, &ret
);
329 *list
= (*list
)->next
;
334 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
337 struct commit
*ret
= (*list
)->item
;
338 struct commit_list
*parents
= ret
->parents
;
339 struct commit_list
*old
= *list
;
341 *list
= (*list
)->next
;
345 struct commit
*commit
= parents
->item
;
346 parse_commit(commit
);
347 if (!(commit
->object
.flags
& mark
)) {
348 commit
->object
.flags
|= mark
;
349 insert_by_date(commit
, list
);
351 parents
= parents
->next
;
356 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
358 struct commit_list
*parents
;
360 parents
= commit
->parents
;
361 commit
->object
.flags
&= ~mark
;
363 struct commit
*parent
= parents
->item
;
364 if (parent
&& parent
->object
.parsed
&&
365 (parent
->object
.flags
& mark
))
366 clear_commit_marks(parent
, mark
);
367 parents
= parents
->next
;
372 * Generic support for pretty-printing the header
374 static int get_one_line(const char *msg
, unsigned long len
)
389 static int add_user_info(const char *what
, enum cmit_fmt fmt
, char *buf
, const char *line
)
395 const char *filler
= " ";
397 if (fmt
== CMIT_FMT_ONELINE
)
399 date
= strchr(line
, '>');
402 namelen
= ++date
- line
;
403 time
= strtoul(date
, &date
, 10);
404 tz
= strtol(date
, NULL
, 10);
406 ret
= sprintf(buf
, "%s: %.*s%.*s\n", what
,
407 (fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
408 filler
, namelen
, line
);
410 case CMIT_FMT_MEDIUM
:
411 ret
+= sprintf(buf
+ ret
, "Date: %s\n", show_date(time
, tz
));
413 case CMIT_FMT_FULLER
:
414 ret
+= sprintf(buf
+ ret
, "%sDate: %s\n", what
, show_date(time
, tz
));
423 static int is_empty_line(const char *line
, int len
)
425 while (len
&& isspace(line
[len
-1]))
430 static int add_merge_info(enum cmit_fmt fmt
, char *buf
, const struct commit
*commit
, int abbrev
)
432 struct commit_list
*parent
= commit
->parents
;
435 if ((fmt
== CMIT_FMT_ONELINE
) || !parent
|| !parent
->next
)
438 offset
= sprintf(buf
, "Merge:");
441 struct commit
*p
= parent
->item
;
442 const char *hex
= abbrev
443 ? find_unique_abbrev(p
->object
.sha1
, abbrev
)
444 : sha1_to_hex(p
->object
.sha1
);
445 char *dots
= (abbrev
&& strlen(hex
) != 40) ? "..." : "";
446 parent
= parent
->next
;
448 offset
+= sprintf(buf
+ offset
, " %s%s", hex
, dots
);
450 buf
[offset
++] = '\n';
454 unsigned long pretty_print_commit(enum cmit_fmt fmt
, const struct commit
*commit
, unsigned long len
, char *buf
, unsigned long space
, int abbrev
)
456 int hdr
= 1, body
= 0;
457 unsigned long offset
= 0;
458 int indent
= (fmt
== CMIT_FMT_ONELINE
) ? 0 : 4;
459 int parents_shown
= 0;
460 const char *msg
= commit
->buffer
;
463 const char *line
= msg
;
464 int linelen
= get_one_line(msg
, len
);
470 * We want some slop for indentation and a possible
471 * final "...". Thus the "+ 20".
473 if (offset
+ linelen
+ 20 > space
) {
474 memcpy(buf
+ offset
, " ...\n", 8);
484 if (fmt
!= CMIT_FMT_ONELINE
)
485 buf
[offset
++] = '\n';
488 if (fmt
== CMIT_FMT_RAW
) {
489 memcpy(buf
+ offset
, line
, linelen
);
493 if (!memcmp(line
, "parent ", 7)) {
495 die("bad parent line in commit");
499 if (!parents_shown
) {
500 offset
+= add_merge_info(fmt
, buf
+ offset
,
506 * MEDIUM == DEFAULT shows only author with dates.
507 * FULL shows both authors but not dates.
508 * FULLER shows both authors and dates.
510 if (!memcmp(line
, "author ", 7))
511 offset
+= add_user_info("Author", fmt
,
514 if (!memcmp(line
, "committer ", 10) &&
515 (fmt
== CMIT_FMT_FULL
|| fmt
== CMIT_FMT_FULLER
))
516 offset
+= add_user_info("Commit", fmt
,
522 if (is_empty_line(line
, linelen
)) {
525 if (fmt
== CMIT_FMT_SHORT
)
531 memset(buf
+ offset
, ' ', indent
);
532 memcpy(buf
+ offset
+ indent
, line
, linelen
);
533 offset
+= linelen
+ indent
;
534 if (fmt
== CMIT_FMT_ONELINE
)
537 if (fmt
== CMIT_FMT_ONELINE
) {
538 /* We do not want the terminating newline */
539 if (buf
[offset
- 1] == '\n')
543 /* Make sure there is an EOLN */
544 if (buf
[offset
- 1] != '\n')
545 buf
[offset
++] = '\n';
551 struct commit
*pop_commit(struct commit_list
**stack
)
553 struct commit_list
*top
= *stack
;
554 struct commit
*item
= top
? top
->item
: NULL
;
563 int count_parents(struct commit
* commit
)
566 struct commit_list
* parents
= commit
->parents
;
567 for (count
=0;parents
; parents
=parents
->next
,count
++)
573 * Performs an in-place topological sort on the list supplied.
575 void sort_in_topological_order(struct commit_list
** list
)
577 struct commit_list
* next
= *list
;
578 struct commit_list
* work
= NULL
, **insert
;
579 struct commit_list
** pptr
= list
;
580 struct sort_node
* nodes
;
581 struct sort_node
* next_nodes
;
584 /* determine the size of the list */
592 /* allocate an array to help sort the list */
593 nodes
= xcalloc(count
, sizeof(*nodes
));
594 /* link the list to the array */
598 next_nodes
->list_item
= next
;
599 next
->item
->object
.util
= next_nodes
;
603 /* update the indegree */
606 struct commit_list
* parents
= next
->item
->parents
;
608 struct commit
* parent
=parents
->item
;
609 struct sort_node
* pn
= (struct sort_node
*)parent
->object
.util
;
613 parents
=parents
->next
;
620 * tips are nodes not reachable from any other node in the list
622 * the tips serve as a starting set for the work queue.
627 struct sort_node
* node
= (struct sort_node
*)next
->item
->object
.util
;
629 if (node
->indegree
== 0) {
630 insert
= &commit_list_insert(next
->item
, insert
)->next
;
634 /* process the list in topological order */
636 struct commit
* work_item
= pop_commit(&work
);
637 struct sort_node
* work_node
= (struct sort_node
*)work_item
->object
.util
;
638 struct commit_list
* parents
= work_item
->parents
;
641 struct commit
* parent
=parents
->item
;
642 struct sort_node
* pn
= (struct sort_node
*)parent
->object
.util
;
646 * parents are only enqueued for emission
647 * when all their children have been emitted thereby
648 * guaranteeing topological order.
652 commit_list_insert(parent
, &work
);
654 parents
=parents
->next
;
657 * work_item is a commit all of whose children
658 * have already been emitted. we can emit it now.
660 *pptr
= work_node
->list_item
;
661 pptr
= &(*pptr
)->next
;
663 work_item
->object
.util
= NULL
;