]>
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" |
175785e5 | 6 | |
60ab26de LT |
7 | int save_commit_buffer = 1; |
8 | ||
ab580ace JS |
9 | struct sort_node |
10 | { | |
11 | /* | |
55c3eb43 TS |
12 | * the number of children of the associated commit |
13 | * that also occur in the list being sorted. | |
14 | */ | |
ab580ace JS |
15 | unsigned int indegree; |
16 | ||
17 | /* | |
55c3eb43 TS |
18 | * reference to original list item that we will re-use |
19 | * on output. | |
20 | */ | |
ab580ace JS |
21 | struct commit_list * list_item; |
22 | ||
23 | }; | |
24 | ||
175785e5 DB |
25 | const char *commit_type = "commit"; |
26 | ||
6cdfd179 EW |
27 | struct cmt_fmt_map { |
28 | const char *n; | |
29 | size_t cmp_len; | |
30 | enum cmit_fmt v; | |
31 | } cmt_fmts[] = { | |
32 | { "raw", 1, CMIT_FMT_RAW }, | |
33 | { "medium", 1, CMIT_FMT_MEDIUM }, | |
34 | { "short", 1, CMIT_FMT_SHORT }, | |
328b710d | 35 | { "email", 1, CMIT_FMT_EMAIL }, |
6cdfd179 EW |
36 | { "full", 5, CMIT_FMT_FULL }, |
37 | { "fuller", 5, CMIT_FMT_FULLER }, | |
38 | { "oneline", 1, CMIT_FMT_ONELINE }, | |
39 | }; | |
40 | ||
9b66ec04 LT |
41 | enum cmit_fmt get_commit_format(const char *arg) |
42 | { | |
6cdfd179 EW |
43 | int i; |
44 | ||
45 | if (!arg || !*arg) | |
9b66ec04 | 46 | return CMIT_FMT_DEFAULT; |
6cdfd179 EW |
47 | if (*arg == '=') |
48 | arg++; | |
49 | for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) { | |
b6936205 EW |
50 | if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) && |
51 | !strncmp(arg, cmt_fmts[i].n, strlen(arg))) | |
6cdfd179 EW |
52 | return cmt_fmts[i].v; |
53 | } | |
54 | ||
55 | die("invalid --pretty format: %s", arg); | |
9b66ec04 LT |
56 | } |
57 | ||
f76412ed JH |
58 | static struct commit *check_commit(struct object *obj, |
59 | const unsigned char *sha1, | |
60 | int quiet) | |
961784ee | 61 | { |
1974632c | 62 | if (obj->type != OBJ_COMMIT) { |
f76412ed JH |
63 | if (!quiet) |
64 | error("Object %s is a %s, not a commit", | |
885a86ab | 65 | sha1_to_hex(sha1), typename(obj->type)); |
961784ee LT |
66 | return NULL; |
67 | } | |
68 | return (struct commit *) obj; | |
69 | } | |
70 | ||
f76412ed JH |
71 | struct commit *lookup_commit_reference_gently(const unsigned char *sha1, |
72 | int quiet) | |
961784ee | 73 | { |
9534f40b | 74 | struct object *obj = deref_tag(parse_object(sha1), NULL, 0); |
961784ee LT |
75 | |
76 | if (!obj) | |
77 | return NULL; | |
f76412ed JH |
78 | return check_commit(obj, sha1, quiet); |
79 | } | |
80 | ||
81 | struct commit *lookup_commit_reference(const unsigned char *sha1) | |
82 | { | |
83 | return lookup_commit_reference_gently(sha1, 0); | |
961784ee LT |
84 | } |
85 | ||
5d6ccf5c | 86 | struct commit *lookup_commit(const unsigned char *sha1) |
175785e5 DB |
87 | { |
88 | struct object *obj = lookup_object(sha1); | |
89 | if (!obj) { | |
855419f7 | 90 | struct commit *ret = alloc_commit_node(); |
175785e5 | 91 | created_object(sha1, &ret->object); |
1974632c | 92 | ret->object.type = OBJ_COMMIT; |
175785e5 DB |
93 | return ret; |
94 | } | |
d1af002d | 95 | if (!obj->type) |
1974632c | 96 | obj->type = OBJ_COMMIT; |
f76412ed | 97 | return check_commit(obj, sha1, 0); |
175785e5 DB |
98 | } |
99 | ||
100 | static unsigned long parse_commit_date(const char *buf) | |
101 | { | |
102 | unsigned long date; | |
103 | ||
104 | if (memcmp(buf, "author", 6)) | |
105 | return 0; | |
106 | while (*buf++ != '\n') | |
107 | /* nada */; | |
108 | if (memcmp(buf, "committer", 9)) | |
109 | return 0; | |
110 | while (*buf++ != '>') | |
111 | /* nada */; | |
112 | date = strtoul(buf, NULL, 10); | |
113 | if (date == ULONG_MAX) | |
114 | date = 0; | |
115 | return date; | |
116 | } | |
117 | ||
5040f17e | 118 | static struct commit_graft **commit_graft; |
5da5c8f4 JH |
119 | static int commit_graft_alloc, commit_graft_nr; |
120 | ||
121 | static int commit_graft_pos(const unsigned char *sha1) | |
122 | { | |
123 | int lo, hi; | |
124 | lo = 0; | |
125 | hi = commit_graft_nr; | |
126 | while (lo < hi) { | |
127 | int mi = (lo + hi) / 2; | |
128 | struct commit_graft *graft = commit_graft[mi]; | |
a89fccd2 | 129 | int cmp = hashcmp(sha1, graft->sha1); |
5da5c8f4 JH |
130 | if (!cmp) |
131 | return mi; | |
132 | if (cmp < 0) | |
133 | hi = mi; | |
134 | else | |
135 | lo = mi + 1; | |
136 | } | |
137 | return -lo - 1; | |
138 | } | |
139 | ||
5040f17e JH |
140 | int register_commit_graft(struct commit_graft *graft, int ignore_dups) |
141 | { | |
142 | int pos = commit_graft_pos(graft->sha1); | |
143 | ||
144 | if (0 <= pos) { | |
145 | if (ignore_dups) | |
146 | free(graft); | |
147 | else { | |
148 | free(commit_graft[pos]); | |
149 | commit_graft[pos] = graft; | |
150 | } | |
151 | return 1; | |
152 | } | |
153 | pos = -pos - 1; | |
154 | if (commit_graft_alloc <= ++commit_graft_nr) { | |
155 | commit_graft_alloc = alloc_nr(commit_graft_alloc); | |
156 | commit_graft = xrealloc(commit_graft, | |
157 | sizeof(*commit_graft) * | |
158 | commit_graft_alloc); | |
159 | } | |
160 | if (pos < commit_graft_nr) | |
161 | memmove(commit_graft + pos + 1, | |
162 | commit_graft + pos, | |
163 | (commit_graft_nr - pos - 1) * | |
164 | sizeof(*commit_graft)); | |
165 | commit_graft[pos] = graft; | |
166 | return 0; | |
167 | } | |
168 | ||
169 | struct commit_graft *read_graft_line(char *buf, int len) | |
170 | { | |
171 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
172 | int i; | |
173 | struct commit_graft *graft = NULL; | |
174 | ||
175 | if (buf[len-1] == '\n') | |
176 | buf[--len] = 0; | |
360204c3 | 177 | if (buf[0] == '#' || buf[0] == '\0') |
5bc4ce58 | 178 | return NULL; |
5040f17e JH |
179 | if ((len + 1) % 41) { |
180 | bad_graft_data: | |
181 | error("bad graft data: %s", buf); | |
182 | free(graft); | |
183 | return NULL; | |
184 | } | |
185 | i = (len + 1) / 41 - 1; | |
186 | graft = xmalloc(sizeof(*graft) + 20 * i); | |
187 | graft->nr_parent = i; | |
188 | if (get_sha1_hex(buf, graft->sha1)) | |
189 | goto bad_graft_data; | |
190 | for (i = 40; i < len; i += 41) { | |
191 | if (buf[i] != ' ') | |
192 | goto bad_graft_data; | |
193 | if (get_sha1_hex(buf + i + 1, graft->parent[i/41])) | |
194 | goto bad_graft_data; | |
195 | } | |
196 | return graft; | |
197 | } | |
198 | ||
199 | int read_graft_file(const char *graft_file) | |
5da5c8f4 | 200 | { |
5da5c8f4 JH |
201 | FILE *fp = fopen(graft_file, "r"); |
202 | char buf[1024]; | |
5040f17e JH |
203 | if (!fp) |
204 | return -1; | |
5da5c8f4 JH |
205 | while (fgets(buf, sizeof(buf), fp)) { |
206 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
207 | int len = strlen(buf); | |
5040f17e | 208 | struct commit_graft *graft = read_graft_line(buf, len); |
5bc4ce58 JH |
209 | if (!graft) |
210 | continue; | |
5040f17e | 211 | if (register_commit_graft(graft, 1)) |
5da5c8f4 | 212 | error("duplicate graft data: %s", buf); |
5da5c8f4 JH |
213 | } |
214 | fclose(fp); | |
5040f17e JH |
215 | return 0; |
216 | } | |
217 | ||
218 | static void prepare_commit_graft(void) | |
219 | { | |
220 | static int commit_graft_prepared; | |
221 | char *graft_file; | |
222 | ||
223 | if (commit_graft_prepared) | |
224 | return; | |
225 | graft_file = get_graft_file(); | |
226 | read_graft_file(graft_file); | |
ed09aef0 JS |
227 | /* make sure shallows are read */ |
228 | is_repository_shallow(); | |
5040f17e | 229 | commit_graft_prepared = 1; |
5da5c8f4 JH |
230 | } |
231 | ||
232 | static struct commit_graft *lookup_commit_graft(const unsigned char *sha1) | |
233 | { | |
234 | int pos; | |
5040f17e | 235 | prepare_commit_graft(); |
5da5c8f4 JH |
236 | pos = commit_graft_pos(sha1); |
237 | if (pos < 0) | |
238 | return NULL; | |
239 | return commit_graft[pos]; | |
240 | } | |
241 | ||
ed09aef0 JS |
242 | int write_shallow_commits(int fd, int use_pack_protocol) |
243 | { | |
244 | int i, count = 0; | |
245 | for (i = 0; i < commit_graft_nr; i++) | |
246 | if (commit_graft[i]->nr_parent < 0) { | |
247 | const char *hex = | |
248 | sha1_to_hex(commit_graft[i]->sha1); | |
249 | count++; | |
250 | if (use_pack_protocol) | |
251 | packet_write(fd, "shallow %s", hex); | |
252 | else { | |
93822c22 AW |
253 | if (write_in_full(fd, hex, 40) != 40) |
254 | break; | |
255 | if (write_in_full(fd, "\n", 1) != 1) | |
256 | break; | |
ed09aef0 JS |
257 | } |
258 | } | |
259 | return count; | |
260 | } | |
261 | ||
f53514bc JS |
262 | int unregister_shallow(const unsigned char *sha1) |
263 | { | |
264 | int pos = commit_graft_pos(sha1); | |
265 | if (pos < 0) | |
266 | return -1; | |
267 | if (pos + 1 < commit_graft_nr) | |
268 | memcpy(commit_graft + pos, commit_graft + pos + 1, | |
269 | sizeof(struct commit_graft *) | |
270 | * (commit_graft_nr - pos - 1)); | |
271 | commit_graft_nr--; | |
272 | return 0; | |
273 | } | |
274 | ||
bd2c39f5 | 275 | int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size) |
175785e5 | 276 | { |
3b44f15a | 277 | char *tail = buffer; |
f7cc77d7 | 278 | char *bufptr = buffer; |
175785e5 | 279 | unsigned char parent[20]; |
6c88be16 | 280 | struct commit_list **pptr; |
5da5c8f4 | 281 | struct commit_graft *graft; |
27dedf0c | 282 | unsigned n_refs = 0; |
bd2c39f5 | 283 | |
175785e5 DB |
284 | if (item->object.parsed) |
285 | return 0; | |
286 | item->object.parsed = 1; | |
3b44f15a JH |
287 | tail += size; |
288 | if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5)) | |
f7cc77d7 | 289 | return error("bogus commit object %s", sha1_to_hex(item->object.sha1)); |
3b44f15a | 290 | if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0) |
bd2afde8 JH |
291 | return error("bad tree pointer in commit %s", |
292 | sha1_to_hex(item->object.sha1)); | |
175785e5 | 293 | item->tree = lookup_tree(parent); |
235ac407 | 294 | if (item->tree) |
27dedf0c | 295 | n_refs++; |
175785e5 | 296 | bufptr += 46; /* "tree " + "hex sha1" + "\n" */ |
6c88be16 | 297 | pptr = &item->parents; |
5da5c8f4 JH |
298 | |
299 | graft = lookup_commit_graft(item->object.sha1); | |
3b44f15a | 300 | while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
301 | struct commit *new_parent; |
302 | ||
3b44f15a JH |
303 | if (tail <= bufptr + 48 || |
304 | get_sha1_hex(bufptr + 7, parent) || | |
305 | bufptr[47] != '\n') | |
f7cc77d7 | 306 | return error("bad parents in commit %s", sha1_to_hex(item->object.sha1)); |
5da5c8f4 JH |
307 | bufptr += 48; |
308 | if (graft) | |
309 | continue; | |
f7cc77d7 | 310 | new_parent = lookup_commit(parent); |
235ac407 | 311 | if (new_parent) { |
6c88be16 | 312 | pptr = &commit_list_insert(new_parent, pptr)->next; |
27dedf0c | 313 | n_refs++; |
235ac407 | 314 | } |
5da5c8f4 JH |
315 | } |
316 | if (graft) { | |
317 | int i; | |
318 | struct commit *new_parent; | |
319 | for (i = 0; i < graft->nr_parent; i++) { | |
320 | new_parent = lookup_commit(graft->parent[i]); | |
321 | if (!new_parent) | |
322 | continue; | |
323 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
27dedf0c | 324 | n_refs++; |
5da5c8f4 | 325 | } |
175785e5 DB |
326 | } |
327 | item->date = parse_commit_date(bufptr); | |
27dedf0c JH |
328 | |
329 | if (track_object_refs) { | |
330 | unsigned i = 0; | |
331 | struct commit_list *p; | |
332 | struct object_refs *refs = alloc_object_refs(n_refs); | |
333 | if (item->tree) | |
334 | refs->ref[i++] = &item->tree->object; | |
335 | for (p = item->parents; p; p = p->next) | |
336 | refs->ref[i++] = &p->item->object; | |
337 | set_object_refs(&item->object, refs); | |
338 | } | |
339 | ||
175785e5 DB |
340 | return 0; |
341 | } | |
342 | ||
bd2c39f5 NP |
343 | int parse_commit(struct commit *item) |
344 | { | |
345 | char type[20]; | |
346 | void *buffer; | |
347 | unsigned long size; | |
348 | int ret; | |
349 | ||
350 | if (item->object.parsed) | |
351 | return 0; | |
352 | buffer = read_sha1_file(item->object.sha1, type, &size); | |
353 | if (!buffer) | |
354 | return error("Could not read %s", | |
355 | sha1_to_hex(item->object.sha1)); | |
356 | if (strcmp(type, commit_type)) { | |
357 | free(buffer); | |
358 | return error("Object %s not a commit", | |
359 | sha1_to_hex(item->object.sha1)); | |
360 | } | |
361 | ret = parse_commit_buffer(item, buffer, size); | |
60ab26de | 362 | if (save_commit_buffer && !ret) { |
3ff1fbbb LT |
363 | item->buffer = buffer; |
364 | return 0; | |
365 | } | |
bd2c39f5 NP |
366 | free(buffer); |
367 | return ret; | |
368 | } | |
369 | ||
ac5155ef | 370 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 371 | { |
812666c8 | 372 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
373 | new_list->item = item; |
374 | new_list->next = *list_p; | |
375 | *list_p = new_list; | |
ac5155ef | 376 | return new_list; |
dd97f850 DB |
377 | } |
378 | ||
175785e5 DB |
379 | void free_commit_list(struct commit_list *list) |
380 | { | |
381 | while (list) { | |
382 | struct commit_list *temp = list; | |
383 | list = temp->next; | |
384 | free(temp); | |
385 | } | |
386 | } | |
dd97f850 | 387 | |
f755494c | 388 | struct commit_list * insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
389 | { |
390 | struct commit_list **pp = list; | |
391 | struct commit_list *p; | |
392 | while ((p = *pp) != NULL) { | |
393 | if (p->item->date < item->date) { | |
394 | break; | |
395 | } | |
396 | pp = &p->next; | |
397 | } | |
f755494c | 398 | return commit_list_insert(item, pp); |
dd97f850 DB |
399 | } |
400 | ||
401 | ||
402 | void sort_by_date(struct commit_list **list) | |
403 | { | |
404 | struct commit_list *ret = NULL; | |
405 | while (*list) { | |
f755494c | 406 | insert_by_date((*list)->item, &ret); |
dd97f850 DB |
407 | *list = (*list)->next; |
408 | } | |
409 | *list = ret; | |
410 | } | |
411 | ||
58e28af6 DB |
412 | struct commit *pop_most_recent_commit(struct commit_list **list, |
413 | unsigned int mark) | |
dd97f850 DB |
414 | { |
415 | struct commit *ret = (*list)->item; | |
416 | struct commit_list *parents = ret->parents; | |
417 | struct commit_list *old = *list; | |
418 | ||
419 | *list = (*list)->next; | |
420 | free(old); | |
421 | ||
422 | while (parents) { | |
4056c091 | 423 | struct commit *commit = parents->item; |
58e28af6 DB |
424 | parse_commit(commit); |
425 | if (!(commit->object.flags & mark)) { | |
426 | commit->object.flags |= mark; | |
f755494c | 427 | insert_by_date(commit, list); |
4056c091 | 428 | } |
dd97f850 DB |
429 | parents = parents->next; |
430 | } | |
431 | return ret; | |
432 | } | |
e3bc7a3b | 433 | |
f8f9c73c JH |
434 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
435 | { | |
436 | struct commit_list *parents; | |
437 | ||
f8f9c73c | 438 | commit->object.flags &= ~mark; |
58ecf5c1 | 439 | parents = commit->parents; |
f8f9c73c | 440 | while (parents) { |
160b7983 | 441 | struct commit *parent = parents->item; |
58ecf5c1 JH |
442 | |
443 | /* Have we already cleared this? */ | |
444 | if (mark & parent->object.flags) | |
160b7983 | 445 | clear_commit_marks(parent, mark); |
f8f9c73c JH |
446 | parents = parents->next; |
447 | } | |
448 | } | |
449 | ||
e3bc7a3b LT |
450 | /* |
451 | * Generic support for pretty-printing the header | |
452 | */ | |
453 | static int get_one_line(const char *msg, unsigned long len) | |
454 | { | |
455 | int ret = 0; | |
456 | ||
457 | while (len--) { | |
458 | char c = *msg++; | |
684958ae LT |
459 | if (!c) |
460 | break; | |
e3bc7a3b LT |
461 | ret++; |
462 | if (c == '\n') | |
463 | break; | |
e3bc7a3b LT |
464 | } |
465 | return ret; | |
466 | } | |
467 | ||
f7e68b29 JH |
468 | /* High bit set, or ISO-2022-INT */ |
469 | static int non_ascii(int ch) | |
470 | { | |
471 | ch = (ch & 0xff); | |
472 | return ((ch & 0x80) || (ch == 0x1b)); | |
473 | } | |
474 | ||
cdd406e3 JH |
475 | static int is_rfc2047_special(char ch) |
476 | { | |
f7e68b29 | 477 | return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_')); |
cdd406e3 JH |
478 | } |
479 | ||
f7e68b29 JH |
480 | static int add_rfc2047(char *buf, const char *line, int len, |
481 | const char *encoding) | |
cdd406e3 JH |
482 | { |
483 | char *bp = buf; | |
484 | int i, needquote; | |
f7e68b29 JH |
485 | char q_encoding[128]; |
486 | const char *q_encoding_fmt = "=?%s?q?"; | |
cdd406e3 JH |
487 | |
488 | for (i = needquote = 0; !needquote && i < len; i++) { | |
f7e68b29 JH |
489 | int ch = line[i]; |
490 | if (non_ascii(ch)) | |
cdd406e3 JH |
491 | needquote++; |
492 | if ((i + 1 < len) && | |
493 | (ch == '=' && line[i+1] == '?')) | |
494 | needquote++; | |
495 | } | |
496 | if (!needquote) | |
497 | return sprintf(buf, "%.*s", len, line); | |
498 | ||
f7e68b29 JH |
499 | i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding); |
500 | if (sizeof(q_encoding) < i) | |
501 | die("Insanely long encoding name %s", encoding); | |
502 | memcpy(bp, q_encoding, i); | |
503 | bp += i; | |
cdd406e3 | 504 | for (i = 0; i < len; i++) { |
0da46771 | 505 | unsigned ch = line[i] & 0xFF; |
cdd406e3 JH |
506 | if (is_rfc2047_special(ch)) { |
507 | sprintf(bp, "=%02X", ch); | |
508 | bp += 3; | |
509 | } | |
510 | else if (ch == ' ') | |
511 | *bp++ = '_'; | |
512 | else | |
513 | *bp++ = ch; | |
514 | } | |
515 | memcpy(bp, "?=", 2); | |
516 | bp += 2; | |
517 | return bp - buf; | |
518 | } | |
519 | ||
3dfb9278 | 520 | static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, |
f7e68b29 JH |
521 | const char *line, int relative_date, |
522 | const char *encoding) | |
e3bc7a3b LT |
523 | { |
524 | char *date; | |
5de36bfe | 525 | int namelen; |
e3bc7a3b | 526 | unsigned long time; |
000182ea | 527 | int tz, ret; |
ff56fe1c | 528 | const char *filler = " "; |
e3bc7a3b | 529 | |
d87449c5 JH |
530 | if (fmt == CMIT_FMT_ONELINE) |
531 | return 0; | |
e3bc7a3b LT |
532 | date = strchr(line, '>'); |
533 | if (!date) | |
534 | return 0; | |
535 | namelen = ++date - line; | |
536 | time = strtoul(date, &date, 10); | |
537 | tz = strtol(date, NULL, 10); | |
538 | ||
3eefc189 | 539 | if (fmt == CMIT_FMT_EMAIL) { |
cdd406e3 JH |
540 | char *name_tail = strchr(line, '<'); |
541 | int display_name_length; | |
542 | if (!name_tail) | |
543 | return 0; | |
544 | while (line < name_tail && isspace(name_tail[-1])) | |
545 | name_tail--; | |
546 | display_name_length = name_tail - line; | |
3eefc189 | 547 | filler = ""; |
cdd406e3 JH |
548 | strcpy(buf, "From: "); |
549 | ret = strlen(buf); | |
f7e68b29 JH |
550 | ret += add_rfc2047(buf + ret, line, display_name_length, |
551 | encoding); | |
cdd406e3 JH |
552 | memcpy(buf + ret, name_tail, namelen - display_name_length); |
553 | ret += namelen - display_name_length; | |
554 | buf[ret++] = '\n'; | |
555 | } | |
556 | else { | |
557 | ret = sprintf(buf, "%s: %.*s%.*s\n", what, | |
558 | (fmt == CMIT_FMT_FULLER) ? 4 : 0, | |
559 | filler, namelen, line); | |
3eefc189 | 560 | } |
ff56fe1c JH |
561 | switch (fmt) { |
562 | case CMIT_FMT_MEDIUM: | |
3dfb9278 JF |
563 | ret += sprintf(buf + ret, "Date: %s\n", |
564 | show_date(time, tz, relative_date)); | |
ff56fe1c | 565 | break; |
3eefc189 | 566 | case CMIT_FMT_EMAIL: |
2a387043 JH |
567 | ret += sprintf(buf + ret, "Date: %s\n", |
568 | show_rfc2822_date(time, tz)); | |
3eefc189 | 569 | break; |
ff56fe1c | 570 | case CMIT_FMT_FULLER: |
3dfb9278 JF |
571 | ret += sprintf(buf + ret, "%sDate: %s\n", what, |
572 | show_date(time, tz, relative_date)); | |
ff56fe1c JH |
573 | break; |
574 | default: | |
575 | /* notin' */ | |
576 | break; | |
577 | } | |
000182ea LT |
578 | return ret; |
579 | } | |
580 | ||
3eefc189 | 581 | static int is_empty_line(const char *line, int *len_p) |
000182ea | 582 | { |
3eefc189 | 583 | int len = *len_p; |
000182ea LT |
584 | while (len && isspace(line[len-1])) |
585 | len--; | |
3eefc189 | 586 | *len_p = len; |
000182ea | 587 | return !len; |
e3bc7a3b LT |
588 | } |
589 | ||
f2d42275 | 590 | static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev) |
28342a5d | 591 | { |
f2d42275 JH |
592 | struct commit_list *parent = commit->parents; |
593 | int offset; | |
d87449c5 | 594 | |
3eefc189 JH |
595 | if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) || |
596 | !parent || !parent->next) | |
f2d42275 JH |
597 | return 0; |
598 | ||
599 | offset = sprintf(buf, "Merge:"); | |
600 | ||
601 | while (parent) { | |
602 | struct commit *p = parent->item; | |
14763e7b EW |
603 | const char *hex = NULL; |
604 | const char *dots; | |
605 | if (abbrev) | |
606 | hex = find_unique_abbrev(p->object.sha1, abbrev); | |
607 | if (!hex) | |
608 | hex = sha1_to_hex(p->object.sha1); | |
609 | dots = (abbrev && strlen(hex) != 40) ? "..." : ""; | |
f2d42275 JH |
610 | parent = parent->next; |
611 | ||
6bfb27a0 | 612 | offset += sprintf(buf + offset, " %s%s", hex, dots); |
28342a5d | 613 | } |
f2d42275 | 614 | buf[offset++] = '\n'; |
28342a5d LT |
615 | return offset; |
616 | } | |
617 | ||
52883fbd JH |
618 | static char *get_header(const struct commit *commit, const char *key) |
619 | { | |
620 | int key_len = strlen(key); | |
621 | const char *line = commit->buffer; | |
622 | ||
623 | for (;;) { | |
624 | const char *eol = strchr(line, '\n'), *next; | |
625 | ||
626 | if (line == eol) | |
627 | return NULL; | |
628 | if (!eol) { | |
629 | eol = line + strlen(line); | |
630 | next = NULL; | |
631 | } else | |
632 | next = eol + 1; | |
633 | if (!strncmp(line, key, key_len) && line[key_len] == ' ') { | |
634 | int len = eol - line - key_len; | |
635 | char *ret = xmalloc(len); | |
636 | memcpy(ret, line + key_len + 1, len - 1); | |
637 | ret[len - 1] = '\0'; | |
638 | return ret; | |
639 | } | |
640 | line = next; | |
641 | } | |
642 | } | |
643 | ||
53af9816 JH |
644 | static char *replace_encoding_header(char *buf, char *encoding) |
645 | { | |
646 | char *encoding_header = strstr(buf, "\nencoding "); | |
647 | char *end_of_encoding_header; | |
648 | int encoding_header_pos; | |
649 | int encoding_header_len; | |
650 | int new_len; | |
651 | int need_len; | |
652 | int buflen = strlen(buf) + 1; | |
653 | ||
654 | if (!encoding_header) | |
655 | return buf; /* should not happen but be defensive */ | |
656 | encoding_header++; | |
657 | end_of_encoding_header = strchr(encoding_header, '\n'); | |
658 | if (!end_of_encoding_header) | |
659 | return buf; /* should not happen but be defensive */ | |
660 | end_of_encoding_header++; | |
661 | ||
662 | encoding_header_len = end_of_encoding_header - encoding_header; | |
663 | encoding_header_pos = encoding_header - buf; | |
664 | ||
665 | if (is_encoding_utf8(encoding)) { | |
666 | /* we have re-coded to UTF-8; drop the header */ | |
667 | memmove(encoding_header, end_of_encoding_header, | |
668 | buflen - (encoding_header_pos + encoding_header_len)); | |
669 | return buf; | |
670 | } | |
671 | new_len = strlen(encoding); | |
672 | need_len = new_len + strlen("encoding \n"); | |
673 | if (encoding_header_len < need_len) { | |
674 | buf = xrealloc(buf, buflen + (need_len - encoding_header_len)); | |
675 | encoding_header = buf + encoding_header_pos; | |
676 | end_of_encoding_header = encoding_header + encoding_header_len; | |
677 | } | |
678 | memmove(end_of_encoding_header + (need_len - encoding_header_len), | |
679 | end_of_encoding_header, | |
680 | buflen - (encoding_header_pos + encoding_header_len)); | |
681 | memcpy(encoding_header + 9, encoding, strlen(encoding)); | |
682 | encoding_header[9 + new_len] = '\n'; | |
683 | return buf; | |
684 | } | |
685 | ||
f7e68b29 JH |
686 | static char *logmsg_reencode(const struct commit *commit, |
687 | char *output_encoding) | |
52883fbd | 688 | { |
d2c11a38 | 689 | char *encoding; |
52883fbd | 690 | char *out; |
f7e68b29 | 691 | char *utf8 = "utf-8"; |
52883fbd | 692 | |
f7e68b29 | 693 | if (!*output_encoding) |
52883fbd | 694 | return NULL; |
d2c11a38 | 695 | encoding = get_header(commit, "encoding"); |
e90068a9 | 696 | if (!encoding) |
f7e68b29 | 697 | encoding = utf8; |
e90068a9 JH |
698 | if (!strcmp(encoding, output_encoding)) |
699 | out = strdup(commit->buffer); | |
700 | else | |
701 | out = reencode_string(commit->buffer, | |
702 | output_encoding, encoding); | |
53af9816 JH |
703 | if (out) |
704 | out = replace_encoding_header(out, output_encoding); | |
705 | ||
f7e68b29 JH |
706 | if (encoding != utf8) |
707 | free(encoding); | |
52883fbd JH |
708 | if (!out) |
709 | return NULL; | |
710 | return out; | |
711 | } | |
712 | ||
713 | unsigned long pretty_print_commit(enum cmit_fmt fmt, | |
714 | const struct commit *commit, | |
715 | unsigned long len, | |
716 | char *buf, unsigned long space, | |
3dfb9278 | 717 | int abbrev, const char *subject, |
52883fbd JH |
718 | const char *after_subject, |
719 | int relative_date) | |
e3bc7a3b | 720 | { |
f3a47405 | 721 | int hdr = 1, body = 0, seen_title = 0; |
e3bc7a3b | 722 | unsigned long offset = 0; |
3eefc189 | 723 | int indent = 4; |
f2d42275 | 724 | int parents_shown = 0; |
3815f423 | 725 | const char *msg = commit->buffer; |
c831da66 | 726 | int plain_non_ascii = 0; |
f7e68b29 JH |
727 | char *reencoded; |
728 | char *encoding; | |
52883fbd | 729 | |
f7e68b29 JH |
730 | encoding = (git_log_output_encoding |
731 | ? git_log_output_encoding | |
732 | : git_commit_encoding); | |
733 | if (!encoding) | |
734 | encoding = "utf-8"; | |
735 | reencoded = logmsg_reencode(commit, encoding); | |
d2c11a38 JH |
736 | if (reencoded) |
737 | msg = reencoded; | |
3eefc189 | 738 | |
3eefc189 JH |
739 | if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL) |
740 | indent = 0; | |
e3bc7a3b | 741 | |
c831da66 JH |
742 | /* After-subject is used to pass in Content-Type: multipart |
743 | * MIME header; in that case we do not have to do the | |
744 | * plaintext content type even if the commit message has | |
745 | * non 7-bit ASCII character. Otherwise, check if we need | |
746 | * to say this is not a 7-bit ASCII. | |
747 | */ | |
748 | if (fmt == CMIT_FMT_EMAIL && !after_subject) { | |
0da46771 JH |
749 | int i, ch, in_body; |
750 | ||
751 | for (in_body = i = 0; (ch = msg[i]) && i < len; i++) { | |
752 | if (!in_body) { | |
753 | /* author could be non 7-bit ASCII but | |
d2c11a38 | 754 | * the log may be so; skip over the |
0da46771 JH |
755 | * header part first. |
756 | */ | |
757 | if (ch == '\n' && | |
758 | i + 1 < len && msg[i+1] == '\n') | |
759 | in_body = 1; | |
760 | } | |
f7e68b29 | 761 | else if (non_ascii(ch)) { |
c831da66 | 762 | plain_non_ascii = 1; |
0da46771 JH |
763 | break; |
764 | } | |
765 | } | |
c831da66 JH |
766 | } |
767 | ||
e3bc7a3b LT |
768 | for (;;) { |
769 | const char *line = msg; | |
770 | int linelen = get_one_line(msg, len); | |
771 | ||
772 | if (!linelen) | |
773 | break; | |
774 | ||
775 | /* | |
776 | * We want some slop for indentation and a possible | |
777 | * final "...". Thus the "+ 20". | |
778 | */ | |
779 | if (offset + linelen + 20 > space) { | |
780 | memcpy(buf + offset, " ...\n", 8); | |
781 | offset += 8; | |
782 | break; | |
783 | } | |
784 | ||
785 | msg += linelen; | |
786 | len -= linelen; | |
e3bc7a3b | 787 | if (hdr) { |
000182ea LT |
788 | if (linelen == 1) { |
789 | hdr = 0; | |
3eefc189 | 790 | if ((fmt != CMIT_FMT_ONELINE) && !subject) |
d87449c5 | 791 | buf[offset++] = '\n'; |
000182ea LT |
792 | continue; |
793 | } | |
794 | if (fmt == CMIT_FMT_RAW) { | |
795 | memcpy(buf + offset, line, linelen); | |
796 | offset += linelen; | |
797 | continue; | |
798 | } | |
28342a5d LT |
799 | if (!memcmp(line, "parent ", 7)) { |
800 | if (linelen != 48) | |
801 | die("bad parent line in commit"); | |
f2d42275 | 802 | continue; |
28342a5d | 803 | } |
ff56fe1c | 804 | |
f2d42275 JH |
805 | if (!parents_shown) { |
806 | offset += add_merge_info(fmt, buf + offset, | |
807 | commit, abbrev); | |
808 | parents_shown = 1; | |
809 | continue; | |
810 | } | |
ff56fe1c JH |
811 | /* |
812 | * MEDIUM == DEFAULT shows only author with dates. | |
813 | * FULL shows both authors but not dates. | |
814 | * FULLER shows both authors and dates. | |
815 | */ | |
e3bc7a3b | 816 | if (!memcmp(line, "author ", 7)) |
ff56fe1c JH |
817 | offset += add_user_info("Author", fmt, |
818 | buf + offset, | |
3dfb9278 | 819 | line + 7, |
f7e68b29 JH |
820 | relative_date, |
821 | encoding); | |
ff56fe1c JH |
822 | if (!memcmp(line, "committer ", 10) && |
823 | (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) | |
824 | offset += add_user_info("Commit", fmt, | |
825 | buf + offset, | |
3dfb9278 | 826 | line + 10, |
f7e68b29 JH |
827 | relative_date, |
828 | encoding); | |
e3bc7a3b LT |
829 | continue; |
830 | } | |
000182ea | 831 | |
19b3bd3e RS |
832 | if (!subject) |
833 | body = 1; | |
834 | ||
3eefc189 | 835 | if (is_empty_line(line, &linelen)) { |
f3a47405 LH |
836 | if (!seen_title) |
837 | continue; | |
000182ea LT |
838 | if (!body) |
839 | continue; | |
3eefc189 JH |
840 | if (subject) |
841 | continue; | |
000182ea LT |
842 | if (fmt == CMIT_FMT_SHORT) |
843 | break; | |
000182ea | 844 | } |
d87449c5 | 845 | |
f3a47405 | 846 | seen_title = 1; |
3eefc189 | 847 | if (subject) { |
53f420ef JH |
848 | int slen = strlen(subject); |
849 | memcpy(buf + offset, subject, slen); | |
850 | offset += slen; | |
f7e68b29 JH |
851 | offset += add_rfc2047(buf + offset, line, linelen, |
852 | encoding); | |
cdd406e3 JH |
853 | } |
854 | else { | |
855 | memset(buf + offset, ' ', indent); | |
856 | memcpy(buf + offset + indent, line, linelen); | |
857 | offset += linelen + indent; | |
3eefc189 | 858 | } |
3eefc189 | 859 | buf[offset++] = '\n'; |
d87449c5 JH |
860 | if (fmt == CMIT_FMT_ONELINE) |
861 | break; | |
c831da66 | 862 | if (subject && plain_non_ascii) { |
f7e68b29 JH |
863 | int sz; |
864 | char header[512]; | |
865 | const char *header_fmt = | |
866 | "Content-Type: text/plain; charset=%s\n" | |
cdd406e3 | 867 | "Content-Transfer-Encoding: 8bit\n"; |
f7e68b29 JH |
868 | sz = snprintf(header, sizeof(header), header_fmt, |
869 | encoding); | |
870 | if (sizeof(header) < sz) | |
871 | die("Encoding name %s too long", encoding); | |
872 | memcpy(buf + offset, header, sz); | |
873 | offset += sz; | |
cdd406e3 | 874 | } |
698ce6f8 JS |
875 | if (after_subject) { |
876 | int slen = strlen(after_subject); | |
877 | if (slen > space - offset - 1) | |
878 | slen = space - offset - 1; | |
879 | memcpy(buf + offset, after_subject, slen); | |
880 | offset += slen; | |
881 | after_subject = NULL; | |
882 | } | |
3eefc189 | 883 | subject = NULL; |
d87449c5 | 884 | } |
40c2fe00 LT |
885 | while (offset && isspace(buf[offset-1])) |
886 | offset--; | |
887 | /* Make sure there is an EOLN for the non-oneline case */ | |
888 | if (fmt != CMIT_FMT_ONELINE) | |
889 | buf[offset++] = '\n'; | |
19b3bd3e RS |
890 | /* |
891 | * make sure there is another EOLN to separate the headers from whatever | |
892 | * body the caller appends if we haven't already written a body | |
893 | */ | |
894 | if (fmt == CMIT_FMT_EMAIL && !body) | |
895 | buf[offset++] = '\n'; | |
e3bc7a3b | 896 | buf[offset] = '\0'; |
52883fbd JH |
897 | |
898 | free(reencoded); | |
e3bc7a3b LT |
899 | return offset; |
900 | } | |
a3437b8c JS |
901 | |
902 | struct commit *pop_commit(struct commit_list **stack) | |
903 | { | |
904 | struct commit_list *top = *stack; | |
905 | struct commit *item = top ? top->item : NULL; | |
906 | ||
907 | if (top) { | |
908 | *stack = top->next; | |
909 | free(top); | |
910 | } | |
911 | return item; | |
912 | } | |
913 | ||
914 | int count_parents(struct commit * commit) | |
915 | { | |
96f1e58f | 916 | int count; |
a3437b8c | 917 | struct commit_list * parents = commit->parents; |
96f1e58f DR |
918 | for (count = 0; parents; parents = parents->next,count++) |
919 | ; | |
a3437b8c JS |
920 | return count; |
921 | } | |
922 | ||
6b6dcfc2 FK |
923 | void topo_sort_default_setter(struct commit *c, void *data) |
924 | { | |
d3ff6f55 | 925 | c->util = data; |
6b6dcfc2 FK |
926 | } |
927 | ||
928 | void *topo_sort_default_getter(struct commit *c) | |
929 | { | |
d3ff6f55 | 930 | return c->util; |
6b6dcfc2 FK |
931 | } |
932 | ||
ab580ace JS |
933 | /* |
934 | * Performs an in-place topological sort on the list supplied. | |
935 | */ | |
4c8725f1 | 936 | void sort_in_topological_order(struct commit_list ** list, int lifo) |
6b6dcfc2 FK |
937 | { |
938 | sort_in_topological_order_fn(list, lifo, topo_sort_default_setter, | |
939 | topo_sort_default_getter); | |
940 | } | |
941 | ||
942 | void sort_in_topological_order_fn(struct commit_list ** list, int lifo, | |
943 | topo_sort_set_fn_t setter, | |
944 | topo_sort_get_fn_t getter) | |
ab580ace JS |
945 | { |
946 | struct commit_list * next = *list; | |
2ed02887 | 947 | struct commit_list * work = NULL, **insert; |
ab580ace JS |
948 | struct commit_list ** pptr = list; |
949 | struct sort_node * nodes; | |
950 | struct sort_node * next_nodes; | |
951 | int count = 0; | |
952 | ||
953 | /* determine the size of the list */ | |
954 | while (next) { | |
955 | next = next->next; | |
956 | count++; | |
957 | } | |
7d6fb370 EW |
958 | |
959 | if (!count) | |
960 | return; | |
ab580ace JS |
961 | /* allocate an array to help sort the list */ |
962 | nodes = xcalloc(count, sizeof(*nodes)); | |
963 | /* link the list to the array */ | |
964 | next_nodes = nodes; | |
965 | next=*list; | |
966 | while (next) { | |
967 | next_nodes->list_item = next; | |
6b6dcfc2 | 968 | setter(next->item, next_nodes); |
ab580ace JS |
969 | next_nodes++; |
970 | next = next->next; | |
971 | } | |
972 | /* update the indegree */ | |
973 | next=*list; | |
974 | while (next) { | |
975 | struct commit_list * parents = next->item->parents; | |
976 | while (parents) { | |
977 | struct commit * parent=parents->item; | |
6b6dcfc2 FK |
978 | struct sort_node * pn = (struct sort_node *) getter(parent); |
979 | ||
ab580ace JS |
980 | if (pn) |
981 | pn->indegree++; | |
982 | parents=parents->next; | |
983 | } | |
984 | next=next->next; | |
985 | } | |
986 | /* | |
987 | * find the tips | |
988 | * | |
989 | * tips are nodes not reachable from any other node in the list | |
990 | * | |
991 | * the tips serve as a starting set for the work queue. | |
992 | */ | |
993 | next=*list; | |
2ed02887 | 994 | insert = &work; |
ab580ace | 995 | while (next) { |
6b6dcfc2 | 996 | struct sort_node * node = (struct sort_node *) getter(next->item); |
ab580ace JS |
997 | |
998 | if (node->indegree == 0) { | |
2ed02887 | 999 | insert = &commit_list_insert(next->item, insert)->next; |
ab580ace JS |
1000 | } |
1001 | next=next->next; | |
1002 | } | |
4c8725f1 | 1003 | |
ab580ace | 1004 | /* process the list in topological order */ |
4c8725f1 JH |
1005 | if (!lifo) |
1006 | sort_by_date(&work); | |
ab580ace JS |
1007 | while (work) { |
1008 | struct commit * work_item = pop_commit(&work); | |
6b6dcfc2 | 1009 | struct sort_node * work_node = (struct sort_node *) getter(work_item); |
ab580ace JS |
1010 | struct commit_list * parents = work_item->parents; |
1011 | ||
1012 | while (parents) { | |
1013 | struct commit * parent=parents->item; | |
6b6dcfc2 FK |
1014 | struct sort_node * pn = (struct sort_node *) getter(parent); |
1015 | ||
ab580ace | 1016 | if (pn) { |
6b6dcfc2 | 1017 | /* |
ab580ace JS |
1018 | * parents are only enqueued for emission |
1019 | * when all their children have been emitted thereby | |
1020 | * guaranteeing topological order. | |
1021 | */ | |
1022 | pn->indegree--; | |
4c8725f1 JH |
1023 | if (!pn->indegree) { |
1024 | if (!lifo) | |
1025 | insert_by_date(parent, &work); | |
1026 | else | |
1027 | commit_list_insert(parent, &work); | |
1028 | } | |
ab580ace JS |
1029 | } |
1030 | parents=parents->next; | |
1031 | } | |
1032 | /* | |
1033 | * work_item is a commit all of whose children | |
1034 | * have already been emitted. we can emit it now. | |
1035 | */ | |
1036 | *pptr = work_node->list_item; | |
1037 | pptr = &(*pptr)->next; | |
1038 | *pptr = NULL; | |
6b6dcfc2 | 1039 | setter(work_item, NULL); |
ab580ace JS |
1040 | } |
1041 | free(nodes); | |
1042 | } | |
7c6f8aaf | 1043 | |
1295228d | 1044 | /* merge-base stuff */ |
7c6f8aaf | 1045 | |
577ed5c2 JH |
1046 | /* bits #0..15 in revision.h */ |
1047 | #define PARENT1 (1u<<16) | |
1048 | #define PARENT2 (1u<<17) | |
1049 | #define STALE (1u<<18) | |
1050 | #define RESULT (1u<<19) | |
7c6f8aaf | 1051 | |
1295228d JH |
1052 | static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT); |
1053 | ||
7c6f8aaf JS |
1054 | static struct commit *interesting(struct commit_list *list) |
1055 | { | |
1056 | while (list) { | |
1057 | struct commit *commit = list->item; | |
1058 | list = list->next; | |
542ccefe | 1059 | if (commit->object.flags & STALE) |
7c6f8aaf JS |
1060 | continue; |
1061 | return commit; | |
1062 | } | |
1063 | return NULL; | |
1064 | } | |
1065 | ||
f3249438 | 1066 | static struct commit_list *merge_bases(struct commit *one, struct commit *two) |
7c6f8aaf JS |
1067 | { |
1068 | struct commit_list *list = NULL; | |
1069 | struct commit_list *result = NULL; | |
7c6f8aaf | 1070 | |
f3249438 JH |
1071 | if (one == two) |
1072 | /* We do not mark this even with RESULT so we do not | |
1073 | * have to clean it up. | |
1074 | */ | |
1075 | return commit_list_insert(one, &result); | |
7c6f8aaf | 1076 | |
f3249438 JH |
1077 | parse_commit(one); |
1078 | parse_commit(two); | |
7c6f8aaf | 1079 | |
f3249438 JH |
1080 | one->object.flags |= PARENT1; |
1081 | two->object.flags |= PARENT2; | |
1082 | insert_by_date(one, &list); | |
1083 | insert_by_date(two, &list); | |
7c6f8aaf JS |
1084 | |
1085 | while (interesting(list)) { | |
f3249438 | 1086 | struct commit *commit; |
7c6f8aaf | 1087 | struct commit_list *parents; |
f3249438 JH |
1088 | struct commit_list *n; |
1089 | int flags; | |
7c6f8aaf | 1090 | |
f3249438 JH |
1091 | commit = list->item; |
1092 | n = list->next; | |
1093 | free(list); | |
1094 | list = n; | |
7c6f8aaf | 1095 | |
f3249438 JH |
1096 | flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); |
1097 | if (flags == (PARENT1 | PARENT2)) { | |
1098 | if (!(commit->object.flags & RESULT)) { | |
1099 | commit->object.flags |= RESULT; | |
1100 | insert_by_date(commit, &result); | |
1101 | } | |
542ccefe JH |
1102 | /* Mark parents of a found merge stale */ |
1103 | flags |= STALE; | |
7c6f8aaf JS |
1104 | } |
1105 | parents = commit->parents; | |
1106 | while (parents) { | |
1107 | struct commit *p = parents->item; | |
1108 | parents = parents->next; | |
1109 | if ((p->object.flags & flags) == flags) | |
1110 | continue; | |
1111 | parse_commit(p); | |
1112 | p->object.flags |= flags; | |
1113 | insert_by_date(p, &list); | |
1114 | } | |
1115 | } | |
1116 | ||
f3249438 | 1117 | /* Clean up the result to remove stale ones */ |
1295228d | 1118 | free_commit_list(list); |
f3249438 JH |
1119 | list = result; result = NULL; |
1120 | while (list) { | |
1121 | struct commit_list *n = list->next; | |
1122 | if (!(list->item->object.flags & STALE)) | |
1123 | insert_by_date(list->item, &result); | |
1124 | free(list); | |
1125 | list = n; | |
1126 | } | |
1127 | return result; | |
1128 | } | |
7c6f8aaf | 1129 | |
f3249438 JH |
1130 | struct commit_list *get_merge_bases(struct commit *one, |
1131 | struct commit *two, | |
1132 | int cleanup) | |
1133 | { | |
f3249438 JH |
1134 | struct commit_list *list; |
1135 | struct commit **rslt; | |
1136 | struct commit_list *result; | |
1137 | int cnt, i, j; | |
1138 | ||
1139 | result = merge_bases(one, two); | |
1140 | if (one == two) | |
1141 | return result; | |
1142 | if (!result || !result->next) { | |
1143 | if (cleanup) { | |
1144 | clear_commit_marks(one, all_flags); | |
1145 | clear_commit_marks(two, all_flags); | |
7c6f8aaf | 1146 | } |
f3249438 | 1147 | return result; |
7c6f8aaf JS |
1148 | } |
1149 | ||
f3249438 JH |
1150 | /* There are more than one */ |
1151 | cnt = 0; | |
1152 | list = result; | |
1153 | while (list) { | |
1154 | list = list->next; | |
1155 | cnt++; | |
1156 | } | |
1157 | rslt = xcalloc(cnt, sizeof(*rslt)); | |
1158 | for (list = result, i = 0; list; list = list->next) | |
1159 | rslt[i++] = list->item; | |
1160 | free_commit_list(result); | |
1161 | ||
1162 | clear_commit_marks(one, all_flags); | |
1163 | clear_commit_marks(two, all_flags); | |
1164 | for (i = 0; i < cnt - 1; i++) { | |
1165 | for (j = i+1; j < cnt; j++) { | |
1166 | if (!rslt[i] || !rslt[j]) | |
1167 | continue; | |
1168 | result = merge_bases(rslt[i], rslt[j]); | |
1169 | clear_commit_marks(rslt[i], all_flags); | |
1170 | clear_commit_marks(rslt[j], all_flags); | |
1171 | for (list = result; list; list = list->next) { | |
1172 | if (rslt[i] == list->item) | |
1173 | rslt[i] = NULL; | |
1174 | if (rslt[j] == list->item) | |
1175 | rslt[j] = NULL; | |
1176 | } | |
1177 | } | |
58ecf5c1 | 1178 | } |
7c6f8aaf | 1179 | |
f3249438 JH |
1180 | /* Surviving ones in rslt[] are the independent results */ |
1181 | result = NULL; | |
1182 | for (i = 0; i < cnt; i++) { | |
1183 | if (rslt[i]) | |
1184 | insert_by_date(rslt[i], &result); | |
1185 | } | |
1186 | free(rslt); | |
7c6f8aaf JS |
1187 | return result; |
1188 | } | |
2ecd2bbc JH |
1189 | |
1190 | int in_merge_bases(struct commit *rev1, struct commit *rev2) | |
1191 | { | |
1192 | struct commit_list *bases, *b; | |
1193 | int ret = 0; | |
1194 | ||
1195 | bases = get_merge_bases(rev1, rev2, 1); | |
1196 | for (b = bases; b; b = b->next) { | |
1197 | if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) { | |
1198 | ret = 1; | |
1199 | break; | |
1200 | } | |
1201 | } | |
1202 | ||
1203 | free_commit_list(bases); | |
1204 | return ret; | |
1205 | } |