]>
Commit | Line | Data |
---|---|---|
8f1d2e6f | 1 | #include "cache.h" |
961784ee | 2 | #include "tag.h" |
175785e5 | 3 | #include "commit.h" |
ed09aef0 | 4 | #include "pkt-line.h" |
52883fbd | 5 | #include "utf8.h" |
199c45bf JH |
6 | #include "diff.h" |
7 | #include "revision.h" | |
175785e5 | 8 | |
60ab26de LT |
9 | int save_commit_buffer = 1; |
10 | ||
175785e5 DB |
11 | const char *commit_type = "commit"; |
12 | ||
f76412ed JH |
13 | static struct commit *check_commit(struct object *obj, |
14 | const unsigned char *sha1, | |
15 | int quiet) | |
961784ee | 16 | { |
1974632c | 17 | if (obj->type != OBJ_COMMIT) { |
f76412ed JH |
18 | if (!quiet) |
19 | error("Object %s is a %s, not a commit", | |
885a86ab | 20 | sha1_to_hex(sha1), typename(obj->type)); |
961784ee LT |
21 | return NULL; |
22 | } | |
23 | return (struct commit *) obj; | |
24 | } | |
25 | ||
f76412ed JH |
26 | struct commit *lookup_commit_reference_gently(const unsigned char *sha1, |
27 | int quiet) | |
961784ee | 28 | { |
9534f40b | 29 | struct object *obj = deref_tag(parse_object(sha1), NULL, 0); |
961784ee LT |
30 | |
31 | if (!obj) | |
32 | return NULL; | |
f76412ed JH |
33 | return check_commit(obj, sha1, quiet); |
34 | } | |
35 | ||
36 | struct commit *lookup_commit_reference(const unsigned char *sha1) | |
37 | { | |
38 | return lookup_commit_reference_gently(sha1, 0); | |
961784ee LT |
39 | } |
40 | ||
5d6ccf5c | 41 | struct commit *lookup_commit(const unsigned char *sha1) |
175785e5 DB |
42 | { |
43 | struct object *obj = lookup_object(sha1); | |
100c5f3b LT |
44 | if (!obj) |
45 | return create_object(sha1, OBJ_COMMIT, alloc_commit_node()); | |
d1af002d | 46 | if (!obj->type) |
1974632c | 47 | obj->type = OBJ_COMMIT; |
f76412ed | 48 | return check_commit(obj, sha1, 0); |
175785e5 DB |
49 | } |
50 | ||
0a617799 | 51 | static unsigned long parse_commit_date(const char *buf, const char *tail) |
175785e5 DB |
52 | { |
53 | unsigned long date; | |
0a617799 | 54 | const char *dateptr; |
175785e5 | 55 | |
0a617799 MK |
56 | if (buf + 6 >= tail) |
57 | return 0; | |
175785e5 DB |
58 | if (memcmp(buf, "author", 6)) |
59 | return 0; | |
0a617799 | 60 | while (buf < tail && *buf++ != '\n') |
175785e5 | 61 | /* nada */; |
0a617799 MK |
62 | if (buf + 9 >= tail) |
63 | return 0; | |
175785e5 DB |
64 | if (memcmp(buf, "committer", 9)) |
65 | return 0; | |
0a617799 | 66 | while (buf < tail && *buf++ != '>') |
175785e5 | 67 | /* nada */; |
0a617799 MK |
68 | if (buf >= tail) |
69 | return 0; | |
70 | dateptr = buf; | |
71 | while (buf < tail && *buf++ != '\n') | |
72 | /* nada */; | |
73 | if (buf >= tail) | |
74 | return 0; | |
75 | /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */ | |
76 | date = strtoul(dateptr, NULL, 10); | |
175785e5 DB |
77 | if (date == ULONG_MAX) |
78 | date = 0; | |
79 | return date; | |
80 | } | |
81 | ||
5040f17e | 82 | static struct commit_graft **commit_graft; |
5da5c8f4 JH |
83 | static int commit_graft_alloc, commit_graft_nr; |
84 | ||
85 | static int commit_graft_pos(const unsigned char *sha1) | |
86 | { | |
87 | int lo, hi; | |
88 | lo = 0; | |
89 | hi = commit_graft_nr; | |
90 | while (lo < hi) { | |
91 | int mi = (lo + hi) / 2; | |
92 | struct commit_graft *graft = commit_graft[mi]; | |
a89fccd2 | 93 | int cmp = hashcmp(sha1, graft->sha1); |
5da5c8f4 JH |
94 | if (!cmp) |
95 | return mi; | |
96 | if (cmp < 0) | |
97 | hi = mi; | |
98 | else | |
99 | lo = mi + 1; | |
100 | } | |
101 | return -lo - 1; | |
102 | } | |
103 | ||
5040f17e JH |
104 | int register_commit_graft(struct commit_graft *graft, int ignore_dups) |
105 | { | |
106 | int pos = commit_graft_pos(graft->sha1); | |
a6080a0a | 107 | |
5040f17e JH |
108 | if (0 <= pos) { |
109 | if (ignore_dups) | |
110 | free(graft); | |
111 | else { | |
112 | free(commit_graft[pos]); | |
113 | commit_graft[pos] = graft; | |
114 | } | |
115 | return 1; | |
116 | } | |
117 | pos = -pos - 1; | |
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) * | |
122 | commit_graft_alloc); | |
123 | } | |
124 | if (pos < commit_graft_nr) | |
125 | memmove(commit_graft + pos + 1, | |
126 | commit_graft + pos, | |
127 | (commit_graft_nr - pos - 1) * | |
128 | sizeof(*commit_graft)); | |
129 | commit_graft[pos] = graft; | |
130 | return 0; | |
131 | } | |
132 | ||
133 | struct commit_graft *read_graft_line(char *buf, int len) | |
134 | { | |
135 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
136 | int i; | |
137 | struct commit_graft *graft = NULL; | |
138 | ||
139 | if (buf[len-1] == '\n') | |
140 | buf[--len] = 0; | |
360204c3 | 141 | if (buf[0] == '#' || buf[0] == '\0') |
5bc4ce58 | 142 | return NULL; |
5040f17e JH |
143 | if ((len + 1) % 41) { |
144 | bad_graft_data: | |
145 | error("bad graft data: %s", buf); | |
146 | free(graft); | |
147 | return NULL; | |
148 | } | |
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)) | |
153 | goto bad_graft_data; | |
154 | for (i = 40; i < len; i += 41) { | |
155 | if (buf[i] != ' ') | |
156 | goto bad_graft_data; | |
157 | if (get_sha1_hex(buf + i + 1, graft->parent[i/41])) | |
158 | goto bad_graft_data; | |
159 | } | |
160 | return graft; | |
161 | } | |
162 | ||
163 | int read_graft_file(const char *graft_file) | |
5da5c8f4 | 164 | { |
5da5c8f4 JH |
165 | FILE *fp = fopen(graft_file, "r"); |
166 | char buf[1024]; | |
5040f17e JH |
167 | if (!fp) |
168 | return -1; | |
5da5c8f4 JH |
169 | while (fgets(buf, sizeof(buf), fp)) { |
170 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
171 | int len = strlen(buf); | |
5040f17e | 172 | struct commit_graft *graft = read_graft_line(buf, len); |
5bc4ce58 JH |
173 | if (!graft) |
174 | continue; | |
5040f17e | 175 | if (register_commit_graft(graft, 1)) |
5da5c8f4 | 176 | error("duplicate graft data: %s", buf); |
5da5c8f4 JH |
177 | } |
178 | fclose(fp); | |
5040f17e JH |
179 | return 0; |
180 | } | |
181 | ||
182 | static void prepare_commit_graft(void) | |
183 | { | |
184 | static int commit_graft_prepared; | |
185 | char *graft_file; | |
186 | ||
187 | if (commit_graft_prepared) | |
188 | return; | |
189 | graft_file = get_graft_file(); | |
190 | read_graft_file(graft_file); | |
ed09aef0 JS |
191 | /* make sure shallows are read */ |
192 | is_repository_shallow(); | |
5040f17e | 193 | commit_graft_prepared = 1; |
5da5c8f4 JH |
194 | } |
195 | ||
45163382 | 196 | struct commit_graft *lookup_commit_graft(const unsigned char *sha1) |
5da5c8f4 JH |
197 | { |
198 | int pos; | |
5040f17e | 199 | prepare_commit_graft(); |
5da5c8f4 JH |
200 | pos = commit_graft_pos(sha1); |
201 | if (pos < 0) | |
202 | return NULL; | |
203 | return commit_graft[pos]; | |
204 | } | |
205 | ||
ed09aef0 JS |
206 | int write_shallow_commits(int fd, int use_pack_protocol) |
207 | { | |
208 | int i, count = 0; | |
209 | for (i = 0; i < commit_graft_nr; i++) | |
210 | if (commit_graft[i]->nr_parent < 0) { | |
211 | const char *hex = | |
212 | sha1_to_hex(commit_graft[i]->sha1); | |
213 | count++; | |
214 | if (use_pack_protocol) | |
215 | packet_write(fd, "shallow %s", hex); | |
216 | else { | |
93822c22 AW |
217 | if (write_in_full(fd, hex, 40) != 40) |
218 | break; | |
219 | if (write_in_full(fd, "\n", 1) != 1) | |
220 | break; | |
ed09aef0 JS |
221 | } |
222 | } | |
223 | return count; | |
224 | } | |
225 | ||
f53514bc JS |
226 | int unregister_shallow(const unsigned char *sha1) |
227 | { | |
228 | int pos = commit_graft_pos(sha1); | |
229 | if (pos < 0) | |
230 | return -1; | |
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)); | |
235 | commit_graft_nr--; | |
236 | return 0; | |
237 | } | |
238 | ||
bd2c39f5 | 239 | int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size) |
175785e5 | 240 | { |
3b44f15a | 241 | char *tail = buffer; |
f7cc77d7 | 242 | char *bufptr = buffer; |
175785e5 | 243 | unsigned char parent[20]; |
6c88be16 | 244 | struct commit_list **pptr; |
5da5c8f4 | 245 | struct commit_graft *graft; |
bd2c39f5 | 246 | |
175785e5 DB |
247 | if (item->object.parsed) |
248 | return 0; | |
249 | item->object.parsed = 1; | |
3b44f15a | 250 | tail += size; |
0a617799 | 251 | if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n') |
f7cc77d7 | 252 | return error("bogus commit object %s", sha1_to_hex(item->object.sha1)); |
0a617799 | 253 | if (get_sha1_hex(bufptr + 5, parent) < 0) |
bd2afde8 JH |
254 | return error("bad tree pointer in commit %s", |
255 | sha1_to_hex(item->object.sha1)); | |
175785e5 | 256 | item->tree = lookup_tree(parent); |
175785e5 | 257 | bufptr += 46; /* "tree " + "hex sha1" + "\n" */ |
6c88be16 | 258 | pptr = &item->parents; |
5da5c8f4 JH |
259 | |
260 | graft = lookup_commit_graft(item->object.sha1); | |
3b44f15a | 261 | while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
262 | struct commit *new_parent; |
263 | ||
3b44f15a JH |
264 | if (tail <= bufptr + 48 || |
265 | get_sha1_hex(bufptr + 7, parent) || | |
266 | bufptr[47] != '\n') | |
f7cc77d7 | 267 | return error("bad parents in commit %s", sha1_to_hex(item->object.sha1)); |
5da5c8f4 JH |
268 | bufptr += 48; |
269 | if (graft) | |
270 | continue; | |
f7cc77d7 | 271 | new_parent = lookup_commit(parent); |
39468def | 272 | if (new_parent) |
6c88be16 | 273 | pptr = &commit_list_insert(new_parent, pptr)->next; |
5da5c8f4 JH |
274 | } |
275 | if (graft) { | |
276 | int i; | |
277 | struct commit *new_parent; | |
278 | for (i = 0; i < graft->nr_parent; i++) { | |
279 | new_parent = lookup_commit(graft->parent[i]); | |
280 | if (!new_parent) | |
281 | continue; | |
282 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
5da5c8f4 | 283 | } |
175785e5 | 284 | } |
0a617799 | 285 | item->date = parse_commit_date(bufptr, tail); |
27dedf0c | 286 | |
175785e5 DB |
287 | return 0; |
288 | } | |
289 | ||
bd2c39f5 NP |
290 | int parse_commit(struct commit *item) |
291 | { | |
21666f1a | 292 | enum object_type type; |
bd2c39f5 NP |
293 | void *buffer; |
294 | unsigned long size; | |
295 | int ret; | |
296 | ||
9786f68b MK |
297 | if (!item) |
298 | return -1; | |
bd2c39f5 NP |
299 | if (item->object.parsed) |
300 | return 0; | |
21666f1a | 301 | buffer = read_sha1_file(item->object.sha1, &type, &size); |
bd2c39f5 NP |
302 | if (!buffer) |
303 | return error("Could not read %s", | |
304 | sha1_to_hex(item->object.sha1)); | |
21666f1a | 305 | if (type != OBJ_COMMIT) { |
bd2c39f5 NP |
306 | free(buffer); |
307 | return error("Object %s not a commit", | |
308 | sha1_to_hex(item->object.sha1)); | |
309 | } | |
310 | ret = parse_commit_buffer(item, buffer, size); | |
60ab26de | 311 | if (save_commit_buffer && !ret) { |
3ff1fbbb LT |
312 | item->buffer = buffer; |
313 | return 0; | |
314 | } | |
bd2c39f5 NP |
315 | free(buffer); |
316 | return ret; | |
317 | } | |
318 | ||
ac5155ef | 319 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 320 | { |
812666c8 | 321 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
322 | new_list->item = item; |
323 | new_list->next = *list_p; | |
324 | *list_p = new_list; | |
ac5155ef | 325 | return new_list; |
dd97f850 DB |
326 | } |
327 | ||
175785e5 DB |
328 | void free_commit_list(struct commit_list *list) |
329 | { | |
330 | while (list) { | |
331 | struct commit_list *temp = list; | |
332 | list = temp->next; | |
333 | free(temp); | |
334 | } | |
335 | } | |
dd97f850 | 336 | |
f755494c | 337 | struct commit_list * insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
338 | { |
339 | struct commit_list **pp = list; | |
340 | struct commit_list *p; | |
341 | while ((p = *pp) != NULL) { | |
342 | if (p->item->date < item->date) { | |
343 | break; | |
344 | } | |
345 | pp = &p->next; | |
346 | } | |
f755494c | 347 | return commit_list_insert(item, pp); |
dd97f850 DB |
348 | } |
349 | ||
a6080a0a | 350 | |
dd97f850 DB |
351 | void sort_by_date(struct commit_list **list) |
352 | { | |
353 | struct commit_list *ret = NULL; | |
354 | while (*list) { | |
f755494c | 355 | insert_by_date((*list)->item, &ret); |
dd97f850 DB |
356 | *list = (*list)->next; |
357 | } | |
358 | *list = ret; | |
359 | } | |
360 | ||
58e28af6 DB |
361 | struct commit *pop_most_recent_commit(struct commit_list **list, |
362 | unsigned int mark) | |
dd97f850 DB |
363 | { |
364 | struct commit *ret = (*list)->item; | |
365 | struct commit_list *parents = ret->parents; | |
366 | struct commit_list *old = *list; | |
367 | ||
368 | *list = (*list)->next; | |
369 | free(old); | |
370 | ||
371 | while (parents) { | |
4056c091 | 372 | struct commit *commit = parents->item; |
dec38c81 | 373 | if (!parse_commit(commit) && !(commit->object.flags & mark)) { |
58e28af6 | 374 | commit->object.flags |= mark; |
f755494c | 375 | insert_by_date(commit, list); |
4056c091 | 376 | } |
dd97f850 DB |
377 | parents = parents->next; |
378 | } | |
379 | return ret; | |
380 | } | |
e3bc7a3b | 381 | |
f8f9c73c JH |
382 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
383 | { | |
60fcc2e6 JS |
384 | while (commit) { |
385 | struct commit_list *parents; | |
f8f9c73c | 386 | |
60fcc2e6 JS |
387 | if (!(mark & commit->object.flags)) |
388 | return; | |
58ecf5c1 | 389 | |
60fcc2e6 JS |
390 | commit->object.flags &= ~mark; |
391 | ||
392 | parents = commit->parents; | |
393 | if (!parents) | |
394 | return; | |
395 | ||
396 | while ((parents = parents->next)) | |
397 | clear_commit_marks(parents->item, mark); | |
398 | ||
399 | commit = commit->parents->item; | |
f8f9c73c JH |
400 | } |
401 | } | |
402 | ||
a3437b8c JS |
403 | struct commit *pop_commit(struct commit_list **stack) |
404 | { | |
405 | struct commit_list *top = *stack; | |
406 | struct commit *item = top ? top->item : NULL; | |
407 | ||
408 | if (top) { | |
409 | *stack = top->next; | |
410 | free(top); | |
411 | } | |
412 | return item; | |
413 | } | |
414 | ||
ab580ace JS |
415 | /* |
416 | * Performs an in-place topological sort on the list supplied. | |
417 | */ | |
4c8725f1 | 418 | void sort_in_topological_order(struct commit_list ** list, int lifo) |
6b6dcfc2 | 419 | { |
23c17d4a LT |
420 | struct commit_list *next, *orig = *list; |
421 | struct commit_list *work, **insert; | |
422 | struct commit_list **pptr; | |
a6080a0a | 423 | |
23c17d4a | 424 | if (!orig) |
7d6fb370 | 425 | return; |
23c17d4a LT |
426 | *list = NULL; |
427 | ||
428 | /* Mark them and clear the indegree */ | |
429 | for (next = orig; next; next = next->next) { | |
430 | struct commit *commit = next->item; | |
431 | commit->object.flags |= TOPOSORT; | |
432 | commit->indegree = 0; | |
ab580ace | 433 | } |
23c17d4a | 434 | |
ab580ace | 435 | /* update the indegree */ |
23c17d4a | 436 | for (next = orig; next; next = next->next) { |
ab580ace JS |
437 | struct commit_list * parents = next->item->parents; |
438 | while (parents) { | |
23c17d4a | 439 | struct commit *parent = parents->item; |
6b6dcfc2 | 440 | |
23c17d4a LT |
441 | if (parent->object.flags & TOPOSORT) |
442 | parent->indegree++; | |
443 | parents = parents->next; | |
ab580ace | 444 | } |
ab580ace | 445 | } |
23c17d4a | 446 | |
a6080a0a | 447 | /* |
674d1727 PH |
448 | * find the tips |
449 | * | |
450 | * tips are nodes not reachable from any other node in the list | |
451 | * | |
452 | * the tips serve as a starting set for the work queue. | |
453 | */ | |
23c17d4a | 454 | work = NULL; |
2ed02887 | 455 | insert = &work; |
23c17d4a LT |
456 | for (next = orig; next; next = next->next) { |
457 | struct commit *commit = next->item; | |
ab580ace | 458 | |
23c17d4a LT |
459 | if (!commit->indegree) |
460 | insert = &commit_list_insert(commit, insert)->next; | |
ab580ace | 461 | } |
4c8725f1 | 462 | |
ab580ace | 463 | /* process the list in topological order */ |
4c8725f1 JH |
464 | if (!lifo) |
465 | sort_by_date(&work); | |
23c17d4a LT |
466 | |
467 | pptr = list; | |
468 | *list = NULL; | |
ab580ace | 469 | while (work) { |
23c17d4a LT |
470 | struct commit *commit; |
471 | struct commit_list *parents, *work_item; | |
ab580ace | 472 | |
23c17d4a LT |
473 | work_item = work; |
474 | work = work_item->next; | |
475 | work_item->next = NULL; | |
476 | ||
477 | commit = work_item->item; | |
478 | for (parents = commit->parents; parents ; parents = parents->next) { | |
479 | struct commit *parent=parents->item; | |
480 | ||
481 | if (!(parent->object.flags & TOPOSORT)) | |
482 | continue; | |
483 | ||
484 | /* | |
485 | * parents are only enqueued for emission | |
486 | * when all their children have been emitted thereby | |
487 | * guaranteeing topological order. | |
488 | */ | |
489 | if (!--parent->indegree) { | |
490 | if (!lifo) | |
491 | insert_by_date(parent, &work); | |
492 | else | |
493 | commit_list_insert(parent, &work); | |
ab580ace | 494 | } |
ab580ace JS |
495 | } |
496 | /* | |
674d1727 PH |
497 | * work_item is a commit all of whose children |
498 | * have already been emitted. we can emit it now. | |
499 | */ | |
23c17d4a LT |
500 | commit->object.flags &= ~TOPOSORT; |
501 | *pptr = work_item; | |
502 | pptr = &work_item->next; | |
ab580ace | 503 | } |
ab580ace | 504 | } |
7c6f8aaf | 505 | |
1295228d | 506 | /* merge-base stuff */ |
7c6f8aaf | 507 | |
577ed5c2 JH |
508 | /* bits #0..15 in revision.h */ |
509 | #define PARENT1 (1u<<16) | |
510 | #define PARENT2 (1u<<17) | |
511 | #define STALE (1u<<18) | |
512 | #define RESULT (1u<<19) | |
7c6f8aaf | 513 | |
1295228d JH |
514 | static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT); |
515 | ||
7c6f8aaf JS |
516 | static struct commit *interesting(struct commit_list *list) |
517 | { | |
518 | while (list) { | |
519 | struct commit *commit = list->item; | |
520 | list = list->next; | |
542ccefe | 521 | if (commit->object.flags & STALE) |
7c6f8aaf JS |
522 | continue; |
523 | return commit; | |
524 | } | |
525 | return NULL; | |
526 | } | |
527 | ||
f3249438 | 528 | static struct commit_list *merge_bases(struct commit *one, struct commit *two) |
7c6f8aaf JS |
529 | { |
530 | struct commit_list *list = NULL; | |
531 | struct commit_list *result = NULL; | |
7c6f8aaf | 532 | |
f3249438 JH |
533 | if (one == two) |
534 | /* We do not mark this even with RESULT so we do not | |
535 | * have to clean it up. | |
536 | */ | |
537 | return commit_list_insert(one, &result); | |
7c6f8aaf | 538 | |
172947e6 MK |
539 | if (parse_commit(one)) |
540 | return NULL; | |
541 | if (parse_commit(two)) | |
542 | return NULL; | |
7c6f8aaf | 543 | |
f3249438 JH |
544 | one->object.flags |= PARENT1; |
545 | two->object.flags |= PARENT2; | |
546 | insert_by_date(one, &list); | |
547 | insert_by_date(two, &list); | |
7c6f8aaf JS |
548 | |
549 | while (interesting(list)) { | |
f3249438 | 550 | struct commit *commit; |
7c6f8aaf | 551 | struct commit_list *parents; |
f3249438 JH |
552 | struct commit_list *n; |
553 | int flags; | |
7c6f8aaf | 554 | |
f3249438 JH |
555 | commit = list->item; |
556 | n = list->next; | |
557 | free(list); | |
558 | list = n; | |
7c6f8aaf | 559 | |
f3249438 JH |
560 | flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); |
561 | if (flags == (PARENT1 | PARENT2)) { | |
562 | if (!(commit->object.flags & RESULT)) { | |
563 | commit->object.flags |= RESULT; | |
564 | insert_by_date(commit, &result); | |
565 | } | |
542ccefe JH |
566 | /* Mark parents of a found merge stale */ |
567 | flags |= STALE; | |
7c6f8aaf JS |
568 | } |
569 | parents = commit->parents; | |
570 | while (parents) { | |
571 | struct commit *p = parents->item; | |
572 | parents = parents->next; | |
573 | if ((p->object.flags & flags) == flags) | |
574 | continue; | |
172947e6 MK |
575 | if (parse_commit(p)) |
576 | return NULL; | |
7c6f8aaf JS |
577 | p->object.flags |= flags; |
578 | insert_by_date(p, &list); | |
579 | } | |
580 | } | |
581 | ||
f3249438 | 582 | /* Clean up the result to remove stale ones */ |
1295228d | 583 | free_commit_list(list); |
f3249438 JH |
584 | list = result; result = NULL; |
585 | while (list) { | |
586 | struct commit_list *n = list->next; | |
587 | if (!(list->item->object.flags & STALE)) | |
588 | insert_by_date(list->item, &result); | |
589 | free(list); | |
590 | list = n; | |
591 | } | |
592 | return result; | |
593 | } | |
7c6f8aaf | 594 | |
f3249438 | 595 | struct commit_list *get_merge_bases(struct commit *one, |
674d1727 | 596 | struct commit *two, int cleanup) |
f3249438 | 597 | { |
f3249438 JH |
598 | struct commit_list *list; |
599 | struct commit **rslt; | |
600 | struct commit_list *result; | |
601 | int cnt, i, j; | |
602 | ||
603 | result = merge_bases(one, two); | |
604 | if (one == two) | |
605 | return result; | |
606 | if (!result || !result->next) { | |
607 | if (cleanup) { | |
608 | clear_commit_marks(one, all_flags); | |
609 | clear_commit_marks(two, all_flags); | |
7c6f8aaf | 610 | } |
f3249438 | 611 | return result; |
7c6f8aaf JS |
612 | } |
613 | ||
f3249438 JH |
614 | /* There are more than one */ |
615 | cnt = 0; | |
616 | list = result; | |
617 | while (list) { | |
618 | list = list->next; | |
619 | cnt++; | |
620 | } | |
621 | rslt = xcalloc(cnt, sizeof(*rslt)); | |
622 | for (list = result, i = 0; list; list = list->next) | |
623 | rslt[i++] = list->item; | |
624 | free_commit_list(result); | |
625 | ||
626 | clear_commit_marks(one, all_flags); | |
627 | clear_commit_marks(two, all_flags); | |
628 | for (i = 0; i < cnt - 1; i++) { | |
629 | for (j = i+1; j < cnt; j++) { | |
630 | if (!rslt[i] || !rslt[j]) | |
631 | continue; | |
632 | result = merge_bases(rslt[i], rslt[j]); | |
633 | clear_commit_marks(rslt[i], all_flags); | |
634 | clear_commit_marks(rslt[j], all_flags); | |
635 | for (list = result; list; list = list->next) { | |
636 | if (rslt[i] == list->item) | |
637 | rslt[i] = NULL; | |
638 | if (rslt[j] == list->item) | |
639 | rslt[j] = NULL; | |
640 | } | |
641 | } | |
58ecf5c1 | 642 | } |
7c6f8aaf | 643 | |
f3249438 JH |
644 | /* Surviving ones in rslt[] are the independent results */ |
645 | result = NULL; | |
646 | for (i = 0; i < cnt; i++) { | |
647 | if (rslt[i]) | |
648 | insert_by_date(rslt[i], &result); | |
649 | } | |
650 | free(rslt); | |
7c6f8aaf JS |
651 | return result; |
652 | } | |
2ecd2bbc | 653 | |
03840fc3 | 654 | int in_merge_bases(struct commit *commit, struct commit **reference, int num) |
2ecd2bbc JH |
655 | { |
656 | struct commit_list *bases, *b; | |
657 | int ret = 0; | |
658 | ||
03840fc3 JH |
659 | if (num == 1) |
660 | bases = get_merge_bases(commit, *reference, 1); | |
661 | else | |
662 | die("not yet"); | |
2ecd2bbc | 663 | for (b = bases; b; b = b->next) { |
03840fc3 | 664 | if (!hashcmp(commit->object.sha1, b->item->object.sha1)) { |
2ecd2bbc JH |
665 | ret = 1; |
666 | break; | |
667 | } | |
668 | } | |
669 | ||
670 | free_commit_list(bases); | |
671 | return ret; | |
672 | } |