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
= xcalloc(1, sizeof(struct commit
));
77 created_object(sha1
, &ret
->object
);
78 ret
->object
.type
= commit_type
;
82 obj
->type
= commit_type
;
83 return check_commit(obj
, sha1
, 0);
86 static unsigned long parse_commit_date(const char *buf
)
90 if (memcmp(buf
, "author", 6))
92 while (*buf
++ != '\n')
94 if (memcmp(buf
, "committer", 9))
98 date
= strtoul(buf
, NULL
, 10);
99 if (date
== ULONG_MAX
)
104 static struct commit_graft
**commit_graft
;
105 static int commit_graft_alloc
, commit_graft_nr
;
107 static int commit_graft_pos(const unsigned char *sha1
)
111 hi
= commit_graft_nr
;
113 int mi
= (lo
+ hi
) / 2;
114 struct commit_graft
*graft
= commit_graft
[mi
];
115 int cmp
= memcmp(sha1
, graft
->sha1
, 20);
126 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
128 int pos
= commit_graft_pos(graft
->sha1
);
134 free(commit_graft
[pos
]);
135 commit_graft
[pos
] = graft
;
140 if (commit_graft_alloc
<= ++commit_graft_nr
) {
141 commit_graft_alloc
= alloc_nr(commit_graft_alloc
);
142 commit_graft
= xrealloc(commit_graft
,
143 sizeof(*commit_graft
) *
146 if (pos
< commit_graft_nr
)
147 memmove(commit_graft
+ pos
+ 1,
149 (commit_graft_nr
- pos
- 1) *
150 sizeof(*commit_graft
));
151 commit_graft
[pos
] = graft
;
155 struct commit_graft
*read_graft_line(char *buf
, int len
)
157 /* The format is just "Commit Parent1 Parent2 ...\n" */
159 struct commit_graft
*graft
= NULL
;
161 if (buf
[len
-1] == '\n')
165 if ((len
+ 1) % 41) {
167 error("bad graft data: %s", buf
);
171 i
= (len
+ 1) / 41 - 1;
172 graft
= xmalloc(sizeof(*graft
) + 20 * i
);
173 graft
->nr_parent
= i
;
174 if (get_sha1_hex(buf
, graft
->sha1
))
176 for (i
= 40; i
< len
; i
+= 41) {
179 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
185 int read_graft_file(const char *graft_file
)
187 FILE *fp
= fopen(graft_file
, "r");
191 while (fgets(buf
, sizeof(buf
), fp
)) {
192 /* The format is just "Commit Parent1 Parent2 ...\n" */
193 int len
= strlen(buf
);
194 struct commit_graft
*graft
= read_graft_line(buf
, len
);
195 if (register_commit_graft(graft
, 1))
196 error("duplicate graft data: %s", buf
);
202 static void prepare_commit_graft(void)
204 static int commit_graft_prepared
;
207 if (commit_graft_prepared
)
209 graft_file
= get_graft_file();
210 read_graft_file(graft_file
);
211 commit_graft_prepared
= 1;
214 static struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
217 prepare_commit_graft();
218 pos
= commit_graft_pos(sha1
);
221 return commit_graft
[pos
];
224 int parse_commit_buffer(struct commit
*item
, void *buffer
, unsigned long size
)
226 char *bufptr
= buffer
;
227 unsigned char parent
[20];
228 struct commit_list
**pptr
;
229 struct commit_graft
*graft
;
232 if (item
->object
.parsed
)
234 item
->object
.parsed
= 1;
235 if (memcmp(bufptr
, "tree ", 5))
236 return error("bogus commit object %s", sha1_to_hex(item
->object
.sha1
));
237 if (get_sha1_hex(bufptr
+ 5, parent
) < 0)
238 return error("bad tree pointer in commit %s",
239 sha1_to_hex(item
->object
.sha1
));
240 item
->tree
= lookup_tree(parent
);
243 bufptr
+= 46; /* "tree " + "hex sha1" + "\n" */
244 pptr
= &item
->parents
;
246 graft
= lookup_commit_graft(item
->object
.sha1
);
247 while (!memcmp(bufptr
, "parent ", 7)) {
248 struct commit
*new_parent
;
250 if (get_sha1_hex(bufptr
+ 7, parent
) || bufptr
[47] != '\n')
251 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
255 new_parent
= lookup_commit(parent
);
257 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
263 struct commit
*new_parent
;
264 for (i
= 0; i
< graft
->nr_parent
; i
++) {
265 new_parent
= lookup_commit(graft
->parent
[i
]);
268 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
272 item
->date
= parse_commit_date(bufptr
);
274 if (track_object_refs
) {
276 struct commit_list
*p
;
277 struct object_refs
*refs
= alloc_object_refs(n_refs
);
279 refs
->ref
[i
++] = &item
->tree
->object
;
280 for (p
= item
->parents
; p
; p
= p
->next
)
281 refs
->ref
[i
++] = &p
->item
->object
;
282 set_object_refs(&item
->object
, refs
);
288 int parse_commit(struct commit
*item
)
295 if (item
->object
.parsed
)
297 buffer
= read_sha1_file(item
->object
.sha1
, type
, &size
);
299 return error("Could not read %s",
300 sha1_to_hex(item
->object
.sha1
));
301 if (strcmp(type
, commit_type
)) {
303 return error("Object %s not a commit",
304 sha1_to_hex(item
->object
.sha1
));
306 ret
= parse_commit_buffer(item
, buffer
, size
);
307 if (save_commit_buffer
&& !ret
) {
308 item
->buffer
= buffer
;
315 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
317 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
318 new_list
->item
= item
;
319 new_list
->next
= *list_p
;
324 void free_commit_list(struct commit_list
*list
)
327 struct commit_list
*temp
= list
;
333 struct commit_list
* insert_by_date(struct commit
*item
, struct commit_list
**list
)
335 struct commit_list
**pp
= list
;
336 struct commit_list
*p
;
337 while ((p
= *pp
) != NULL
) {
338 if (p
->item
->date
< item
->date
) {
343 return commit_list_insert(item
, pp
);
347 void sort_by_date(struct commit_list
**list
)
349 struct commit_list
*ret
= NULL
;
351 insert_by_date((*list
)->item
, &ret
);
352 *list
= (*list
)->next
;
357 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
360 struct commit
*ret
= (*list
)->item
;
361 struct commit_list
*parents
= ret
->parents
;
362 struct commit_list
*old
= *list
;
364 *list
= (*list
)->next
;
368 struct commit
*commit
= parents
->item
;
369 parse_commit(commit
);
370 if (!(commit
->object
.flags
& mark
)) {
371 commit
->object
.flags
|= mark
;
372 insert_by_date(commit
, list
);
374 parents
= parents
->next
;
379 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
381 struct commit_list
*parents
;
383 parents
= commit
->parents
;
384 commit
->object
.flags
&= ~mark
;
386 struct commit
*parent
= parents
->item
;
387 if (parent
&& parent
->object
.parsed
&&
388 (parent
->object
.flags
& mark
))
389 clear_commit_marks(parent
, mark
);
390 parents
= parents
->next
;
395 * Generic support for pretty-printing the header
397 static int get_one_line(const char *msg
, unsigned long len
)
412 static int add_user_info(const char *what
, enum cmit_fmt fmt
, char *buf
, const char *line
)
418 const char *filler
= " ";
420 if (fmt
== CMIT_FMT_ONELINE
)
422 date
= strchr(line
, '>');
425 namelen
= ++date
- line
;
426 time
= strtoul(date
, &date
, 10);
427 tz
= strtol(date
, NULL
, 10);
429 ret
= sprintf(buf
, "%s: %.*s%.*s\n", what
,
430 (fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
431 filler
, namelen
, line
);
433 case CMIT_FMT_MEDIUM
:
434 ret
+= sprintf(buf
+ ret
, "Date: %s\n", show_date(time
, tz
));
436 case CMIT_FMT_FULLER
:
437 ret
+= sprintf(buf
+ ret
, "%sDate: %s\n", what
, show_date(time
, tz
));
446 static int is_empty_line(const char *line
, int len
)
448 while (len
&& isspace(line
[len
-1]))
453 static int add_merge_info(enum cmit_fmt fmt
, char *buf
, const struct commit
*commit
, int abbrev
)
455 struct commit_list
*parent
= commit
->parents
;
458 if ((fmt
== CMIT_FMT_ONELINE
) || !parent
|| !parent
->next
)
461 offset
= sprintf(buf
, "Merge:");
464 struct commit
*p
= parent
->item
;
465 const char *hex
= abbrev
466 ? find_unique_abbrev(p
->object
.sha1
, abbrev
)
467 : sha1_to_hex(p
->object
.sha1
);
468 char *dots
= (abbrev
&& strlen(hex
) != 40) ? "..." : "";
469 parent
= parent
->next
;
471 offset
+= sprintf(buf
+ offset
, " %s%s", hex
, dots
);
473 buf
[offset
++] = '\n';
477 unsigned long pretty_print_commit(enum cmit_fmt fmt
, const struct commit
*commit
, unsigned long len
, char *buf
, unsigned long space
, int abbrev
)
479 int hdr
= 1, body
= 0;
480 unsigned long offset
= 0;
481 int indent
= (fmt
== CMIT_FMT_ONELINE
) ? 0 : 4;
482 int parents_shown
= 0;
483 const char *msg
= commit
->buffer
;
486 const char *line
= msg
;
487 int linelen
= get_one_line(msg
, len
);
493 * We want some slop for indentation and a possible
494 * final "...". Thus the "+ 20".
496 if (offset
+ linelen
+ 20 > space
) {
497 memcpy(buf
+ offset
, " ...\n", 8);
507 if (fmt
!= CMIT_FMT_ONELINE
)
508 buf
[offset
++] = '\n';
511 if (fmt
== CMIT_FMT_RAW
) {
512 memcpy(buf
+ offset
, line
, linelen
);
516 if (!memcmp(line
, "parent ", 7)) {
518 die("bad parent line in commit");
522 if (!parents_shown
) {
523 offset
+= add_merge_info(fmt
, buf
+ offset
,
529 * MEDIUM == DEFAULT shows only author with dates.
530 * FULL shows both authors but not dates.
531 * FULLER shows both authors and dates.
533 if (!memcmp(line
, "author ", 7))
534 offset
+= add_user_info("Author", fmt
,
537 if (!memcmp(line
, "committer ", 10) &&
538 (fmt
== CMIT_FMT_FULL
|| fmt
== CMIT_FMT_FULLER
))
539 offset
+= add_user_info("Commit", fmt
,
545 if (is_empty_line(line
, linelen
)) {
548 if (fmt
== CMIT_FMT_SHORT
)
554 memset(buf
+ offset
, ' ', indent
);
555 memcpy(buf
+ offset
+ indent
, line
, linelen
);
556 offset
+= linelen
+ indent
;
557 if (fmt
== CMIT_FMT_ONELINE
)
560 if (fmt
== CMIT_FMT_ONELINE
) {
561 /* We do not want the terminating newline */
562 if (buf
[offset
- 1] == '\n')
566 /* Make sure there is an EOLN */
567 if (buf
[offset
- 1] != '\n')
568 buf
[offset
++] = '\n';
574 struct commit
*pop_commit(struct commit_list
**stack
)
576 struct commit_list
*top
= *stack
;
577 struct commit
*item
= top
? top
->item
: NULL
;
586 int count_parents(struct commit
* commit
)
589 struct commit_list
* parents
= commit
->parents
;
590 for (count
=0;parents
; parents
=parents
->next
,count
++)
595 void topo_sort_default_setter(struct commit
*c
, void *data
)
597 c
->object
.util
= data
;
600 void *topo_sort_default_getter(struct commit
*c
)
602 return c
->object
.util
;
606 * Performs an in-place topological sort on the list supplied.
608 void sort_in_topological_order(struct commit_list
** list
, int lifo
)
610 sort_in_topological_order_fn(list
, lifo
, topo_sort_default_setter
,
611 topo_sort_default_getter
);
614 void sort_in_topological_order_fn(struct commit_list
** list
, int lifo
,
615 topo_sort_set_fn_t setter
,
616 topo_sort_get_fn_t getter
)
618 struct commit_list
* next
= *list
;
619 struct commit_list
* work
= NULL
, **insert
;
620 struct commit_list
** pptr
= list
;
621 struct sort_node
* nodes
;
622 struct sort_node
* next_nodes
;
625 /* determine the size of the list */
633 /* allocate an array to help sort the list */
634 nodes
= xcalloc(count
, sizeof(*nodes
));
635 /* link the list to the array */
639 next_nodes
->list_item
= next
;
640 setter(next
->item
, next_nodes
);
644 /* update the indegree */
647 struct commit_list
* parents
= next
->item
->parents
;
649 struct commit
* parent
=parents
->item
;
650 struct sort_node
* pn
= (struct sort_node
*) getter(parent
);
654 parents
=parents
->next
;
661 * tips are nodes not reachable from any other node in the list
663 * the tips serve as a starting set for the work queue.
668 struct sort_node
* node
= (struct sort_node
*) getter(next
->item
);
670 if (node
->indegree
== 0) {
671 insert
= &commit_list_insert(next
->item
, insert
)->next
;
676 /* process the list in topological order */
680 struct commit
* work_item
= pop_commit(&work
);
681 struct sort_node
* work_node
= (struct sort_node
*) getter(work_item
);
682 struct commit_list
* parents
= work_item
->parents
;
685 struct commit
* parent
=parents
->item
;
686 struct sort_node
* pn
= (struct sort_node
*) getter(parent
);
690 * parents are only enqueued for emission
691 * when all their children have been emitted thereby
692 * guaranteeing topological order.
697 insert_by_date(parent
, &work
);
699 commit_list_insert(parent
, &work
);
702 parents
=parents
->next
;
705 * work_item is a commit all of whose children
706 * have already been emitted. we can emit it now.
708 *pptr
= work_node
->list_item
;
709 pptr
= &(*pptr
)->next
;
711 setter(work_item
, NULL
);