Merge branch 'dl/xdiff'
[git/mingw/4msysgit/kblees.git] / commit.c
blobca25574500fe3c88d2cc2953b7dd019b3acab9e7
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
5 int save_commit_buffer = 1;
7 struct sort_node
9 /*
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
17 * on output.
19 struct commit_list * list_item;
23 const char *commit_type = "commit";
25 enum cmit_fmt get_commit_format(const char *arg)
27 if (!*arg)
28 return CMIT_FMT_DEFAULT;
29 if (!strcmp(arg, "=raw"))
30 return CMIT_FMT_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"))
36 return CMIT_FMT_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,
46 int quiet)
48 if (obj->type != commit_type) {
49 if (!quiet)
50 error("Object %s is a %s, not a commit",
51 sha1_to_hex(sha1), obj->type);
52 return NULL;
54 return (struct commit *) obj;
57 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
58 int quiet)
60 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
62 if (!obj)
63 return NULL;
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);
75 if (!obj) {
76 struct commit *ret = xcalloc(1, sizeof(struct commit));
77 created_object(sha1, &ret->object);
78 ret->object.type = commit_type;
79 return ret;
81 if (!obj->type)
82 obj->type = commit_type;
83 return check_commit(obj, sha1, 0);
86 static unsigned long parse_commit_date(const char *buf)
88 unsigned long date;
90 if (memcmp(buf, "author", 6))
91 return 0;
92 while (*buf++ != '\n')
93 /* nada */;
94 if (memcmp(buf, "committer", 9))
95 return 0;
96 while (*buf++ != '>')
97 /* nada */;
98 date = strtoul(buf, NULL, 10);
99 if (date == ULONG_MAX)
100 date = 0;
101 return date;
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)
109 int lo, hi;
110 lo = 0;
111 hi = commit_graft_nr;
112 while (lo < hi) {
113 int mi = (lo + hi) / 2;
114 struct commit_graft *graft = commit_graft[mi];
115 int cmp = memcmp(sha1, graft->sha1, 20);
116 if (!cmp)
117 return mi;
118 if (cmp < 0)
119 hi = mi;
120 else
121 lo = mi + 1;
123 return -lo - 1;
126 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
128 int pos = commit_graft_pos(graft->sha1);
130 if (0 <= pos) {
131 if (ignore_dups)
132 free(graft);
133 else {
134 free(commit_graft[pos]);
135 commit_graft[pos] = graft;
137 return 1;
139 pos = -pos - 1;
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) *
144 commit_graft_alloc);
146 if (pos < commit_graft_nr)
147 memmove(commit_graft + pos + 1,
148 commit_graft + pos,
149 (commit_graft_nr - pos - 1) *
150 sizeof(*commit_graft));
151 commit_graft[pos] = graft;
152 return 0;
155 struct commit_graft *read_graft_line(char *buf, int len)
157 /* The format is just "Commit Parent1 Parent2 ...\n" */
158 int i;
159 struct commit_graft *graft = NULL;
161 if (buf[len-1] == '\n')
162 buf[--len] = 0;
163 if (buf[0] == '#')
164 return 0;
165 if ((len + 1) % 41) {
166 bad_graft_data:
167 error("bad graft data: %s", buf);
168 free(graft);
169 return NULL;
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))
175 goto bad_graft_data;
176 for (i = 40; i < len; i += 41) {
177 if (buf[i] != ' ')
178 goto bad_graft_data;
179 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
180 goto bad_graft_data;
182 return graft;
185 int read_graft_file(const char *graft_file)
187 FILE *fp = fopen(graft_file, "r");
188 char buf[1024];
189 if (!fp)
190 return -1;
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);
198 fclose(fp);
199 return 0;
202 static void prepare_commit_graft(void)
204 static int commit_graft_prepared;
205 char *graft_file;
207 if (commit_graft_prepared)
208 return;
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)
216 int pos;
217 prepare_commit_graft();
218 pos = commit_graft_pos(sha1);
219 if (pos < 0)
220 return NULL;
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;
230 unsigned n_refs = 0;
232 if (item->object.parsed)
233 return 0;
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);
241 if (item->tree)
242 n_refs++;
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));
252 bufptr += 48;
253 if (graft)
254 continue;
255 new_parent = lookup_commit(parent);
256 if (new_parent) {
257 pptr = &commit_list_insert(new_parent, pptr)->next;
258 n_refs++;
261 if (graft) {
262 int i;
263 struct commit *new_parent;
264 for (i = 0; i < graft->nr_parent; i++) {
265 new_parent = lookup_commit(graft->parent[i]);
266 if (!new_parent)
267 continue;
268 pptr = &commit_list_insert(new_parent, pptr)->next;
269 n_refs++;
272 item->date = parse_commit_date(bufptr);
274 if (track_object_refs) {
275 unsigned i = 0;
276 struct commit_list *p;
277 struct object_refs *refs = alloc_object_refs(n_refs);
278 if (item->tree)
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);
285 return 0;
288 int parse_commit(struct commit *item)
290 char type[20];
291 void *buffer;
292 unsigned long size;
293 int ret;
295 if (item->object.parsed)
296 return 0;
297 buffer = read_sha1_file(item->object.sha1, type, &size);
298 if (!buffer)
299 return error("Could not read %s",
300 sha1_to_hex(item->object.sha1));
301 if (strcmp(type, commit_type)) {
302 free(buffer);
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;
309 return 0;
311 free(buffer);
312 return ret;
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;
320 *list_p = new_list;
321 return new_list;
324 void free_commit_list(struct commit_list *list)
326 while (list) {
327 struct commit_list *temp = list;
328 list = temp->next;
329 free(temp);
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) {
339 break;
341 pp = &p->next;
343 return commit_list_insert(item, pp);
347 void sort_by_date(struct commit_list **list)
349 struct commit_list *ret = NULL;
350 while (*list) {
351 insert_by_date((*list)->item, &ret);
352 *list = (*list)->next;
354 *list = ret;
357 struct commit *pop_most_recent_commit(struct commit_list **list,
358 unsigned int mark)
360 struct commit *ret = (*list)->item;
361 struct commit_list *parents = ret->parents;
362 struct commit_list *old = *list;
364 *list = (*list)->next;
365 free(old);
367 while (parents) {
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;
376 return ret;
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;
385 while (parents) {
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)
399 int ret = 0;
401 while (len--) {
402 char c = *msg++;
403 if (!c)
404 break;
405 ret++;
406 if (c == '\n')
407 break;
409 return ret;
412 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
414 char *date;
415 int namelen;
416 unsigned long time;
417 int tz, ret;
418 const char *filler = " ";
420 if (fmt == CMIT_FMT_ONELINE)
421 return 0;
422 date = strchr(line, '>');
423 if (!date)
424 return 0;
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);
432 switch (fmt) {
433 case CMIT_FMT_MEDIUM:
434 ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
435 break;
436 case CMIT_FMT_FULLER:
437 ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
438 break;
439 default:
440 /* notin' */
441 break;
443 return ret;
446 static int is_empty_line(const char *line, int len)
448 while (len && isspace(line[len-1]))
449 len--;
450 return !len;
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;
456 int offset;
458 if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
459 return 0;
461 offset = sprintf(buf, "Merge:");
463 while (parent) {
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';
474 return offset;
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;
485 for (;;) {
486 const char *line = msg;
487 int linelen = get_one_line(msg, len);
489 if (!linelen)
490 break;
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);
498 offset += 8;
499 break;
502 msg += linelen;
503 len -= linelen;
504 if (hdr) {
505 if (linelen == 1) {
506 hdr = 0;
507 if (fmt != CMIT_FMT_ONELINE)
508 buf[offset++] = '\n';
509 continue;
511 if (fmt == CMIT_FMT_RAW) {
512 memcpy(buf + offset, line, linelen);
513 offset += linelen;
514 continue;
516 if (!memcmp(line, "parent ", 7)) {
517 if (linelen != 48)
518 die("bad parent line in commit");
519 continue;
522 if (!parents_shown) {
523 offset += add_merge_info(fmt, buf + offset,
524 commit, abbrev);
525 parents_shown = 1;
526 continue;
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,
535 buf + offset,
536 line + 7);
537 if (!memcmp(line, "committer ", 10) &&
538 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
539 offset += add_user_info("Commit", fmt,
540 buf + offset,
541 line + 10);
542 continue;
545 if (is_empty_line(line, linelen)) {
546 if (!body)
547 continue;
548 if (fmt == CMIT_FMT_SHORT)
549 break;
550 } else {
551 body = 1;
554 memset(buf + offset, ' ', indent);
555 memcpy(buf + offset + indent, line, linelen);
556 offset += linelen + indent;
557 if (fmt == CMIT_FMT_ONELINE)
558 break;
560 while (offset && isspace(buf[offset-1]))
561 offset--;
562 /* Make sure there is an EOLN for the non-oneline case */
563 if (fmt != CMIT_FMT_ONELINE)
564 buf[offset++] = '\n';
565 buf[offset] = '\0';
566 return offset;
569 struct commit *pop_commit(struct commit_list **stack)
571 struct commit_list *top = *stack;
572 struct commit *item = top ? top->item : NULL;
574 if (top) {
575 *stack = top->next;
576 free(top);
578 return item;
581 int count_parents(struct commit * commit)
583 int count = 0;
584 struct commit_list * parents = commit->parents;
585 for (count=0;parents; parents=parents->next,count++)
587 return count;
590 void topo_sort_default_setter(struct commit *c, void *data)
592 c->object.util = data;
595 void *topo_sort_default_getter(struct commit *c)
597 return c->object.util;
601 * Performs an in-place topological sort on the list supplied.
603 void sort_in_topological_order(struct commit_list ** list, int lifo)
605 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
606 topo_sort_default_getter);
609 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
610 topo_sort_set_fn_t setter,
611 topo_sort_get_fn_t getter)
613 struct commit_list * next = *list;
614 struct commit_list * work = NULL, **insert;
615 struct commit_list ** pptr = list;
616 struct sort_node * nodes;
617 struct sort_node * next_nodes;
618 int count = 0;
620 /* determine the size of the list */
621 while (next) {
622 next = next->next;
623 count++;
626 if (!count)
627 return;
628 /* allocate an array to help sort the list */
629 nodes = xcalloc(count, sizeof(*nodes));
630 /* link the list to the array */
631 next_nodes = nodes;
632 next=*list;
633 while (next) {
634 next_nodes->list_item = next;
635 setter(next->item, next_nodes);
636 next_nodes++;
637 next = next->next;
639 /* update the indegree */
640 next=*list;
641 while (next) {
642 struct commit_list * parents = next->item->parents;
643 while (parents) {
644 struct commit * parent=parents->item;
645 struct sort_node * pn = (struct sort_node *) getter(parent);
647 if (pn)
648 pn->indegree++;
649 parents=parents->next;
651 next=next->next;
654 * find the tips
656 * tips are nodes not reachable from any other node in the list
658 * the tips serve as a starting set for the work queue.
660 next=*list;
661 insert = &work;
662 while (next) {
663 struct sort_node * node = (struct sort_node *) getter(next->item);
665 if (node->indegree == 0) {
666 insert = &commit_list_insert(next->item, insert)->next;
668 next=next->next;
671 /* process the list in topological order */
672 if (!lifo)
673 sort_by_date(&work);
674 while (work) {
675 struct commit * work_item = pop_commit(&work);
676 struct sort_node * work_node = (struct sort_node *) getter(work_item);
677 struct commit_list * parents = work_item->parents;
679 while (parents) {
680 struct commit * parent=parents->item;
681 struct sort_node * pn = (struct sort_node *) getter(parent);
683 if (pn) {
685 * parents are only enqueued for emission
686 * when all their children have been emitted thereby
687 * guaranteeing topological order.
689 pn->indegree--;
690 if (!pn->indegree) {
691 if (!lifo)
692 insert_by_date(parent, &work);
693 else
694 commit_list_insert(parent, &work);
697 parents=parents->next;
700 * work_item is a commit all of whose children
701 * have already been emitted. we can emit it now.
703 *pptr = work_node->list_item;
704 pptr = &(*pptr)->next;
705 *pptr = NULL;
706 setter(work_item, NULL);
708 free(nodes);