git-update-cache refuses to add a file where a directory is registed.
[git/mingw/j6t.git] / commit.c
blob706c7cba08ebc2100c2dbf63ed1238f39324f750
1 #include "commit.h"
2 #include "cache.h"
3 #include <string.h>
4 #include <limits.h>
6 const char *commit_type = "commit";
8 struct commit *lookup_commit(unsigned char *sha1)
10 struct object *obj = lookup_object(sha1);
11 if (!obj) {
12 struct commit *ret = xmalloc(sizeof(struct commit));
13 memset(ret, 0, sizeof(struct commit));
14 created_object(sha1, &ret->object);
15 ret->object.type = commit_type;
16 return ret;
18 if (obj->type != commit_type) {
19 error("Object %s is a %s, not a commit",
20 sha1_to_hex(sha1), obj->type);
21 return NULL;
23 return (struct commit *) obj;
26 static unsigned long parse_commit_date(const char *buf)
28 unsigned long date;
30 if (memcmp(buf, "author", 6))
31 return 0;
32 while (*buf++ != '\n')
33 /* nada */;
34 if (memcmp(buf, "committer", 9))
35 return 0;
36 while (*buf++ != '>')
37 /* nada */;
38 date = strtoul(buf, NULL, 10);
39 if (date == ULONG_MAX)
40 date = 0;
41 return date;
44 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
46 void *bufptr = buffer;
47 unsigned char parent[20];
49 if (item->object.parsed)
50 return 0;
51 item->object.parsed = 1;
52 get_sha1_hex(bufptr + 5, parent);
53 item->tree = lookup_tree(parent);
54 if (item->tree)
55 add_ref(&item->object, &item->tree->object);
56 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
57 while (!memcmp(bufptr, "parent ", 7) &&
58 !get_sha1_hex(bufptr + 7, parent)) {
59 struct commit *new_parent = lookup_commit(parent);
60 if (new_parent) {
61 commit_list_insert(new_parent, &item->parents);
62 add_ref(&item->object, &new_parent->object);
64 bufptr += 48;
66 item->date = parse_commit_date(bufptr);
67 return 0;
70 int parse_commit(struct commit *item)
72 char type[20];
73 void *buffer;
74 unsigned long size;
75 int ret;
77 if (item->object.parsed)
78 return 0;
79 buffer = read_sha1_file(item->object.sha1, type, &size);
80 if (!buffer)
81 return error("Could not read %s",
82 sha1_to_hex(item->object.sha1));
83 if (strcmp(type, commit_type)) {
84 free(buffer);
85 return error("Object %s not a commit",
86 sha1_to_hex(item->object.sha1));
88 ret = parse_commit_buffer(item, buffer, size);
89 free(buffer);
90 return ret;
93 void commit_list_insert(struct commit *item, struct commit_list **list_p)
95 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
96 new_list->item = item;
97 new_list->next = *list_p;
98 *list_p = new_list;
101 void free_commit_list(struct commit_list *list)
103 while (list) {
104 struct commit_list *temp = list;
105 list = temp->next;
106 free(temp);
110 static void insert_by_date(struct commit_list **list, struct commit *item)
112 struct commit_list **pp = list;
113 struct commit_list *p;
114 while ((p = *pp) != NULL) {
115 if (p->item->date < item->date) {
116 break;
118 pp = &p->next;
120 commit_list_insert(item, pp);
124 void sort_by_date(struct commit_list **list)
126 struct commit_list *ret = NULL;
127 while (*list) {
128 insert_by_date(&ret, (*list)->item);
129 *list = (*list)->next;
131 *list = ret;
134 struct commit *pop_most_recent_commit(struct commit_list **list,
135 unsigned int mark)
137 struct commit *ret = (*list)->item;
138 struct commit_list *parents = ret->parents;
139 struct commit_list *old = *list;
141 *list = (*list)->next;
142 free(old);
144 while (parents) {
145 struct commit *commit = parents->item;
146 parse_commit(commit);
147 if (!(commit->object.flags & mark)) {
148 commit->object.flags |= mark;
149 insert_by_date(list, commit);
151 parents = parents->next;
153 return ret;