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