]>
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" | |
a97a7468 | 8 | #include "notes.h" |
ba3c69a9 | 9 | #include "gpg-interface.h" |
46905893 | 10 | #include "mergesort.h" |
a84b794a | 11 | #include "commit-slab.h" |
da24b104 | 12 | #include "prio-queue.h" |
0a9136f3 | 13 | #include "sha1-lookup.h" |
175785e5 | 14 | |
82a75299 JH |
15 | static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); |
16 | ||
60ab26de LT |
17 | int save_commit_buffer = 1; |
18 | ||
175785e5 DB |
19 | const char *commit_type = "commit"; |
20 | ||
f76412ed JH |
21 | struct commit *lookup_commit_reference_gently(const unsigned char *sha1, |
22 | int quiet) | |
961784ee | 23 | { |
9534f40b | 24 | struct object *obj = deref_tag(parse_object(sha1), NULL, 0); |
961784ee LT |
25 | |
26 | if (!obj) | |
27 | return NULL; | |
8ff226a9 | 28 | return object_as_type(obj, OBJ_COMMIT, quiet); |
f76412ed JH |
29 | } |
30 | ||
31 | struct commit *lookup_commit_reference(const unsigned char *sha1) | |
32 | { | |
33 | return lookup_commit_reference_gently(sha1, 0); | |
961784ee LT |
34 | } |
35 | ||
baf18fc2 NTND |
36 | struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name) |
37 | { | |
38 | struct commit *c = lookup_commit_reference(sha1); | |
39 | if (!c) | |
40 | die(_("could not parse %s"), ref_name); | |
41 | if (hashcmp(sha1, c->object.sha1)) { | |
42 | warning(_("%s %s is not a commit!"), | |
43 | ref_name, sha1_to_hex(sha1)); | |
44 | } | |
45 | return c; | |
46 | } | |
47 | ||
5d6ccf5c | 48 | struct commit *lookup_commit(const unsigned char *sha1) |
175785e5 DB |
49 | { |
50 | struct object *obj = lookup_object(sha1); | |
d36f51c1 JK |
51 | if (!obj) |
52 | return create_object(sha1, alloc_commit_node()); | |
8ff226a9 | 53 | return object_as_type(obj, OBJ_COMMIT, 0); |
175785e5 DB |
54 | } |
55 | ||
a6fa5992 PN |
56 | struct commit *lookup_commit_reference_by_name(const char *name) |
57 | { | |
7683e2e6 | 58 | struct object_id oid; |
a6fa5992 PN |
59 | struct commit *commit; |
60 | ||
7683e2e6 | 61 | if (get_sha1_committish(name, oid.hash)) |
a6fa5992 | 62 | return NULL; |
7683e2e6 | 63 | commit = lookup_commit_reference(oid.hash); |
5e7d4d3e | 64 | if (parse_commit(commit)) |
a6fa5992 PN |
65 | return NULL; |
66 | return commit; | |
67 | } | |
68 | ||
0a617799 | 69 | static unsigned long parse_commit_date(const char *buf, const char *tail) |
175785e5 | 70 | { |
0a617799 | 71 | const char *dateptr; |
175785e5 | 72 | |
0a617799 MK |
73 | if (buf + 6 >= tail) |
74 | return 0; | |
175785e5 DB |
75 | if (memcmp(buf, "author", 6)) |
76 | return 0; | |
0a617799 | 77 | while (buf < tail && *buf++ != '\n') |
175785e5 | 78 | /* nada */; |
0a617799 MK |
79 | if (buf + 9 >= tail) |
80 | return 0; | |
175785e5 DB |
81 | if (memcmp(buf, "committer", 9)) |
82 | return 0; | |
0a617799 | 83 | while (buf < tail && *buf++ != '>') |
175785e5 | 84 | /* nada */; |
0a617799 MK |
85 | if (buf >= tail) |
86 | return 0; | |
87 | dateptr = buf; | |
88 | while (buf < tail && *buf++ != '\n') | |
89 | /* nada */; | |
90 | if (buf >= tail) | |
91 | return 0; | |
92 | /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */ | |
f2909743 | 93 | return strtoul(dateptr, NULL, 10); |
175785e5 DB |
94 | } |
95 | ||
5040f17e | 96 | static struct commit_graft **commit_graft; |
5da5c8f4 JH |
97 | static int commit_graft_alloc, commit_graft_nr; |
98 | ||
0a9136f3 DD |
99 | static const unsigned char *commit_graft_sha1_access(size_t index, void *table) |
100 | { | |
101 | struct commit_graft **commit_graft_table = table; | |
7683e2e6 | 102 | return commit_graft_table[index]->oid.hash; |
0a9136f3 DD |
103 | } |
104 | ||
5da5c8f4 JH |
105 | static int commit_graft_pos(const unsigned char *sha1) |
106 | { | |
0a9136f3 DD |
107 | return sha1_pos(sha1, commit_graft, commit_graft_nr, |
108 | commit_graft_sha1_access); | |
5da5c8f4 JH |
109 | } |
110 | ||
5040f17e JH |
111 | int register_commit_graft(struct commit_graft *graft, int ignore_dups) |
112 | { | |
7683e2e6 | 113 | int pos = commit_graft_pos(graft->oid.hash); |
a6080a0a | 114 | |
5040f17e JH |
115 | if (0 <= pos) { |
116 | if (ignore_dups) | |
117 | free(graft); | |
118 | else { | |
119 | free(commit_graft[pos]); | |
120 | commit_graft[pos] = graft; | |
121 | } | |
122 | return 1; | |
123 | } | |
124 | pos = -pos - 1; | |
d6e82b57 DD |
125 | ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc); |
126 | commit_graft_nr++; | |
5040f17e JH |
127 | if (pos < commit_graft_nr) |
128 | memmove(commit_graft + pos + 1, | |
129 | commit_graft + pos, | |
130 | (commit_graft_nr - pos - 1) * | |
131 | sizeof(*commit_graft)); | |
132 | commit_graft[pos] = graft; | |
133 | return 0; | |
134 | } | |
135 | ||
136 | struct commit_graft *read_graft_line(char *buf, int len) | |
137 | { | |
138 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
139 | int i; | |
140 | struct commit_graft *graft = NULL; | |
7683e2e6 | 141 | const int entry_size = GIT_SHA1_HEXSZ + 1; |
5040f17e | 142 | |
fe0a3cb2 JH |
143 | while (len && isspace(buf[len-1])) |
144 | buf[--len] = '\0'; | |
360204c3 | 145 | if (buf[0] == '#' || buf[0] == '\0') |
5bc4ce58 | 146 | return NULL; |
7683e2e6 | 147 | if ((len + 1) % entry_size) |
df5d43be | 148 | goto bad_graft_data; |
7683e2e6 | 149 | i = (len + 1) / entry_size - 1; |
150 | graft = xmalloc(sizeof(*graft) + GIT_SHA1_RAWSZ * i); | |
5040f17e | 151 | graft->nr_parent = i; |
7683e2e6 | 152 | if (get_oid_hex(buf, &graft->oid)) |
5040f17e | 153 | goto bad_graft_data; |
7683e2e6 | 154 | for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) { |
5040f17e JH |
155 | if (buf[i] != ' ') |
156 | goto bad_graft_data; | |
7683e2e6 | 157 | if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash)) |
5040f17e JH |
158 | goto bad_graft_data; |
159 | } | |
160 | return graft; | |
df5d43be RT |
161 | |
162 | bad_graft_data: | |
163 | error("bad graft data: %s", buf); | |
164 | free(graft); | |
165 | return NULL; | |
5040f17e JH |
166 | } |
167 | ||
c5ae6439 | 168 | static int read_graft_file(const char *graft_file) |
5da5c8f4 | 169 | { |
5da5c8f4 | 170 | FILE *fp = fopen(graft_file, "r"); |
e228c173 | 171 | struct strbuf buf = STRBUF_INIT; |
5040f17e JH |
172 | if (!fp) |
173 | return -1; | |
e228c173 | 174 | while (!strbuf_getwholeline(&buf, fp, '\n')) { |
5da5c8f4 | 175 | /* The format is just "Commit Parent1 Parent2 ...\n" */ |
e228c173 | 176 | struct commit_graft *graft = read_graft_line(buf.buf, buf.len); |
5bc4ce58 JH |
177 | if (!graft) |
178 | continue; | |
5040f17e | 179 | if (register_commit_graft(graft, 1)) |
e228c173 | 180 | error("duplicate graft data: %s", buf.buf); |
5da5c8f4 JH |
181 | } |
182 | fclose(fp); | |
e228c173 | 183 | strbuf_release(&buf); |
5040f17e JH |
184 | return 0; |
185 | } | |
186 | ||
187 | static void prepare_commit_graft(void) | |
188 | { | |
189 | static int commit_graft_prepared; | |
190 | char *graft_file; | |
191 | ||
192 | if (commit_graft_prepared) | |
193 | return; | |
194 | graft_file = get_graft_file(); | |
195 | read_graft_file(graft_file); | |
ed09aef0 JS |
196 | /* make sure shallows are read */ |
197 | is_repository_shallow(); | |
5040f17e | 198 | commit_graft_prepared = 1; |
5da5c8f4 JH |
199 | } |
200 | ||
45163382 | 201 | struct commit_graft *lookup_commit_graft(const unsigned char *sha1) |
5da5c8f4 JH |
202 | { |
203 | int pos; | |
5040f17e | 204 | prepare_commit_graft(); |
5da5c8f4 JH |
205 | pos = commit_graft_pos(sha1); |
206 | if (pos < 0) | |
207 | return NULL; | |
208 | return commit_graft[pos]; | |
209 | } | |
210 | ||
09d46644 | 211 | int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) |
ed09aef0 | 212 | { |
09d46644 NTND |
213 | int i, ret; |
214 | for (i = ret = 0; i < commit_graft_nr && !ret; i++) | |
215 | ret = fn(commit_graft[i], cb_data); | |
216 | return ret; | |
ed09aef0 JS |
217 | } |
218 | ||
f53514bc JS |
219 | int unregister_shallow(const unsigned char *sha1) |
220 | { | |
221 | int pos = commit_graft_pos(sha1); | |
222 | if (pos < 0) | |
223 | return -1; | |
224 | if (pos + 1 < commit_graft_nr) | |
65d41d48 | 225 | memmove(commit_graft + pos, commit_graft + pos + 1, |
f53514bc JS |
226 | sizeof(struct commit_graft *) |
227 | * (commit_graft_nr - pos - 1)); | |
228 | commit_graft_nr--; | |
229 | return 0; | |
230 | } | |
231 | ||
8597ea3a JK |
232 | struct commit_buffer { |
233 | void *buffer; | |
234 | unsigned long size; | |
235 | }; | |
236 | define_commit_slab(buffer_slab, struct commit_buffer); | |
c1b3c71f JK |
237 | static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab); |
238 | ||
8597ea3a | 239 | void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size) |
66c2827e | 240 | { |
8597ea3a JK |
241 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
242 | v->buffer = buffer; | |
243 | v->size = size; | |
66c2827e JK |
244 | } |
245 | ||
8597ea3a | 246 | const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 247 | { |
8597ea3a JK |
248 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
249 | if (sizep) | |
250 | *sizep = v->size; | |
251 | return v->buffer; | |
152ff1cc JK |
252 | } |
253 | ||
8597ea3a | 254 | const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 255 | { |
8597ea3a | 256 | const void *ret = get_cached_commit_buffer(commit, sizep); |
152ff1cc JK |
257 | if (!ret) { |
258 | enum object_type type; | |
259 | unsigned long size; | |
260 | ret = read_sha1_file(commit->object.sha1, &type, &size); | |
261 | if (!ret) | |
262 | die("cannot read commit object %s", | |
263 | sha1_to_hex(commit->object.sha1)); | |
264 | if (type != OBJ_COMMIT) | |
265 | die("expected commit for %s, got %s", | |
266 | sha1_to_hex(commit->object.sha1), typename(type)); | |
8597ea3a JK |
267 | if (sizep) |
268 | *sizep = size; | |
152ff1cc JK |
269 | } |
270 | return ret; | |
271 | } | |
272 | ||
273 | void unuse_commit_buffer(const struct commit *commit, const void *buffer) | |
274 | { | |
8597ea3a JK |
275 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
276 | if (v->buffer != buffer) | |
152ff1cc JK |
277 | free((void *)buffer); |
278 | } | |
279 | ||
0fb370da JK |
280 | void free_commit_buffer(struct commit *commit) |
281 | { | |
8597ea3a JK |
282 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
283 | free(v->buffer); | |
284 | v->buffer = NULL; | |
285 | v->size = 0; | |
0fb370da JK |
286 | } |
287 | ||
8597ea3a | 288 | const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep) |
0fb370da | 289 | { |
8597ea3a JK |
290 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
291 | void *ret; | |
292 | ||
293 | ret = v->buffer; | |
294 | if (sizep) | |
295 | *sizep = v->size; | |
296 | ||
297 | v->buffer = NULL; | |
298 | v->size = 0; | |
0fb370da JK |
299 | return ret; |
300 | } | |
301 | ||
cf7b1cad | 302 | int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size) |
175785e5 | 303 | { |
cf7b1cad NTND |
304 | const char *tail = buffer; |
305 | const char *bufptr = buffer; | |
7683e2e6 | 306 | struct object_id parent; |
6c88be16 | 307 | struct commit_list **pptr; |
5da5c8f4 | 308 | struct commit_graft *graft; |
7683e2e6 | 309 | const int tree_entry_len = GIT_SHA1_HEXSZ + 5; |
310 | const int parent_entry_len = GIT_SHA1_HEXSZ + 7; | |
bd2c39f5 | 311 | |
175785e5 DB |
312 | if (item->object.parsed) |
313 | return 0; | |
314 | item->object.parsed = 1; | |
3b44f15a | 315 | tail += size; |
7683e2e6 | 316 | if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || |
317 | bufptr[tree_entry_len] != '\n') | |
f7cc77d7 | 318 | return error("bogus commit object %s", sha1_to_hex(item->object.sha1)); |
7683e2e6 | 319 | if (get_sha1_hex(bufptr + 5, parent.hash) < 0) |
bd2afde8 JH |
320 | return error("bad tree pointer in commit %s", |
321 | sha1_to_hex(item->object.sha1)); | |
7683e2e6 | 322 | item->tree = lookup_tree(parent.hash); |
323 | bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ | |
6c88be16 | 324 | pptr = &item->parents; |
5da5c8f4 JH |
325 | |
326 | graft = lookup_commit_graft(item->object.sha1); | |
7683e2e6 | 327 | while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
328 | struct commit *new_parent; |
329 | ||
7683e2e6 | 330 | if (tail <= bufptr + parent_entry_len + 1 || |
331 | get_sha1_hex(bufptr + 7, parent.hash) || | |
332 | bufptr[parent_entry_len] != '\n') | |
f7cc77d7 | 333 | return error("bad parents in commit %s", sha1_to_hex(item->object.sha1)); |
7683e2e6 | 334 | bufptr += parent_entry_len + 1; |
7f3140cd JS |
335 | /* |
336 | * The clone is shallow if nr_parent < 0, and we must | |
337 | * not traverse its real parents even when we unhide them. | |
338 | */ | |
339 | if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) | |
5da5c8f4 | 340 | continue; |
7683e2e6 | 341 | new_parent = lookup_commit(parent.hash); |
39468def | 342 | if (new_parent) |
6c88be16 | 343 | pptr = &commit_list_insert(new_parent, pptr)->next; |
5da5c8f4 JH |
344 | } |
345 | if (graft) { | |
346 | int i; | |
347 | struct commit *new_parent; | |
348 | for (i = 0; i < graft->nr_parent; i++) { | |
7683e2e6 | 349 | new_parent = lookup_commit(graft->parent[i].hash); |
5da5c8f4 JH |
350 | if (!new_parent) |
351 | continue; | |
352 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
5da5c8f4 | 353 | } |
175785e5 | 354 | } |
0a617799 | 355 | item->date = parse_commit_date(bufptr, tail); |
27dedf0c | 356 | |
175785e5 DB |
357 | return 0; |
358 | } | |
359 | ||
9cc2b07a | 360 | int parse_commit_gently(struct commit *item, int quiet_on_missing) |
bd2c39f5 | 361 | { |
21666f1a | 362 | enum object_type type; |
bd2c39f5 NP |
363 | void *buffer; |
364 | unsigned long size; | |
365 | int ret; | |
366 | ||
9786f68b MK |
367 | if (!item) |
368 | return -1; | |
bd2c39f5 NP |
369 | if (item->object.parsed) |
370 | return 0; | |
21666f1a | 371 | buffer = read_sha1_file(item->object.sha1, &type, &size); |
bd2c39f5 | 372 | if (!buffer) |
9cc2b07a JK |
373 | return quiet_on_missing ? -1 : |
374 | error("Could not read %s", | |
bd2c39f5 | 375 | sha1_to_hex(item->object.sha1)); |
21666f1a | 376 | if (type != OBJ_COMMIT) { |
bd2c39f5 NP |
377 | free(buffer); |
378 | return error("Object %s not a commit", | |
379 | sha1_to_hex(item->object.sha1)); | |
380 | } | |
381 | ret = parse_commit_buffer(item, buffer, size); | |
60ab26de | 382 | if (save_commit_buffer && !ret) { |
8597ea3a | 383 | set_commit_buffer(item, buffer, size); |
3ff1fbbb LT |
384 | return 0; |
385 | } | |
bd2c39f5 NP |
386 | free(buffer); |
387 | return ret; | |
388 | } | |
389 | ||
7059dccc JK |
390 | void parse_commit_or_die(struct commit *item) |
391 | { | |
392 | if (parse_commit(item)) | |
393 | die("unable to parse commit %s", | |
394 | item ? sha1_to_hex(item->object.sha1) : "(null)"); | |
395 | } | |
396 | ||
11af2aae CC |
397 | int find_commit_subject(const char *commit_buffer, const char **subject) |
398 | { | |
399 | const char *eol; | |
400 | const char *p = commit_buffer; | |
401 | ||
402 | while (*p && (*p != '\n' || p[1] != '\n')) | |
403 | p++; | |
404 | if (*p) { | |
405 | p += 2; | |
406 | for (eol = p; *eol && *eol != '\n'; eol++) | |
407 | ; /* do nothing */ | |
408 | } else | |
409 | eol = p; | |
410 | ||
411 | *subject = p; | |
412 | ||
413 | return eol - p; | |
414 | } | |
415 | ||
ac5155ef | 416 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 417 | { |
812666c8 | 418 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
419 | new_list->item = item; |
420 | new_list->next = *list_p; | |
421 | *list_p = new_list; | |
ac5155ef | 422 | return new_list; |
dd97f850 DB |
423 | } |
424 | ||
65319475 MV |
425 | unsigned commit_list_count(const struct commit_list *l) |
426 | { | |
427 | unsigned c = 0; | |
428 | for (; l; l = l->next ) | |
429 | c++; | |
430 | return c; | |
431 | } | |
432 | ||
53d00b39 TR |
433 | struct commit_list *copy_commit_list(struct commit_list *list) |
434 | { | |
435 | struct commit_list *head = NULL; | |
436 | struct commit_list **pp = &head; | |
437 | while (list) { | |
cb979dbd | 438 | pp = commit_list_append(list->item, pp); |
53d00b39 TR |
439 | list = list->next; |
440 | } | |
441 | return head; | |
442 | } | |
443 | ||
175785e5 DB |
444 | void free_commit_list(struct commit_list *list) |
445 | { | |
e510ab89 RS |
446 | while (list) |
447 | pop_commit(&list); | |
175785e5 | 448 | } |
dd97f850 | 449 | |
47e44ed1 | 450 | struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
451 | { |
452 | struct commit_list **pp = list; | |
453 | struct commit_list *p; | |
454 | while ((p = *pp) != NULL) { | |
455 | if (p->item->date < item->date) { | |
456 | break; | |
457 | } | |
458 | pp = &p->next; | |
459 | } | |
f755494c | 460 | return commit_list_insert(item, pp); |
dd97f850 DB |
461 | } |
462 | ||
46905893 RS |
463 | static int commit_list_compare_by_date(const void *a, const void *b) |
464 | { | |
465 | unsigned long a_date = ((const struct commit_list *)a)->item->date; | |
466 | unsigned long b_date = ((const struct commit_list *)b)->item->date; | |
467 | if (a_date < b_date) | |
468 | return 1; | |
469 | if (a_date > b_date) | |
470 | return -1; | |
471 | return 0; | |
472 | } | |
473 | ||
474 | static void *commit_list_get_next(const void *a) | |
475 | { | |
476 | return ((const struct commit_list *)a)->next; | |
477 | } | |
478 | ||
479 | static void commit_list_set_next(void *a, void *next) | |
480 | { | |
481 | ((struct commit_list *)a)->next = next; | |
482 | } | |
a6080a0a | 483 | |
47e44ed1 | 484 | void commit_list_sort_by_date(struct commit_list **list) |
dd97f850 | 485 | { |
7365c95d JH |
486 | *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next, |
487 | commit_list_compare_by_date); | |
dd97f850 DB |
488 | } |
489 | ||
58e28af6 DB |
490 | struct commit *pop_most_recent_commit(struct commit_list **list, |
491 | unsigned int mark) | |
dd97f850 | 492 | { |
e510ab89 | 493 | struct commit *ret = pop_commit(list); |
dd97f850 | 494 | struct commit_list *parents = ret->parents; |
dd97f850 DB |
495 | |
496 | while (parents) { | |
4056c091 | 497 | struct commit *commit = parents->item; |
dec38c81 | 498 | if (!parse_commit(commit) && !(commit->object.flags & mark)) { |
58e28af6 | 499 | commit->object.flags |= mark; |
47e44ed1 | 500 | commit_list_insert_by_date(commit, list); |
4056c091 | 501 | } |
dd97f850 DB |
502 | parents = parents->next; |
503 | } | |
504 | return ret; | |
505 | } | |
e3bc7a3b | 506 | |
941ba8db NTND |
507 | static void clear_commit_marks_1(struct commit_list **plist, |
508 | struct commit *commit, unsigned int mark) | |
f8f9c73c | 509 | { |
60fcc2e6 JS |
510 | while (commit) { |
511 | struct commit_list *parents; | |
f8f9c73c | 512 | |
60fcc2e6 JS |
513 | if (!(mark & commit->object.flags)) |
514 | return; | |
58ecf5c1 | 515 | |
60fcc2e6 JS |
516 | commit->object.flags &= ~mark; |
517 | ||
518 | parents = commit->parents; | |
519 | if (!parents) | |
520 | return; | |
521 | ||
522 | while ((parents = parents->next)) | |
941ba8db | 523 | commit_list_insert(parents->item, plist); |
60fcc2e6 JS |
524 | |
525 | commit = commit->parents->item; | |
f8f9c73c JH |
526 | } |
527 | } | |
528 | ||
e895cb51 | 529 | void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark) |
941ba8db NTND |
530 | { |
531 | struct commit_list *list = NULL; | |
e895cb51 JH |
532 | |
533 | while (nr--) { | |
534 | commit_list_insert(*commit, &list); | |
535 | commit++; | |
536 | } | |
941ba8db NTND |
537 | while (list) |
538 | clear_commit_marks_1(&list, pop_commit(&list), mark); | |
539 | } | |
540 | ||
e895cb51 JH |
541 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
542 | { | |
543 | clear_commit_marks_many(1, &commit, mark); | |
544 | } | |
545 | ||
86a0a408 RS |
546 | void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark) |
547 | { | |
548 | struct object *object; | |
549 | struct commit *commit; | |
550 | unsigned int i; | |
551 | ||
552 | for (i = 0; i < a->nr; i++) { | |
553 | object = a->objects[i].item; | |
554 | commit = lookup_commit_reference_gently(object->sha1, 1); | |
555 | if (commit) | |
556 | clear_commit_marks(commit, mark); | |
557 | } | |
558 | } | |
559 | ||
a3437b8c JS |
560 | struct commit *pop_commit(struct commit_list **stack) |
561 | { | |
562 | struct commit_list *top = *stack; | |
563 | struct commit *item = top ? top->item : NULL; | |
564 | ||
565 | if (top) { | |
566 | *stack = top->next; | |
567 | free(top); | |
568 | } | |
569 | return item; | |
570 | } | |
571 | ||
a84b794a JH |
572 | /* |
573 | * Topological sort support | |
574 | */ | |
96c4f4a3 | 575 | |
a84b794a JH |
576 | /* count number of children that have not been emitted */ |
577 | define_commit_slab(indegree_slab, int); | |
96c4f4a3 | 578 | |
81c6b38b JH |
579 | /* record author-date for each commit object */ |
580 | define_commit_slab(author_date_slab, unsigned long); | |
581 | ||
582 | static void record_author_date(struct author_date_slab *author_date, | |
583 | struct commit *commit) | |
584 | { | |
8597ea3a | 585 | const char *buffer = get_commit_buffer(commit, NULL); |
81c6b38b | 586 | struct ident_split ident; |
ea5517f0 JK |
587 | const char *ident_line; |
588 | size_t ident_len; | |
81c6b38b JH |
589 | char *date_end; |
590 | unsigned long date; | |
591 | ||
ea5517f0 JK |
592 | ident_line = find_commit_header(buffer, "author", &ident_len); |
593 | if (!ident_line) | |
594 | goto fail_exit; /* no author line */ | |
595 | if (split_ident_line(&ident, ident_line, ident_len) || | |
596 | !ident.date_begin || !ident.date_end) | |
597 | goto fail_exit; /* malformed "author" line */ | |
81c6b38b JH |
598 | |
599 | date = strtoul(ident.date_begin, &date_end, 10); | |
600 | if (date_end != ident.date_end) | |
601 | goto fail_exit; /* malformed date */ | |
602 | *(author_date_slab_at(author_date, commit)) = date; | |
603 | ||
604 | fail_exit: | |
ba41c1c9 | 605 | unuse_commit_buffer(commit, buffer); |
81c6b38b JH |
606 | } |
607 | ||
608 | static int compare_commits_by_author_date(const void *a_, const void *b_, | |
609 | void *cb_data) | |
610 | { | |
611 | const struct commit *a = a_, *b = b_; | |
612 | struct author_date_slab *author_date = cb_data; | |
613 | unsigned long a_date = *(author_date_slab_at(author_date, a)); | |
614 | unsigned long b_date = *(author_date_slab_at(author_date, b)); | |
615 | ||
616 | /* newer commits with larger date first */ | |
617 | if (a_date < b_date) | |
618 | return 1; | |
619 | else if (a_date > b_date) | |
620 | return -1; | |
621 | return 0; | |
622 | } | |
623 | ||
727377ff | 624 | int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) |
da24b104 JH |
625 | { |
626 | const struct commit *a = a_, *b = b_; | |
627 | /* newer commits with larger date first */ | |
628 | if (a->date < b->date) | |
629 | return 1; | |
630 | else if (a->date > b->date) | |
631 | return -1; | |
632 | return 0; | |
633 | } | |
634 | ||
ab580ace JS |
635 | /* |
636 | * Performs an in-place topological sort on the list supplied. | |
637 | */ | |
da24b104 | 638 | void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order) |
6b6dcfc2 | 639 | { |
23c17d4a | 640 | struct commit_list *next, *orig = *list; |
23c17d4a | 641 | struct commit_list **pptr; |
a84b794a | 642 | struct indegree_slab indegree; |
da24b104 JH |
643 | struct prio_queue queue; |
644 | struct commit *commit; | |
81c6b38b | 645 | struct author_date_slab author_date; |
a6080a0a | 646 | |
23c17d4a | 647 | if (!orig) |
7d6fb370 | 648 | return; |
23c17d4a LT |
649 | *list = NULL; |
650 | ||
a84b794a | 651 | init_indegree_slab(&indegree); |
da24b104 | 652 | memset(&queue, '\0', sizeof(queue)); |
81c6b38b | 653 | |
da24b104 JH |
654 | switch (sort_order) { |
655 | default: /* REV_SORT_IN_GRAPH_ORDER */ | |
656 | queue.compare = NULL; | |
657 | break; | |
658 | case REV_SORT_BY_COMMIT_DATE: | |
659 | queue.compare = compare_commits_by_commit_date; | |
660 | break; | |
81c6b38b JH |
661 | case REV_SORT_BY_AUTHOR_DATE: |
662 | init_author_date_slab(&author_date); | |
663 | queue.compare = compare_commits_by_author_date; | |
664 | queue.cb_data = &author_date; | |
665 | break; | |
da24b104 | 666 | } |
96c4f4a3 | 667 | |
23c17d4a LT |
668 | /* Mark them and clear the indegree */ |
669 | for (next = orig; next; next = next->next) { | |
670 | struct commit *commit = next->item; | |
a84b794a | 671 | *(indegree_slab_at(&indegree, commit)) = 1; |
81c6b38b JH |
672 | /* also record the author dates, if needed */ |
673 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) | |
674 | record_author_date(&author_date, commit); | |
ab580ace | 675 | } |
23c17d4a | 676 | |
ab580ace | 677 | /* update the indegree */ |
23c17d4a | 678 | for (next = orig; next; next = next->next) { |
da24b104 | 679 | struct commit_list *parents = next->item->parents; |
ab580ace | 680 | while (parents) { |
23c17d4a | 681 | struct commit *parent = parents->item; |
a84b794a | 682 | int *pi = indegree_slab_at(&indegree, parent); |
6b6dcfc2 | 683 | |
96c4f4a3 JK |
684 | if (*pi) |
685 | (*pi)++; | |
23c17d4a | 686 | parents = parents->next; |
ab580ace | 687 | } |
ab580ace | 688 | } |
23c17d4a | 689 | |
a6080a0a | 690 | /* |
674d1727 PH |
691 | * find the tips |
692 | * | |
693 | * tips are nodes not reachable from any other node in the list | |
694 | * | |
695 | * the tips serve as a starting set for the work queue. | |
696 | */ | |
23c17d4a LT |
697 | for (next = orig; next; next = next->next) { |
698 | struct commit *commit = next->item; | |
ab580ace | 699 | |
a84b794a | 700 | if (*(indegree_slab_at(&indegree, commit)) == 1) |
da24b104 | 701 | prio_queue_put(&queue, commit); |
ab580ace | 702 | } |
4c8725f1 | 703 | |
da24b104 JH |
704 | /* |
705 | * This is unfortunate; the initial tips need to be shown | |
706 | * in the order given from the revision traversal machinery. | |
707 | */ | |
708 | if (sort_order == REV_SORT_IN_GRAPH_ORDER) | |
709 | prio_queue_reverse(&queue); | |
710 | ||
711 | /* We no longer need the commit list */ | |
712 | free_commit_list(orig); | |
23c17d4a LT |
713 | |
714 | pptr = list; | |
715 | *list = NULL; | |
da24b104 JH |
716 | while ((commit = prio_queue_get(&queue)) != NULL) { |
717 | struct commit_list *parents; | |
23c17d4a | 718 | |
23c17d4a | 719 | for (parents = commit->parents; parents ; parents = parents->next) { |
cd2b8ae9 | 720 | struct commit *parent = parents->item; |
a84b794a | 721 | int *pi = indegree_slab_at(&indegree, parent); |
23c17d4a | 722 | |
96c4f4a3 | 723 | if (!*pi) |
23c17d4a LT |
724 | continue; |
725 | ||
726 | /* | |
727 | * parents are only enqueued for emission | |
728 | * when all their children have been emitted thereby | |
729 | * guaranteeing topological order. | |
730 | */ | |
da24b104 JH |
731 | if (--(*pi) == 1) |
732 | prio_queue_put(&queue, parent); | |
ab580ace JS |
733 | } |
734 | /* | |
da24b104 JH |
735 | * all children of commit have already been |
736 | * emitted. we can emit it now. | |
674d1727 | 737 | */ |
a84b794a | 738 | *(indegree_slab_at(&indegree, commit)) = 0; |
da24b104 JH |
739 | |
740 | pptr = &commit_list_insert(commit, pptr)->next; | |
ab580ace | 741 | } |
96c4f4a3 | 742 | |
a84b794a | 743 | clear_indegree_slab(&indegree); |
da24b104 | 744 | clear_prio_queue(&queue); |
81c6b38b JH |
745 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) |
746 | clear_author_date_slab(&author_date); | |
ab580ace | 747 | } |
7c6f8aaf | 748 | |
1295228d | 749 | /* merge-base stuff */ |
7c6f8aaf | 750 | |
208acbfb | 751 | /* Remember to update object flag allocation in object.h */ |
577ed5c2 JH |
752 | #define PARENT1 (1u<<16) |
753 | #define PARENT2 (1u<<17) | |
754 | #define STALE (1u<<18) | |
755 | #define RESULT (1u<<19) | |
7c6f8aaf | 756 | |
1295228d JH |
757 | static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT); |
758 | ||
73f43f22 | 759 | static int queue_has_nonstale(struct prio_queue *queue) |
7c6f8aaf | 760 | { |
73f43f22 JK |
761 | int i; |
762 | for (i = 0; i < queue->nr; i++) { | |
763 | struct commit *commit = queue->array[i].data; | |
764 | if (!(commit->object.flags & STALE)) | |
765 | return 1; | |
7c6f8aaf | 766 | } |
73f43f22 | 767 | return 0; |
7c6f8aaf JS |
768 | } |
769 | ||
d866924a | 770 | /* all input commits in one and twos[] must have been parsed! */ |
da1f5156 | 771 | static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos) |
7c6f8aaf | 772 | { |
73f43f22 | 773 | struct prio_queue queue = { compare_commits_by_commit_date }; |
7c6f8aaf | 774 | struct commit_list *result = NULL; |
6a938648 | 775 | int i; |
7c6f8aaf | 776 | |
f3249438 | 777 | one->object.flags |= PARENT1; |
73f43f22 JK |
778 | if (!n) { |
779 | commit_list_append(one, &result); | |
780 | return result; | |
781 | } | |
782 | prio_queue_put(&queue, one); | |
783 | ||
6a938648 JH |
784 | for (i = 0; i < n; i++) { |
785 | twos[i]->object.flags |= PARENT2; | |
73f43f22 | 786 | prio_queue_put(&queue, twos[i]); |
6a938648 | 787 | } |
7c6f8aaf | 788 | |
73f43f22 JK |
789 | while (queue_has_nonstale(&queue)) { |
790 | struct commit *commit = prio_queue_get(&queue); | |
7c6f8aaf | 791 | struct commit_list *parents; |
f3249438 | 792 | int flags; |
7c6f8aaf | 793 | |
f3249438 JH |
794 | flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); |
795 | if (flags == (PARENT1 | PARENT2)) { | |
796 | if (!(commit->object.flags & RESULT)) { | |
797 | commit->object.flags |= RESULT; | |
47e44ed1 | 798 | commit_list_insert_by_date(commit, &result); |
f3249438 | 799 | } |
542ccefe JH |
800 | /* Mark parents of a found merge stale */ |
801 | flags |= STALE; | |
7c6f8aaf JS |
802 | } |
803 | parents = commit->parents; | |
804 | while (parents) { | |
805 | struct commit *p = parents->item; | |
806 | parents = parents->next; | |
807 | if ((p->object.flags & flags) == flags) | |
808 | continue; | |
172947e6 MK |
809 | if (parse_commit(p)) |
810 | return NULL; | |
7c6f8aaf | 811 | p->object.flags |= flags; |
73f43f22 | 812 | prio_queue_put(&queue, p); |
7c6f8aaf JS |
813 | } |
814 | } | |
815 | ||
73f43f22 | 816 | clear_prio_queue(&queue); |
da1f5156 JH |
817 | return result; |
818 | } | |
819 | ||
820 | static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) | |
821 | { | |
822 | struct commit_list *list = NULL; | |
823 | struct commit_list *result = NULL; | |
824 | int i; | |
825 | ||
826 | for (i = 0; i < n; i++) { | |
827 | if (one == twos[i]) | |
828 | /* | |
829 | * We do not mark this even with RESULT so we do not | |
830 | * have to clean it up. | |
831 | */ | |
832 | return commit_list_insert(one, &result); | |
833 | } | |
834 | ||
835 | if (parse_commit(one)) | |
836 | return NULL; | |
837 | for (i = 0; i < n; i++) { | |
838 | if (parse_commit(twos[i])) | |
839 | return NULL; | |
840 | } | |
841 | ||
842 | list = paint_down_to_common(one, n, twos); | |
843 | ||
f3249438 | 844 | while (list) { |
e510ab89 RS |
845 | struct commit *commit = pop_commit(&list); |
846 | if (!(commit->object.flags & STALE)) | |
847 | commit_list_insert_by_date(commit, &result); | |
f3249438 JH |
848 | } |
849 | return result; | |
850 | } | |
7c6f8aaf | 851 | |
5240c9d7 MV |
852 | struct commit_list *get_octopus_merge_bases(struct commit_list *in) |
853 | { | |
854 | struct commit_list *i, *j, *k, *ret = NULL; | |
5240c9d7 | 855 | |
6bc76725 VM |
856 | if (!in) |
857 | return ret; | |
858 | ||
859 | commit_list_insert(in->item, &ret); | |
860 | ||
861 | for (i = in->next; i; i = i->next) { | |
862 | struct commit_list *new = NULL, *end = NULL; | |
863 | ||
864 | for (j = ret; j; j = j->next) { | |
865 | struct commit_list *bases; | |
2ce406cc | 866 | bases = get_merge_bases(i->item, j->item); |
6bc76725 VM |
867 | if (!new) |
868 | new = bases; | |
869 | else | |
870 | end->next = bases; | |
871 | for (k = bases; k; k = k->next) | |
872 | end = k; | |
5240c9d7 | 873 | } |
6bc76725 | 874 | ret = new; |
5240c9d7 MV |
875 | } |
876 | return ret; | |
877 | } | |
878 | ||
94f0ced0 JH |
879 | static int remove_redundant(struct commit **array, int cnt) |
880 | { | |
881 | /* | |
882 | * Some commit in the array may be an ancestor of | |
883 | * another commit. Move such commit to the end of | |
884 | * the array, and return the number of commits that | |
885 | * are independent from each other. | |
886 | */ | |
887 | struct commit **work; | |
888 | unsigned char *redundant; | |
889 | int *filled_index; | |
890 | int i, j, filled; | |
891 | ||
892 | work = xcalloc(cnt, sizeof(*work)); | |
893 | redundant = xcalloc(cnt, 1); | |
894 | filled_index = xmalloc(sizeof(*filled_index) * (cnt - 1)); | |
895 | ||
d866924a JH |
896 | for (i = 0; i < cnt; i++) |
897 | parse_commit(array[i]); | |
94f0ced0 JH |
898 | for (i = 0; i < cnt; i++) { |
899 | struct commit_list *common; | |
900 | ||
901 | if (redundant[i]) | |
902 | continue; | |
903 | for (j = filled = 0; j < cnt; j++) { | |
904 | if (i == j || redundant[j]) | |
905 | continue; | |
906 | filled_index[filled] = j; | |
907 | work[filled++] = array[j]; | |
908 | } | |
909 | common = paint_down_to_common(array[i], filled, work); | |
910 | if (array[i]->object.flags & PARENT2) | |
911 | redundant[i] = 1; | |
912 | for (j = 0; j < filled; j++) | |
913 | if (work[j]->object.flags & PARENT1) | |
914 | redundant[filled_index[j]] = 1; | |
915 | clear_commit_marks(array[i], all_flags); | |
916 | for (j = 0; j < filled; j++) | |
917 | clear_commit_marks(work[j], all_flags); | |
918 | free_commit_list(common); | |
919 | } | |
920 | ||
921 | /* Now collect the result */ | |
922 | memcpy(work, array, sizeof(*array) * cnt); | |
923 | for (i = filled = 0; i < cnt; i++) | |
924 | if (!redundant[i]) | |
925 | array[filled++] = work[i]; | |
926 | for (j = filled, i = 0; i < cnt; i++) | |
927 | if (redundant[i]) | |
928 | array[j++] = work[i]; | |
929 | free(work); | |
930 | free(redundant); | |
931 | free(filled_index); | |
932 | return filled; | |
933 | } | |
934 | ||
2ce406cc JH |
935 | static struct commit_list *get_merge_bases_many_0(struct commit *one, |
936 | int n, | |
937 | struct commit **twos, | |
938 | int cleanup) | |
f3249438 | 939 | { |
f3249438 JH |
940 | struct commit_list *list; |
941 | struct commit **rslt; | |
942 | struct commit_list *result; | |
94f0ced0 | 943 | int cnt, i; |
f3249438 | 944 | |
6a938648 JH |
945 | result = merge_bases_many(one, n, twos); |
946 | for (i = 0; i < n; i++) { | |
947 | if (one == twos[i]) | |
948 | return result; | |
949 | } | |
f3249438 JH |
950 | if (!result || !result->next) { |
951 | if (cleanup) { | |
952 | clear_commit_marks(one, all_flags); | |
e895cb51 | 953 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 954 | } |
f3249438 | 955 | return result; |
7c6f8aaf JS |
956 | } |
957 | ||
f3249438 | 958 | /* There are more than one */ |
4bbaa1eb | 959 | cnt = commit_list_count(result); |
f3249438 JH |
960 | rslt = xcalloc(cnt, sizeof(*rslt)); |
961 | for (list = result, i = 0; list; list = list->next) | |
962 | rslt[i++] = list->item; | |
963 | free_commit_list(result); | |
964 | ||
965 | clear_commit_marks(one, all_flags); | |
e895cb51 | 966 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 967 | |
94f0ced0 | 968 | cnt = remove_redundant(rslt, cnt); |
f3249438 | 969 | result = NULL; |
94f0ced0 JH |
970 | for (i = 0; i < cnt; i++) |
971 | commit_list_insert_by_date(rslt[i], &result); | |
f3249438 | 972 | free(rslt); |
7c6f8aaf JS |
973 | return result; |
974 | } | |
2ecd2bbc | 975 | |
2ce406cc JH |
976 | struct commit_list *get_merge_bases_many(struct commit *one, |
977 | int n, | |
978 | struct commit **twos) | |
979 | { | |
980 | return get_merge_bases_many_0(one, n, twos, 1); | |
981 | } | |
982 | ||
983 | struct commit_list *get_merge_bases_many_dirty(struct commit *one, | |
984 | int n, | |
985 | struct commit **twos) | |
986 | { | |
987 | return get_merge_bases_many_0(one, n, twos, 0); | |
988 | } | |
989 | ||
990 | struct commit_list *get_merge_bases(struct commit *one, struct commit *two) | |
6a938648 | 991 | { |
2ce406cc | 992 | return get_merge_bases_many_0(one, 1, &two, 1); |
6a938648 JH |
993 | } |
994 | ||
a20efee9 | 995 | /* |
41ccfdd9 | 996 | * Is "commit" a descendant of one of the elements on the "with_commit" list? |
a20efee9 | 997 | */ |
7fcdb36e JG |
998 | int is_descendant_of(struct commit *commit, struct commit_list *with_commit) |
999 | { | |
1000 | if (!with_commit) | |
1001 | return 1; | |
1002 | while (with_commit) { | |
1003 | struct commit *other; | |
1004 | ||
1005 | other = with_commit->item; | |
1006 | with_commit = with_commit->next; | |
a20efee9 | 1007 | if (in_merge_bases(other, commit)) |
7fcdb36e JG |
1008 | return 1; |
1009 | } | |
1010 | return 0; | |
1011 | } | |
1012 | ||
a20efee9 | 1013 | /* |
4c4b27e8 | 1014 | * Is "commit" an ancestor of one of the "references"? |
a20efee9 | 1015 | */ |
4c4b27e8 | 1016 | int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference) |
2ecd2bbc | 1017 | { |
6440fdba | 1018 | struct commit_list *bases; |
4c4b27e8 | 1019 | int ret = 0, i; |
2ecd2bbc | 1020 | |
4c4b27e8 | 1021 | if (parse_commit(commit)) |
6440fdba | 1022 | return ret; |
4c4b27e8 JH |
1023 | for (i = 0; i < nr_reference; i++) |
1024 | if (parse_commit(reference[i])) | |
1025 | return ret; | |
2ecd2bbc | 1026 | |
4c4b27e8 | 1027 | bases = paint_down_to_common(commit, nr_reference, reference); |
6440fdba JH |
1028 | if (commit->object.flags & PARENT2) |
1029 | ret = 1; | |
b0f9e9ee | 1030 | clear_commit_marks(commit, all_flags); |
557899ff | 1031 | clear_commit_marks_many(nr_reference, reference, all_flags); |
2ecd2bbc JH |
1032 | free_commit_list(bases); |
1033 | return ret; | |
1034 | } | |
98cf9c3b | 1035 | |
4c4b27e8 JH |
1036 | /* |
1037 | * Is "commit" an ancestor of (i.e. reachable from) the "reference"? | |
1038 | */ | |
1039 | int in_merge_bases(struct commit *commit, struct commit *reference) | |
1040 | { | |
1041 | return in_merge_bases_many(commit, 1, &reference); | |
1042 | } | |
1043 | ||
98cf9c3b JH |
1044 | struct commit_list *reduce_heads(struct commit_list *heads) |
1045 | { | |
1046 | struct commit_list *p; | |
1047 | struct commit_list *result = NULL, **tail = &result; | |
f37d3c75 JH |
1048 | struct commit **array; |
1049 | int num_head, i; | |
98cf9c3b JH |
1050 | |
1051 | if (!heads) | |
1052 | return NULL; | |
1053 | ||
f37d3c75 JH |
1054 | /* Uniquify */ |
1055 | for (p = heads; p; p = p->next) | |
1056 | p->item->object.flags &= ~STALE; | |
1057 | for (p = heads, num_head = 0; p; p = p->next) { | |
1058 | if (p->item->object.flags & STALE) | |
711f6b29 | 1059 | continue; |
f37d3c75 JH |
1060 | p->item->object.flags |= STALE; |
1061 | num_head++; | |
1062 | } | |
c4a7b009 | 1063 | array = xcalloc(num_head, sizeof(*array)); |
f37d3c75 JH |
1064 | for (p = heads, i = 0; p; p = p->next) { |
1065 | if (p->item->object.flags & STALE) { | |
1066 | array[i++] = p->item; | |
1067 | p->item->object.flags &= ~STALE; | |
98cf9c3b | 1068 | } |
98cf9c3b | 1069 | } |
f37d3c75 JH |
1070 | num_head = remove_redundant(array, num_head); |
1071 | for (i = 0; i < num_head; i++) | |
1072 | tail = &commit_list_insert(array[i], tail)->next; | |
98cf9c3b JH |
1073 | return result; |
1074 | } | |
40d52ff7 | 1075 | |
ba3c69a9 JH |
1076 | static const char gpg_sig_header[] = "gpgsig"; |
1077 | static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1; | |
1078 | ||
1079 | static int do_sign_commit(struct strbuf *buf, const char *keyid) | |
1080 | { | |
1081 | struct strbuf sig = STRBUF_INIT; | |
1082 | int inspos, copypos; | |
1083 | ||
1084 | /* find the end of the header */ | |
1085 | inspos = strstr(buf->buf, "\n\n") - buf->buf + 1; | |
1086 | ||
1087 | if (!keyid || !*keyid) | |
1088 | keyid = get_signing_key(); | |
1089 | if (sign_buffer(buf, &sig, keyid)) { | |
1090 | strbuf_release(&sig); | |
1091 | return -1; | |
1092 | } | |
1093 | ||
1094 | for (copypos = 0; sig.buf[copypos]; ) { | |
1095 | const char *bol = sig.buf + copypos; | |
1096 | const char *eol = strchrnul(bol, '\n'); | |
1097 | int len = (eol - bol) + !!*eol; | |
1098 | ||
1099 | if (!copypos) { | |
1100 | strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len); | |
1101 | inspos += gpg_sig_header_len; | |
1102 | } | |
1103 | strbuf_insert(buf, inspos++, " ", 1); | |
1104 | strbuf_insert(buf, inspos, bol, len); | |
1105 | inspos += len; | |
1106 | copypos += len; | |
1107 | } | |
1108 | strbuf_release(&sig); | |
1109 | return 0; | |
1110 | } | |
1111 | ||
218aa3a6 | 1112 | int parse_signed_commit(const struct commit *commit, |
0c37f1fc JH |
1113 | struct strbuf *payload, struct strbuf *signature) |
1114 | { | |
218aa3a6 | 1115 | |
0c37f1fc | 1116 | unsigned long size; |
218aa3a6 | 1117 | const char *buffer = get_commit_buffer(commit, &size); |
0c37f1fc | 1118 | int in_signature, saw_signature = -1; |
218aa3a6 | 1119 | const char *line, *tail; |
0c37f1fc JH |
1120 | |
1121 | line = buffer; | |
1122 | tail = buffer + size; | |
1123 | in_signature = 0; | |
1124 | saw_signature = 0; | |
1125 | while (line < tail) { | |
1126 | const char *sig = NULL; | |
218aa3a6 | 1127 | const char *next = memchr(line, '\n', tail - line); |
0c37f1fc JH |
1128 | |
1129 | next = next ? next + 1 : tail; | |
1130 | if (in_signature && line[0] == ' ') | |
1131 | sig = line + 1; | |
59556548 | 1132 | else if (starts_with(line, gpg_sig_header) && |
0c37f1fc JH |
1133 | line[gpg_sig_header_len] == ' ') |
1134 | sig = line + gpg_sig_header_len + 1; | |
1135 | if (sig) { | |
1136 | strbuf_add(signature, sig, next - sig); | |
1137 | saw_signature = 1; | |
1138 | in_signature = 1; | |
1139 | } else { | |
1140 | if (*line == '\n') | |
1141 | /* dump the whole remainder of the buffer */ | |
1142 | next = tail; | |
1143 | strbuf_add(payload, line, next - line); | |
1144 | in_signature = 0; | |
1145 | } | |
1146 | line = next; | |
1147 | } | |
218aa3a6 | 1148 | unuse_commit_buffer(commit, buffer); |
0c37f1fc JH |
1149 | return saw_signature; |
1150 | } | |
1151 | ||
0b05ab6f CC |
1152 | int remove_signature(struct strbuf *buf) |
1153 | { | |
1154 | const char *line = buf->buf; | |
1155 | const char *tail = buf->buf + buf->len; | |
1156 | int in_signature = 0; | |
1157 | const char *sig_start = NULL; | |
1158 | const char *sig_end = NULL; | |
1159 | ||
1160 | while (line < tail) { | |
1161 | const char *next = memchr(line, '\n', tail - line); | |
1162 | next = next ? next + 1 : tail; | |
1163 | ||
1164 | if (in_signature && line[0] == ' ') | |
1165 | sig_end = next; | |
1166 | else if (starts_with(line, gpg_sig_header) && | |
1167 | line[gpg_sig_header_len] == ' ') { | |
1168 | sig_start = line; | |
1169 | sig_end = next; | |
1170 | in_signature = 1; | |
1171 | } else { | |
1172 | if (*line == '\n') | |
1173 | /* dump the whole remainder of the buffer */ | |
1174 | next = tail; | |
1175 | in_signature = 0; | |
1176 | } | |
1177 | line = next; | |
1178 | } | |
1179 | ||
1180 | if (sig_start) | |
1181 | strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start); | |
1182 | ||
1183 | return sig_start != NULL; | |
1184 | } | |
1185 | ||
5231c633 JH |
1186 | static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail) |
1187 | { | |
1188 | struct merge_remote_desc *desc; | |
1189 | struct commit_extra_header *mergetag; | |
1190 | char *buf; | |
1191 | unsigned long size, len; | |
1192 | enum object_type type; | |
1193 | ||
1194 | desc = merge_remote_util(parent); | |
1195 | if (!desc || !desc->obj) | |
1196 | return; | |
1197 | buf = read_sha1_file(desc->obj->sha1, &type, &size); | |
1198 | if (!buf || type != OBJ_TAG) | |
1199 | goto free_return; | |
1200 | len = parse_signature(buf, size); | |
1201 | if (size == len) | |
1202 | goto free_return; | |
1203 | /* | |
1204 | * We could verify this signature and either omit the tag when | |
1205 | * it does not validate, but the integrator may not have the | |
1206 | * public key of the signer of the tag he is merging, while a | |
1207 | * later auditor may have it while auditing, so let's not run | |
1208 | * verify-signed-buffer here for now... | |
1209 | * | |
1210 | * if (verify_signed_buffer(buf, len, buf + len, size - len, ...)) | |
1211 | * warn("warning: signed tag unverified."); | |
1212 | */ | |
1213 | mergetag = xcalloc(1, sizeof(*mergetag)); | |
1214 | mergetag->key = xstrdup("mergetag"); | |
1215 | mergetag->value = buf; | |
1216 | mergetag->len = size; | |
1217 | ||
1218 | **tail = mergetag; | |
1219 | *tail = &mergetag->next; | |
1220 | return; | |
1221 | ||
1222 | free_return: | |
1223 | free(buf); | |
1224 | } | |
1225 | ||
24d36f14 | 1226 | void check_commit_signature(const struct commit *commit, struct signature_check *sigc) |
ffb6d7d5 SG |
1227 | { |
1228 | struct strbuf payload = STRBUF_INIT; | |
1229 | struct strbuf signature = STRBUF_INIT; | |
1230 | struct strbuf gpg_output = STRBUF_INIT; | |
1231 | struct strbuf gpg_status = STRBUF_INIT; | |
1232 | int status; | |
1233 | ||
1234 | sigc->result = 'N'; | |
1235 | ||
218aa3a6 | 1236 | if (parse_signed_commit(commit, &payload, &signature) <= 0) |
ffb6d7d5 SG |
1237 | goto out; |
1238 | status = verify_signed_buffer(payload.buf, payload.len, | |
1239 | signature.buf, signature.len, | |
1240 | &gpg_output, &gpg_status); | |
1241 | if (status && !gpg_output.len) | |
1242 | goto out; | |
71c214c8 | 1243 | sigc->payload = strbuf_detach(&payload, NULL); |
ffb6d7d5 SG |
1244 | sigc->gpg_output = strbuf_detach(&gpg_output, NULL); |
1245 | sigc->gpg_status = strbuf_detach(&gpg_status, NULL); | |
1246 | parse_gpg_output(sigc); | |
1247 | ||
1248 | out: | |
1249 | strbuf_release(&gpg_status); | |
1250 | strbuf_release(&gpg_output); | |
1251 | strbuf_release(&payload); | |
1252 | strbuf_release(&signature); | |
1253 | } | |
1254 | ||
1255 | ||
1256 | ||
5231c633 JH |
1257 | void append_merge_tag_headers(struct commit_list *parents, |
1258 | struct commit_extra_header ***tail) | |
1259 | { | |
1260 | while (parents) { | |
1261 | struct commit *parent = parents->item; | |
1262 | handle_signed_tag(parent, tail); | |
1263 | parents = parents->next; | |
1264 | } | |
1265 | } | |
1266 | ||
1267 | static void add_extra_header(struct strbuf *buffer, | |
1268 | struct commit_extra_header *extra) | |
1269 | { | |
1270 | strbuf_addstr(buffer, extra->key); | |
ed7a42a0 JH |
1271 | if (extra->len) |
1272 | strbuf_add_lines(buffer, " ", extra->value, extra->len); | |
1273 | else | |
1274 | strbuf_addch(buffer, '\n'); | |
1275 | } | |
1276 | ||
c871a1d1 JH |
1277 | struct commit_extra_header *read_commit_extra_headers(struct commit *commit, |
1278 | const char **exclude) | |
ed7a42a0 JH |
1279 | { |
1280 | struct commit_extra_header *extra = NULL; | |
1281 | unsigned long size; | |
218aa3a6 JK |
1282 | const char *buffer = get_commit_buffer(commit, &size); |
1283 | extra = read_commit_extra_header_lines(buffer, size, exclude); | |
1284 | unuse_commit_buffer(commit, buffer); | |
ed7a42a0 JH |
1285 | return extra; |
1286 | } | |
1287 | ||
063da62b CC |
1288 | void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data) |
1289 | { | |
1290 | struct commit_extra_header *extra, *to_free; | |
1291 | ||
1292 | to_free = read_commit_extra_headers(commit, NULL); | |
1293 | for (extra = to_free; extra; extra = extra->next) { | |
1294 | if (strcmp(extra->key, "mergetag")) | |
1295 | continue; /* not a merge tag */ | |
1296 | fn(commit, extra, data); | |
1297 | } | |
1298 | free_commit_extra_headers(to_free); | |
1299 | } | |
1300 | ||
ed7a42a0 JH |
1301 | static inline int standard_header_field(const char *field, size_t len) |
1302 | { | |
1303 | return ((len == 4 && !memcmp(field, "tree ", 5)) || | |
1304 | (len == 6 && !memcmp(field, "parent ", 7)) || | |
1305 | (len == 6 && !memcmp(field, "author ", 7)) || | |
1306 | (len == 9 && !memcmp(field, "committer ", 10)) || | |
1307 | (len == 8 && !memcmp(field, "encoding ", 9))); | |
1308 | } | |
1309 | ||
c871a1d1 JH |
1310 | static int excluded_header_field(const char *field, size_t len, const char **exclude) |
1311 | { | |
1312 | if (!exclude) | |
1313 | return 0; | |
1314 | ||
1315 | while (*exclude) { | |
1316 | size_t xlen = strlen(*exclude); | |
1317 | if (len == xlen && | |
1318 | !memcmp(field, *exclude, xlen) && field[xlen] == ' ') | |
1319 | return 1; | |
1320 | exclude++; | |
1321 | } | |
1322 | return 0; | |
1323 | } | |
1324 | ||
82a75299 JH |
1325 | static struct commit_extra_header *read_commit_extra_header_lines( |
1326 | const char *buffer, size_t size, | |
1327 | const char **exclude) | |
ed7a42a0 JH |
1328 | { |
1329 | struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL; | |
1330 | const char *line, *next, *eof, *eob; | |
1331 | struct strbuf buf = STRBUF_INIT; | |
1332 | ||
1333 | for (line = buffer, eob = line + size; | |
1334 | line < eob && *line != '\n'; | |
1335 | line = next) { | |
1336 | next = memchr(line, '\n', eob - line); | |
1337 | next = next ? next + 1 : eob; | |
1338 | if (*line == ' ') { | |
1339 | /* continuation */ | |
1340 | if (it) | |
1341 | strbuf_add(&buf, line + 1, next - (line + 1)); | |
1342 | continue; | |
1343 | } | |
1344 | if (it) | |
1345 | it->value = strbuf_detach(&buf, &it->len); | |
1346 | strbuf_reset(&buf); | |
1347 | it = NULL; | |
1348 | ||
1349 | eof = strchr(line, ' '); | |
1350 | if (next <= eof) | |
1351 | eof = next; | |
1352 | ||
c871a1d1 JH |
1353 | if (standard_header_field(line, eof - line) || |
1354 | excluded_header_field(line, eof - line, exclude)) | |
ed7a42a0 JH |
1355 | continue; |
1356 | ||
1357 | it = xcalloc(1, sizeof(*it)); | |
1358 | it->key = xmemdupz(line, eof-line); | |
1359 | *tail = it; | |
1360 | tail = &it->next; | |
1361 | if (eof + 1 < next) | |
1362 | strbuf_add(&buf, eof + 1, next - (eof + 1)); | |
1363 | } | |
1364 | if (it) | |
1365 | it->value = strbuf_detach(&buf, &it->len); | |
1366 | return extra; | |
5231c633 JH |
1367 | } |
1368 | ||
1369 | void free_commit_extra_headers(struct commit_extra_header *extra) | |
1370 | { | |
1371 | while (extra) { | |
1372 | struct commit_extra_header *next = extra->next; | |
1373 | free(extra->key); | |
1374 | free(extra->value); | |
1375 | free(extra); | |
1376 | extra = next; | |
1377 | } | |
1378 | } | |
1379 | ||
3ffefb54 JK |
1380 | int commit_tree(const char *msg, size_t msg_len, |
1381 | const unsigned char *tree, | |
5231c633 | 1382 | struct commit_list *parents, unsigned char *ret, |
ba3c69a9 | 1383 | const char *author, const char *sign_commit) |
5231c633 JH |
1384 | { |
1385 | struct commit_extra_header *extra = NULL, **tail = &extra; | |
1386 | int result; | |
1387 | ||
1388 | append_merge_tag_headers(parents, &tail); | |
3ffefb54 | 1389 | result = commit_tree_extended(msg, msg_len, tree, parents, ret, |
ba3c69a9 | 1390 | author, sign_commit, extra); |
5231c633 JH |
1391 | free_commit_extra_headers(extra); |
1392 | return result; | |
1393 | } | |
1394 | ||
08a94a14 LT |
1395 | static int find_invalid_utf8(const char *buf, int len) |
1396 | { | |
1397 | int offset = 0; | |
e82bd6cc | 1398 | static const unsigned int max_codepoint[] = { |
1399 | 0x7f, 0x7ff, 0xffff, 0x10ffff | |
1400 | }; | |
08a94a14 LT |
1401 | |
1402 | while (len) { | |
1403 | unsigned char c = *buf++; | |
1404 | int bytes, bad_offset; | |
28110d4b | 1405 | unsigned int codepoint; |
e82bd6cc | 1406 | unsigned int min_val, max_val; |
08a94a14 LT |
1407 | |
1408 | len--; | |
1409 | offset++; | |
1410 | ||
1411 | /* Simple US-ASCII? No worries. */ | |
1412 | if (c < 0x80) | |
1413 | continue; | |
1414 | ||
1415 | bad_offset = offset-1; | |
1416 | ||
1417 | /* | |
1418 | * Count how many more high bits set: that's how | |
1419 | * many more bytes this sequence should have. | |
1420 | */ | |
1421 | bytes = 0; | |
1422 | while (c & 0x40) { | |
1423 | c <<= 1; | |
1424 | bytes++; | |
1425 | } | |
1426 | ||
28110d4b | 1427 | /* |
1428 | * Must be between 1 and 3 more bytes. Longer sequences result in | |
1429 | * codepoints beyond U+10FFFF, which are guaranteed never to exist. | |
1430 | */ | |
1431 | if (bytes < 1 || 3 < bytes) | |
08a94a14 LT |
1432 | return bad_offset; |
1433 | ||
1434 | /* Do we *have* that many bytes? */ | |
1435 | if (len < bytes) | |
1436 | return bad_offset; | |
1437 | ||
e82bd6cc | 1438 | /* |
1439 | * Place the encoded bits at the bottom of the value and compute the | |
1440 | * valid range. | |
1441 | */ | |
28110d4b | 1442 | codepoint = (c & 0x7f) >> bytes; |
e82bd6cc | 1443 | min_val = max_codepoint[bytes-1] + 1; |
1444 | max_val = max_codepoint[bytes]; | |
28110d4b | 1445 | |
08a94a14 LT |
1446 | offset += bytes; |
1447 | len -= bytes; | |
1448 | ||
1449 | /* And verify that they are good continuation bytes */ | |
1450 | do { | |
28110d4b | 1451 | codepoint <<= 6; |
1452 | codepoint |= *buf & 0x3f; | |
08a94a14 LT |
1453 | if ((*buf++ & 0xc0) != 0x80) |
1454 | return bad_offset; | |
1455 | } while (--bytes); | |
1456 | ||
e82bd6cc | 1457 | /* Reject codepoints that are out of range for the sequence length. */ |
1458 | if (codepoint < min_val || codepoint > max_val) | |
28110d4b | 1459 | return bad_offset; |
1460 | /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */ | |
1461 | if ((codepoint & 0x1ff800) == 0xd800) | |
1462 | return bad_offset; | |
81050ac6 | 1463 | /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */ |
dc773a67 | 1464 | if ((codepoint & 0xfffe) == 0xfffe) |
81050ac6 PK |
1465 | return bad_offset; |
1466 | /* So are anything in the range U+FDD0..U+FDEF. */ | |
1467 | if (codepoint >= 0xfdd0 && codepoint <= 0xfdef) | |
28110d4b | 1468 | return bad_offset; |
08a94a14 LT |
1469 | } |
1470 | return -1; | |
1471 | } | |
1472 | ||
1473 | /* | |
1474 | * This verifies that the buffer is in proper utf8 format. | |
1475 | * | |
1476 | * If it isn't, it assumes any non-utf8 characters are Latin1, | |
1477 | * and does the conversion. | |
08a94a14 LT |
1478 | */ |
1479 | static int verify_utf8(struct strbuf *buf) | |
1480 | { | |
1481 | int ok = 1; | |
1482 | long pos = 0; | |
1483 | ||
1484 | for (;;) { | |
1485 | int bad; | |
1486 | unsigned char c; | |
1487 | unsigned char replace[2]; | |
1488 | ||
1489 | bad = find_invalid_utf8(buf->buf + pos, buf->len - pos); | |
1490 | if (bad < 0) | |
1491 | return ok; | |
1492 | pos += bad; | |
1493 | ok = 0; | |
1494 | c = buf->buf[pos]; | |
1495 | strbuf_remove(buf, pos, 1); | |
1496 | ||
1497 | /* We know 'c' must be in the range 128-255 */ | |
1498 | replace[0] = 0xc0 + (c >> 6); | |
1499 | replace[1] = 0x80 + (c & 0x3f); | |
1500 | strbuf_insert(buf, pos, replace, 2); | |
1501 | pos += 2; | |
1502 | } | |
1503 | } | |
1504 | ||
40d52ff7 | 1505 | static const char commit_utf8_warn[] = |
08a94a14 | 1506 | "Warning: commit message did not conform to UTF-8.\n" |
40d52ff7 JK |
1507 | "You may want to amend it after fixing the message, or set the config\n" |
1508 | "variable i18n.commitencoding to the encoding your project uses.\n"; | |
1509 | ||
3ffefb54 JK |
1510 | int commit_tree_extended(const char *msg, size_t msg_len, |
1511 | const unsigned char *tree, | |
5231c633 | 1512 | struct commit_list *parents, unsigned char *ret, |
ba3c69a9 JH |
1513 | const char *author, const char *sign_commit, |
1514 | struct commit_extra_header *extra) | |
40d52ff7 JK |
1515 | { |
1516 | int result; | |
1517 | int encoding_is_utf8; | |
1518 | struct strbuf buffer; | |
1519 | ||
1520 | assert_sha1_type(tree, OBJ_TREE); | |
1521 | ||
3ffefb54 | 1522 | if (memchr(msg, '\0', msg_len)) |
37576c14 NTND |
1523 | return error("a NUL byte in commit log message not allowed."); |
1524 | ||
40d52ff7 JK |
1525 | /* Not having i18n.commitencoding is the same as having utf-8 */ |
1526 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); | |
1527 | ||
1528 | strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */ | |
1529 | strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree)); | |
1530 | ||
1531 | /* | |
1532 | * NOTE! This ordering means that the same exact tree merged with a | |
1533 | * different order of parents will be a _different_ changeset even | |
1534 | * if everything else stays the same. | |
1535 | */ | |
1536 | while (parents) { | |
e510ab89 | 1537 | struct commit *parent = pop_commit(&parents); |
40d52ff7 | 1538 | strbuf_addf(&buffer, "parent %s\n", |
5231c633 | 1539 | sha1_to_hex(parent->object.sha1)); |
40d52ff7 JK |
1540 | } |
1541 | ||
1542 | /* Person/date information */ | |
1543 | if (!author) | |
f9bc573f | 1544 | author = git_author_info(IDENT_STRICT); |
40d52ff7 | 1545 | strbuf_addf(&buffer, "author %s\n", author); |
f9bc573f | 1546 | strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT)); |
40d52ff7 JK |
1547 | if (!encoding_is_utf8) |
1548 | strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); | |
5231c633 JH |
1549 | |
1550 | while (extra) { | |
1551 | add_extra_header(&buffer, extra); | |
1552 | extra = extra->next; | |
1553 | } | |
40d52ff7 JK |
1554 | strbuf_addch(&buffer, '\n'); |
1555 | ||
1556 | /* And add the comment */ | |
3ffefb54 | 1557 | strbuf_add(&buffer, msg, msg_len); |
40d52ff7 JK |
1558 | |
1559 | /* And check the encoding */ | |
08a94a14 | 1560 | if (encoding_is_utf8 && !verify_utf8(&buffer)) |
40d52ff7 JK |
1561 | fprintf(stderr, commit_utf8_warn); |
1562 | ||
ba3c69a9 JH |
1563 | if (sign_commit && do_sign_commit(&buffer, sign_commit)) |
1564 | return -1; | |
1565 | ||
40d52ff7 JK |
1566 | result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret); |
1567 | strbuf_release(&buffer); | |
1568 | return result; | |
1569 | } | |
ae8e4c9c JH |
1570 | |
1571 | struct commit *get_merge_parent(const char *name) | |
1572 | { | |
1573 | struct object *obj; | |
1574 | struct commit *commit; | |
7683e2e6 | 1575 | struct object_id oid; |
1576 | if (get_sha1(name, oid.hash)) | |
ae8e4c9c | 1577 | return NULL; |
7683e2e6 | 1578 | obj = parse_object(oid.hash); |
ae8e4c9c JH |
1579 | commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); |
1580 | if (commit && !commit->util) { | |
1581 | struct merge_remote_desc *desc; | |
1582 | desc = xmalloc(sizeof(*desc)); | |
1583 | desc->obj = obj; | |
1584 | desc->name = strdup(name); | |
1585 | commit->util = desc; | |
1586 | } | |
1587 | return commit; | |
1588 | } | |
89b5f1d9 RS |
1589 | |
1590 | /* | |
1591 | * Append a commit to the end of the commit_list. | |
1592 | * | |
1593 | * next starts by pointing to the variable that holds the head of an | |
1594 | * empty commit_list, and is updated to point to the "next" field of | |
1595 | * the last item on the list as new commits are appended. | |
1596 | * | |
1597 | * Usage example: | |
1598 | * | |
1599 | * struct commit_list *list; | |
1600 | * struct commit_list **next = &list; | |
1601 | * | |
1602 | * next = commit_list_append(c1, next); | |
1603 | * next = commit_list_append(c2, next); | |
1604 | * assert(commit_list_count(list) == 2); | |
1605 | * return list; | |
1606 | */ | |
1607 | struct commit_list **commit_list_append(struct commit *commit, | |
1608 | struct commit_list **next) | |
1609 | { | |
1610 | struct commit_list *new = xmalloc(sizeof(struct commit_list)); | |
1611 | new->item = commit; | |
1612 | *next = new; | |
1613 | new->next = NULL; | |
1614 | return &new->next; | |
1615 | } | |
efc7df45 NTND |
1616 | |
1617 | void print_commit_list(struct commit_list *list, | |
1618 | const char *format_cur, | |
1619 | const char *format_last) | |
1620 | { | |
1621 | for ( ; list; list = list->next) { | |
1622 | const char *format = list->next ? format_cur : format_last; | |
1623 | printf(format, sha1_to_hex(list->item->object.sha1)); | |
1624 | } | |
1625 | } | |
fe6eb7f2 JK |
1626 | |
1627 | const char *find_commit_header(const char *msg, const char *key, size_t *out_len) | |
1628 | { | |
1629 | int key_len = strlen(key); | |
1630 | const char *line = msg; | |
1631 | ||
1632 | while (line) { | |
1633 | const char *eol = strchrnul(line, '\n'); | |
1634 | ||
1635 | if (line == eol) | |
1636 | return NULL; | |
1637 | ||
1638 | if (eol - line > key_len && | |
1639 | !strncmp(line, key, key_len) && | |
1640 | line[key_len] == ' ') { | |
1641 | *out_len = eol - line - key_len - 1; | |
1642 | return line + key_len + 1; | |
1643 | } | |
1644 | line = *eol ? eol + 1 : NULL; | |
1645 | } | |
1646 | return NULL; | |
1647 | } | |
0ed8a4e1 | 1648 | |
8c384589 CC |
1649 | /* |
1650 | * Inspect sb and determine the true "end" of the log message, in | |
1651 | * order to find where to put a new Signed-off-by: line. Ignored are | |
1652 | * trailing comment lines and blank lines, and also the traditional | |
1653 | * "Conflicts:" block that is not commented out, so that we can use | |
1654 | * "git commit -s --amend" on an existing commit that forgot to remove | |
1655 | * it. | |
1656 | * | |
1657 | * Returns the number of bytes from the tail to ignore, to be fed as | |
1658 | * the second parameter to append_signoff(). | |
1659 | */ | |
1660 | int ignore_non_trailer(struct strbuf *sb) | |
1661 | { | |
1662 | int boc = 0; | |
1663 | int bol = 0; | |
1664 | int in_old_conflicts_block = 0; | |
1665 | ||
1666 | while (bol < sb->len) { | |
1667 | char *next_line; | |
1668 | ||
1669 | if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol))) | |
1670 | next_line = sb->buf + sb->len; | |
1671 | else | |
1672 | next_line++; | |
1673 | ||
1674 | if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') { | |
1675 | /* is this the first of the run of comments? */ | |
1676 | if (!boc) | |
1677 | boc = bol; | |
1678 | /* otherwise, it is just continuing */ | |
1679 | } else if (starts_with(sb->buf + bol, "Conflicts:\n")) { | |
1680 | in_old_conflicts_block = 1; | |
1681 | if (!boc) | |
1682 | boc = bol; | |
1683 | } else if (in_old_conflicts_block && sb->buf[bol] == '\t') { | |
1684 | ; /* a pathname in the conflicts block */ | |
1685 | } else if (boc) { | |
1686 | /* the previous was not trailing comment */ | |
1687 | boc = 0; | |
1688 | in_old_conflicts_block = 0; | |
1689 | } | |
1690 | bol = next_line - sb->buf; | |
1691 | } | |
1692 | return boc ? sb->len - boc : 0; | |
1693 | } |