blob: dc5a0643f3d52797f29706595355fca824d9feda [file] [log] [blame]
Junio C Hamano8f1d2e62006-01-07 01:33:54 -08001#include "cache.h"
Linus Torvalds961784e2005-05-18 16:14:22 -07002#include "tag.h"
Daniel Barkalow175785e2005-04-18 11:39:48 -07003#include "commit.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +01004#include "pkt-line.h"
Junio C Hamano52883fb2006-12-25 11:48:35 -08005#include "utf8.h"
Johannes Schindeline52a5de2007-02-23 01:35:03 +01006#include "interpolate.h"
Junio C Hamano199c45b2007-04-09 02:34:05 -07007#include "diff.h"
8#include "revision.h"
Daniel Barkalow175785e2005-04-18 11:39:48 -07009
Linus Torvalds60ab26d2005-09-15 14:43:17 -070010int save_commit_buffer = 1;
11
Jon Seymourab580ac2005-07-07 02:39:34 +100012struct sort_node
13{
14 /*
Tilman Sauerbeck55c3eb42006-08-17 20:44:16 +020015 * the number of children of the associated commit
16 * that also occur in the list being sorted.
17 */
Jon Seymourab580ac2005-07-07 02:39:34 +100018 unsigned int indegree;
19
20 /*
Tilman Sauerbeck55c3eb42006-08-17 20:44:16 +020021 * reference to original list item that we will re-use
22 * on output.
23 */
Jon Seymourab580ac2005-07-07 02:39:34 +100024 struct commit_list * list_item;
25
26};
27
Daniel Barkalow175785e2005-04-18 11:39:48 -070028const char *commit_type = "commit";
29
Junio C Hamano4175e9e2007-06-13 01:42:05 -070030static struct cmt_fmt_map {
Eric Wong6cdfd172006-05-14 17:20:46 -070031 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 },
Junio C Hamano328b7102006-05-21 01:34:54 -070038 { "email", 1, CMIT_FMT_EMAIL },
Eric Wong6cdfd172006-05-14 17:20:46 -070039 { "full", 5, CMIT_FMT_FULL },
40 { "fuller", 5, CMIT_FMT_FULLER },
41 { "oneline", 1, CMIT_FMT_ONELINE },
Johannes Schindeline52a5de2007-02-23 01:35:03 +010042 { "format:", 7, CMIT_FMT_USERFORMAT},
Eric Wong6cdfd172006-05-14 17:20:46 -070043};
44
Johannes Schindeline52a5de2007-02-23 01:35:03 +010045static char *user_format;
46
Linus Torvalds9b66ec02005-06-26 17:50:46 -070047enum cmit_fmt get_commit_format(const char *arg)
48{
Eric Wong6cdfd172006-05-14 17:20:46 -070049 int i;
50
51 if (!arg || !*arg)
Linus Torvalds9b66ec02005-06-26 17:50:46 -070052 return CMIT_FMT_DEFAULT;
Eric Wong6cdfd172006-05-14 17:20:46 -070053 if (*arg == '=')
54 arg++;
Johannes Schindeline52a5de2007-02-23 01:35:03 +010055 if (!prefixcmp(arg, "format:")) {
56 if (user_format)
57 free(user_format);
58 user_format = xstrdup(arg + 7);
59 return CMIT_FMT_USERFORMAT;
60 }
Eric Wong6cdfd172006-05-14 17:20:46 -070061 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
Eric Wongb6936202007-02-02 05:10:25 -080062 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
63 !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
Eric Wong6cdfd172006-05-14 17:20:46 -070064 return cmt_fmts[i].v;
65 }
66
67 die("invalid --pretty format: %s", arg);
Linus Torvalds9b66ec02005-06-26 17:50:46 -070068}
69
Junio C Hamanof76412e2005-08-21 02:51:10 -070070static struct commit *check_commit(struct object *obj,
71 const unsigned char *sha1,
72 int quiet)
Linus Torvalds961784e2005-05-18 16:14:22 -070073{
Linus Torvalds19746322006-07-11 20:45:31 -070074 if (obj->type != OBJ_COMMIT) {
Junio C Hamanof76412e2005-08-21 02:51:10 -070075 if (!quiet)
76 error("Object %s is a %s, not a commit",
Linus Torvalds885a86a2006-06-14 16:45:13 -070077 sha1_to_hex(sha1), typename(obj->type));
Linus Torvalds961784e2005-05-18 16:14:22 -070078 return NULL;
79 }
80 return (struct commit *) obj;
81}
82
Junio C Hamanof76412e2005-08-21 02:51:10 -070083struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
84 int quiet)
Linus Torvalds961784e2005-05-18 16:14:22 -070085{
Junio C Hamano9534f402005-11-02 15:19:13 -080086 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
Linus Torvalds961784e2005-05-18 16:14:22 -070087
88 if (!obj)
89 return NULL;
Junio C Hamanof76412e2005-08-21 02:51:10 -070090 return check_commit(obj, sha1, quiet);
91}
92
93struct commit *lookup_commit_reference(const unsigned char *sha1)
94{
95 return lookup_commit_reference_gently(sha1, 0);
Linus Torvalds961784e2005-05-18 16:14:22 -070096}
97
Jason McMullan5d6ccf52005-06-03 11:05:39 -040098struct commit *lookup_commit(const unsigned char *sha1)
Daniel Barkalow175785e2005-04-18 11:39:48 -070099{
100 struct object *obj = lookup_object(sha1);
Linus Torvalds100c5f32007-04-16 22:11:43 -0700101 if (!obj)
102 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
Nicolas Pitred1af0022005-05-20 16:59:17 -0400103 if (!obj->type)
Linus Torvalds19746322006-07-11 20:45:31 -0700104 obj->type = OBJ_COMMIT;
Junio C Hamanof76412e2005-08-21 02:51:10 -0700105 return check_commit(obj, sha1, 0);
Daniel Barkalow175785e2005-04-18 11:39:48 -0700106}
107
108static 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
Junio C Hamano5040f172006-04-06 23:58:51 -0700126static struct commit_graft **commit_graft;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700127static int commit_graft_alloc, commit_graft_nr;
128
129static 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];
David Rientjesa89fccd2006-08-17 11:54:57 -0700137 int cmp = hashcmp(sha1, graft->sha1);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700138 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
Junio C Hamano5040f172006-04-06 23:58:51 -0700148int register_commit_graft(struct commit_graft *graft, int ignore_dups)
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700149{
Junio C Hamano5040f172006-04-06 23:58:51 -0700150 int pos = commit_graft_pos(graft->sha1);
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700151
Junio C Hamano5040f172006-04-06 23:58:51 -0700152 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
177struct 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;
Yann Dirson360204c2006-04-17 13:41:49 +0200185 if (buf[0] == '#' || buf[0] == '\0')
Junio C Hamano5bc4ce52006-04-16 14:24:56 -0700186 return NULL;
Junio C Hamano5040f172006-04-06 23:58:51 -0700187 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
207int read_graft_file(const char *graft_file)
208{
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700209 FILE *fp = fopen(graft_file, "r");
210 char buf[1024];
Junio C Hamano5040f172006-04-06 23:58:51 -0700211 if (!fp)
212 return -1;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700213 while (fgets(buf, sizeof(buf), fp)) {
214 /* The format is just "Commit Parent1 Parent2 ...\n" */
215 int len = strlen(buf);
Junio C Hamano5040f172006-04-06 23:58:51 -0700216 struct commit_graft *graft = read_graft_line(buf, len);
Junio C Hamano5bc4ce52006-04-16 14:24:56 -0700217 if (!graft)
218 continue;
Junio C Hamano5040f172006-04-06 23:58:51 -0700219 if (register_commit_graft(graft, 1))
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700220 error("duplicate graft data: %s", buf);
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700221 }
222 fclose(fp);
Junio C Hamano5040f172006-04-06 23:58:51 -0700223 return 0;
224}
225
226static 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);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100235 /* make sure shallows are read */
236 is_repository_shallow();
Junio C Hamano5040f172006-04-06 23:58:51 -0700237 commit_graft_prepared = 1;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700238}
239
240static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
241{
242 int pos;
Junio C Hamano5040f172006-04-06 23:58:51 -0700243 prepare_commit_graft();
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700244 pos = commit_graft_pos(sha1);
245 if (pos < 0)
246 return NULL;
247 return commit_graft[pos];
248}
249
Johannes Schindelined09aef2006-10-30 20:09:06 +0100250int 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 {
Andy Whitcroft93822c22007-01-08 15:58:23 +0000261 if (write_in_full(fd, hex, 40) != 40)
262 break;
263 if (write_in_full(fd, "\n", 1) != 1)
264 break;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100265 }
266 }
267 return count;
268}
269
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100270int 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
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400283int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
Daniel Barkalow175785e2005-04-18 11:39:48 -0700284{
Junio C Hamano3b44f152006-06-28 03:51:00 -0700285 char *tail = buffer;
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700286 char *bufptr = buffer;
Daniel Barkalow175785e2005-04-18 11:39:48 -0700287 unsigned char parent[20];
Linus Torvalds6c88be12005-06-20 20:26:03 -0700288 struct commit_list **pptr;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700289 struct commit_graft *graft;
Junio C Hamano27dedf02005-11-16 21:32:44 -0800290 unsigned n_refs = 0;
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400291
Daniel Barkalow175785e2005-04-18 11:39:48 -0700292 if (item->object.parsed)
293 return 0;
294 item->object.parsed = 1;
Junio C Hamano3b44f152006-06-28 03:51:00 -0700295 tail += size;
296 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700297 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
Junio C Hamano3b44f152006-06-28 03:51:00 -0700298 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
Junio C Hamanobd2afde2006-02-22 17:47:10 -0800299 return error("bad tree pointer in commit %s",
300 sha1_to_hex(item->object.sha1));
Daniel Barkalow175785e2005-04-18 11:39:48 -0700301 item->tree = lookup_tree(parent);
Linus Torvalds235ac402005-04-24 14:31:57 -0700302 if (item->tree)
Junio C Hamano27dedf02005-11-16 21:32:44 -0800303 n_refs++;
Daniel Barkalow175785e2005-04-18 11:39:48 -0700304 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
Linus Torvalds6c88be12005-06-20 20:26:03 -0700305 pptr = &item->parents;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700306
307 graft = lookup_commit_graft(item->object.sha1);
Junio C Hamano3b44f152006-06-28 03:51:00 -0700308 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700309 struct commit *new_parent;
310
Junio C Hamano3b44f152006-06-28 03:51:00 -0700311 if (tail <= bufptr + 48 ||
312 get_sha1_hex(bufptr + 7, parent) ||
313 bufptr[47] != '\n')
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700314 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700315 bufptr += 48;
316 if (graft)
317 continue;
Linus Torvaldsf7cc77d2005-07-27 15:12:48 -0700318 new_parent = lookup_commit(parent);
Linus Torvalds235ac402005-04-24 14:31:57 -0700319 if (new_parent) {
Linus Torvalds6c88be12005-06-20 20:26:03 -0700320 pptr = &commit_list_insert(new_parent, pptr)->next;
Junio C Hamano27dedf02005-11-16 21:32:44 -0800321 n_refs++;
Linus Torvalds235ac402005-04-24 14:31:57 -0700322 }
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700323 }
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;
Junio C Hamano27dedf02005-11-16 21:32:44 -0800332 n_refs++;
Junio C Hamano5da5c8f2005-07-30 00:58:28 -0700333 }
Daniel Barkalow175785e2005-04-18 11:39:48 -0700334 }
335 item->date = parse_commit_date(bufptr);
Junio C Hamano27dedf02005-11-16 21:32:44 -0800336
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
Daniel Barkalow175785e2005-04-18 11:39:48 -0700348 return 0;
349}
350
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400351int parse_commit(struct commit *item)
352{
Nicolas Pitre21666f12007-02-26 14:55:59 -0500353 enum object_type type;
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400354 void *buffer;
355 unsigned long size;
356 int ret;
357
358 if (item->object.parsed)
359 return 0;
Nicolas Pitre21666f12007-02-26 14:55:59 -0500360 buffer = read_sha1_file(item->object.sha1, &type, &size);
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400361 if (!buffer)
362 return error("Could not read %s",
363 sha1_to_hex(item->object.sha1));
Nicolas Pitre21666f12007-02-26 14:55:59 -0500364 if (type != OBJ_COMMIT) {
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400365 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);
Linus Torvalds60ab26d2005-09-15 14:43:17 -0700370 if (save_commit_buffer && !ret) {
Linus Torvalds3ff1fbb2005-05-25 18:27:14 -0700371 item->buffer = buffer;
372 return 0;
373 }
Nicolas Pitrebd2c39f2005-05-06 13:48:34 -0400374 free(buffer);
375 return ret;
376}
377
Linus Torvaldsac5155e2005-05-30 18:44:02 -0700378struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700379{
Christopher Li812666c2005-04-26 12:00:58 -0700380 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700381 new_list->item = item;
382 new_list->next = *list_p;
383 *list_p = new_list;
Linus Torvaldsac5155e2005-05-30 18:44:02 -0700384 return new_list;
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700385}
386
Daniel Barkalow175785e2005-04-18 11:39:48 -0700387void 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}
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700395
Linus Torvaldsf7554942005-07-06 09:31:17 -0700396struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700397{
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 }
Linus Torvaldsf7554942005-07-06 09:31:17 -0700406 return commit_list_insert(item, pp);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700407}
408
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700409
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700410void sort_by_date(struct commit_list **list)
411{
412 struct commit_list *ret = NULL;
413 while (*list) {
Linus Torvaldsf7554942005-07-06 09:31:17 -0700414 insert_by_date((*list)->item, &ret);
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700415 *list = (*list)->next;
416 }
417 *list = ret;
418}
419
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700420struct commit *pop_most_recent_commit(struct commit_list **list,
421 unsigned int mark)
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700422{
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) {
Linus Torvalds4056c092005-04-23 19:21:28 -0700431 struct commit *commit = parents->item;
Daniel Barkalow58e28af2005-04-23 20:29:22 -0700432 parse_commit(commit);
433 if (!(commit->object.flags & mark)) {
434 commit->object.flags |= mark;
Linus Torvaldsf7554942005-07-06 09:31:17 -0700435 insert_by_date(commit, list);
Linus Torvalds4056c092005-04-23 19:21:28 -0700436 }
Daniel Barkalowdd97f852005-04-23 18:47:23 -0700437 parents = parents->next;
438 }
439 return ret;
440}
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700441
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800442void clear_commit_marks(struct commit *commit, unsigned int mark)
443{
444 struct commit_list *parents;
445
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800446 commit->object.flags &= ~mark;
Junio C Hamano58ecf5c2006-07-04 17:45:22 -0700447 parents = commit->parents;
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800448 while (parents) {
Junio C Hamano160b7982006-07-03 03:05:20 -0700449 struct commit *parent = parents->item;
Junio C Hamano58ecf5c2006-07-04 17:45:22 -0700450
451 /* Have we already cleared this? */
452 if (mark & parent->object.flags)
Junio C Hamano160b7982006-07-03 03:05:20 -0700453 clear_commit_marks(parent, mark);
Junio C Hamanof8f9c732006-01-07 18:52:42 -0800454 parents = parents->next;
455 }
456}
457
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700458/*
459 * Generic support for pretty-printing the header
460 */
461static int get_one_line(const char *msg, unsigned long len)
462{
463 int ret = 0;
464
465 while (len--) {
466 char c = *msg++;
Linus Torvalds684958a2006-04-12 11:31:23 -0700467 if (!c)
468 break;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700469 ret++;
470 if (c == '\n')
471 break;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700472 }
473 return ret;
474}
475
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800476/* High bit set, or ISO-2022-INT */
477static int non_ascii(int ch)
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700478{
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800479 ch = (ch & 0xff);
480 return ((ch & 0x80) || (ch == 0x1b));
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700481}
482
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800483static int is_rfc2047_special(char ch)
484{
485 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
486}
487
488static int add_rfc2047(char *buf, const char *line, int len,
489 const char *encoding)
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700490{
491 char *bp = buf;
492 int i, needquote;
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800493 char q_encoding[128];
494 const char *q_encoding_fmt = "=?%s?q?";
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700495
496 for (i = needquote = 0; !needquote && i < len; i++) {
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800497 int ch = line[i];
498 if (non_ascii(ch))
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700499 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
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800507 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;
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700512 for (i = 0; i < len; i++) {
Junio C Hamano0da46772006-06-19 15:00:17 -0700513 unsigned ch = line[i] & 0xFF;
Kristian Høgsberg996e2d62007-06-01 17:08:12 -0400514 /*
515 * We encode ' ' using '=20' even though rfc2047
516 * allows using '_' for readability. Unfortunately,
517 * many programs do not understand this and just
518 * leave the underscore in place.
519 */
520 if (is_rfc2047_special(ch) || ch == ' ') {
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700521 sprintf(bp, "=%02X", ch);
522 bp += 3;
523 }
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700524 else
525 *bp++ = ch;
526 }
527 memcpy(bp, "?=", 2);
528 bp += 2;
529 return bp - buf;
530}
531
Junio C Hamano4234a762007-06-11 22:10:55 -0700532static unsigned long bound_rfc2047(unsigned long len, const char *encoding)
533{
534 /* upper bound of q encoded string of length 'len' */
535 unsigned long elen = strlen(encoding);
536
537 return len * 3 + elen + 100;
538}
539
Jonas Fonseca3dfb9272006-08-28 15:52:13 +0200540static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -0700541 const char *line, enum date_mode dmode,
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800542 const char *encoding)
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700543{
544 char *date;
Junio C Hamano5de36bf2005-08-29 21:17:21 -0700545 int namelen;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700546 unsigned long time;
Linus Torvalds000182e2005-06-05 09:02:03 -0700547 int tz, ret;
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800548 const char *filler = " ";
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700549
Junio C Hamanod87449c2005-08-08 22:15:40 -0700550 if (fmt == CMIT_FMT_ONELINE)
551 return 0;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700552 date = strchr(line, '>');
553 if (!date)
554 return 0;
555 namelen = ++date - line;
556 time = strtoul(date, &date, 10);
557 tz = strtol(date, NULL, 10);
558
Junio C Hamano3eefc182006-04-18 16:45:27 -0700559 if (fmt == CMIT_FMT_EMAIL) {
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700560 char *name_tail = strchr(line, '<');
561 int display_name_length;
562 if (!name_tail)
563 return 0;
564 while (line < name_tail && isspace(name_tail[-1]))
565 name_tail--;
566 display_name_length = name_tail - line;
Junio C Hamano3eefc182006-04-18 16:45:27 -0700567 filler = "";
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700568 strcpy(buf, "From: ");
569 ret = strlen(buf);
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800570 ret += add_rfc2047(buf + ret, line, display_name_length,
571 encoding);
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700572 memcpy(buf + ret, name_tail, namelen - display_name_length);
573 ret += namelen - display_name_length;
574 buf[ret++] = '\n';
Junio C Hamano3eefc182006-04-18 16:45:27 -0700575 }
Junio C Hamanocdd406e2006-05-16 02:29:42 -0700576 else {
577 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
578 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
579 filler, namelen, line);
580 }
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800581 switch (fmt) {
582 case CMIT_FMT_MEDIUM:
Jonas Fonseca3dfb9272006-08-28 15:52:13 +0200583 ret += sprintf(buf + ret, "Date: %s\n",
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -0700584 show_date(time, tz, dmode));
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800585 break;
Junio C Hamano3eefc182006-04-18 16:45:27 -0700586 case CMIT_FMT_EMAIL:
Junio C Hamano2a387042006-05-01 01:44:33 -0700587 ret += sprintf(buf + ret, "Date: %s\n",
Junio C Hamano73013af2007-07-13 23:14:52 -0700588 show_date(time, tz, DATE_RFC2822));
Junio C Hamano3eefc182006-04-18 16:45:27 -0700589 break;
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800590 case CMIT_FMT_FULLER:
Jonas Fonseca3dfb9272006-08-28 15:52:13 +0200591 ret += sprintf(buf + ret, "%sDate: %s\n", what,
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -0700592 show_date(time, tz, dmode));
Junio C Hamanoff56fe12005-11-09 22:15:27 -0800593 break;
594 default:
595 /* notin' */
596 break;
597 }
Linus Torvalds000182e2005-06-05 09:02:03 -0700598 return ret;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700599}
600
Junio C Hamano3eefc182006-04-18 16:45:27 -0700601static int is_empty_line(const char *line, int *len_p)
Linus Torvaldse3bc7a32005-06-01 08:34:23 -0700602{
Junio C Hamano3eefc182006-04-18 16:45:27 -0700603 int len = *len_p;
Linus Torvalds000182e2005-06-05 09:02:03 -0700604 while (len && isspace(line[len-1]))
605 len--;
Junio C Hamano3eefc182006-04-18 16:45:27 -0700606 *len_p = len;
Linus Torvalds000182e2005-06-05 09:02:03 -0700607 return !len;
608}
609
Junio C Hamanof2d42272006-01-27 02:17:19 -0800610static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
Linus Torvalds28342a52005-06-18 13:52:05 -0700611{
Junio C Hamanof2d42272006-01-27 02:17:19 -0800612 struct commit_list *parent = commit->parents;
613 int offset;
Junio C Hamanod87449c2005-08-08 22:15:40 -0700614
Junio C Hamano3eefc182006-04-18 16:45:27 -0700615 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
616 !parent || !parent->next)
Junio C Hamanof2d42272006-01-27 02:17:19 -0800617 return 0;
618
619 offset = sprintf(buf, "Merge:");
620
621 while (parent) {
622 struct commit *p = parent->item;
Eric Wong14763e72006-10-11 16:16:02 -0700623 const char *hex = NULL;
624 const char *dots;
625 if (abbrev)
626 hex = find_unique_abbrev(p->object.sha1, abbrev);
627 if (!hex)
628 hex = sha1_to_hex(p->object.sha1);
629 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
Junio C Hamanof2d42272006-01-27 02:17:19 -0800630 parent = parent->next;
631
Junio C Hamano6bfb27a2006-02-02 17:52:19 -0800632 offset += sprintf(buf + offset, " %s%s", hex, dots);
Linus Torvalds28342a52005-06-18 13:52:05 -0700633 }
Junio C Hamanof2d42272006-01-27 02:17:19 -0800634 buf[offset++] = '\n';
Linus Torvalds28342a52005-06-18 13:52:05 -0700635 return offset;
636}
637
Junio C Hamano52883fb2006-12-25 11:48:35 -0800638static char *get_header(const struct commit *commit, const char *key)
639{
640 int key_len = strlen(key);
641 const char *line = commit->buffer;
642
643 for (;;) {
644 const char *eol = strchr(line, '\n'), *next;
645
646 if (line == eol)
647 return NULL;
648 if (!eol) {
649 eol = line + strlen(line);
650 next = NULL;
651 } else
652 next = eol + 1;
Alex Riesene102d432007-05-04 23:51:32 +0200653 if (eol - line > key_len &&
654 !strncmp(line, key, key_len) &&
655 line[key_len] == ' ') {
Junio C Hamano52883fb2006-12-25 11:48:35 -0800656 int len = eol - line - key_len;
657 char *ret = xmalloc(len);
658 memcpy(ret, line + key_len + 1, len - 1);
659 ret[len - 1] = '\0';
660 return ret;
661 }
662 line = next;
663 }
664}
665
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500666static char *replace_encoding_header(char *buf, const char *encoding)
Junio C Hamano53af9812006-12-30 15:49:32 -0800667{
668 char *encoding_header = strstr(buf, "\nencoding ");
Jeff Kingd0e50cb2007-03-28 17:52:09 -0400669 char *header_end = strstr(buf, "\n\n");
Junio C Hamano53af9812006-12-30 15:49:32 -0800670 char *end_of_encoding_header;
671 int encoding_header_pos;
672 int encoding_header_len;
673 int new_len;
674 int need_len;
675 int buflen = strlen(buf) + 1;
676
Jeff Kingd0e50cb2007-03-28 17:52:09 -0400677 if (!header_end)
678 header_end = buf + buflen;
679 if (!encoding_header || encoding_header >= header_end)
680 return buf;
Junio C Hamano53af9812006-12-30 15:49:32 -0800681 encoding_header++;
682 end_of_encoding_header = strchr(encoding_header, '\n');
683 if (!end_of_encoding_header)
684 return buf; /* should not happen but be defensive */
685 end_of_encoding_header++;
686
687 encoding_header_len = end_of_encoding_header - encoding_header;
688 encoding_header_pos = encoding_header - buf;
689
690 if (is_encoding_utf8(encoding)) {
691 /* we have re-coded to UTF-8; drop the header */
692 memmove(encoding_header, end_of_encoding_header,
693 buflen - (encoding_header_pos + encoding_header_len));
694 return buf;
695 }
696 new_len = strlen(encoding);
697 need_len = new_len + strlen("encoding \n");
698 if (encoding_header_len < need_len) {
699 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
700 encoding_header = buf + encoding_header_pos;
701 end_of_encoding_header = encoding_header + encoding_header_len;
702 }
703 memmove(end_of_encoding_header + (need_len - encoding_header_len),
704 end_of_encoding_header,
705 buflen - (encoding_header_pos + encoding_header_len));
706 memcpy(encoding_header + 9, encoding, strlen(encoding));
707 encoding_header[9 + new_len] = '\n';
708 return buf;
709}
710
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800711static char *logmsg_reencode(const struct commit *commit,
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500712 const char *output_encoding)
Junio C Hamano52883fb2006-12-25 11:48:35 -0800713{
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500714 static const char *utf8 = "utf-8";
715 const char *use_encoding;
Junio C Hamanod2c11a32006-12-27 16:41:33 -0800716 char *encoding;
Junio C Hamano52883fb2006-12-25 11:48:35 -0800717 char *out;
718
Junio C Hamanof7e68b22007-01-12 17:32:38 -0800719 if (!*output_encoding)
Junio C Hamano52883fb2006-12-25 11:48:35 -0800720 return NULL;
Junio C Hamanod2c11a32006-12-27 16:41:33 -0800721 encoding = get_header(commit, "encoding");
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500722 use_encoding = encoding ? encoding : utf8;
723 if (!strcmp(use_encoding, output_encoding))
Marco Costalbac4640fe2007-07-22 10:23:05 +0200724 if (encoding) /* we'll strip encoding header later */
725 out = xstrdup(commit->buffer);
726 else
727 return NULL; /* nothing to do */
Junio C Hamanoe90068a2006-12-31 18:18:23 -0800728 else
729 out = reencode_string(commit->buffer,
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500730 output_encoding, use_encoding);
Junio C Hamano53af9812006-12-30 15:49:32 -0800731 if (out)
732 out = replace_encoding_header(out, output_encoding);
733
Shawn O. Pearce3a556022007-03-06 20:44:17 -0500734 free(encoding);
Junio C Hamano52883fb2006-12-25 11:48:35 -0800735 return out;
736}
737
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100738static void fill_person(struct interp *table, const char *msg, int len)
739{
740 int start, end, tz = 0;
741 unsigned long date;
742 char *ep;
743
744 /* parse name */
745 for (end = 0; end < len && msg[end] != '<'; end++)
746 ; /* do nothing */
747 start = end + 1;
748 while (end > 0 && isspace(msg[end - 1]))
749 end--;
750 table[0].value = xstrndup(msg, end);
751
752 if (start >= len)
753 return;
754
755 /* parse email */
756 for (end = start + 1; end < len && msg[end] != '>'; end++)
757 ; /* do nothing */
758
759 if (end >= len)
760 return;
761
762 table[1].value = xstrndup(msg + start, end - start);
763
764 /* parse date */
765 for (start = end + 1; start < len && isspace(msg[start]); start++)
766 ; /* do nothing */
767 if (start >= len)
768 return;
769 date = strtoul(msg + start, &ep, 10);
770 if (msg + start == ep)
771 return;
772
Jeff King4621af32007-03-27 19:26:28 -0400773 table[5].value = xstrndup(msg + start, ep - (msg + start));
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100774
775 /* parse tz */
776 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
777 ; /* do nothing */
778 if (start + 1 < len) {
779 tz = strtoul(msg + start + 1, NULL, 10);
780 if (msg[start] == '-')
781 tz = -tz;
782 }
783
Junio C Hamano73013af2007-07-13 23:14:52 -0700784 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
785 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
786 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
Robin Rosenbergee8f8382007-07-14 01:00:42 +0200787 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100788}
789
790static long format_commit_message(const struct commit *commit,
Junio C Hamano80583c02007-06-11 00:34:54 -0700791 const char *msg, char **buf_p, unsigned long *space_p)
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100792{
793 struct interp table[] = {
794 { "%H" }, /* commit hash */
795 { "%h" }, /* abbreviated commit hash */
796 { "%T" }, /* tree hash */
797 { "%t" }, /* abbreviated tree hash */
798 { "%P" }, /* parent hashes */
799 { "%p" }, /* abbreviated parent hashes */
800 { "%an" }, /* author name */
801 { "%ae" }, /* author email */
802 { "%ad" }, /* author date */
803 { "%aD" }, /* author date, RFC2822 style */
804 { "%ar" }, /* author date, relative */
805 { "%at" }, /* author date, UNIX timestamp */
Robin Rosenbergee8f8382007-07-14 01:00:42 +0200806 { "%ai" }, /* author date, ISO 8601 */
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100807 { "%cn" }, /* committer name */
808 { "%ce" }, /* committer email */
809 { "%cd" }, /* committer date */
810 { "%cD" }, /* committer date, RFC2822 style */
811 { "%cr" }, /* committer date, relative */
812 { "%ct" }, /* committer date, UNIX timestamp */
Robin Rosenbergee8f8382007-07-14 01:00:42 +0200813 { "%ci" }, /* committer date, ISO 8601 */
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100814 { "%e" }, /* encoding */
815 { "%s" }, /* subject */
816 { "%b" }, /* body */
817 { "%Cred" }, /* red */
818 { "%Cgreen" }, /* green */
819 { "%Cblue" }, /* blue */
820 { "%Creset" }, /* reset color */
Junio C Hamano199c45b2007-04-09 02:34:05 -0700821 { "%n" }, /* newline */
822 { "%m" }, /* left/right/bottom */
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100823 };
824 enum interp_index {
825 IHASH = 0, IHASH_ABBREV,
826 ITREE, ITREE_ABBREV,
827 IPARENTS, IPARENTS_ABBREV,
828 IAUTHOR_NAME, IAUTHOR_EMAIL,
829 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
Robin Rosenbergee8f8382007-07-14 01:00:42 +0200830 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100831 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
832 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
833 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
Robin Rosenbergee8f8382007-07-14 01:00:42 +0200834 ICOMMITTER_ISO8601,
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100835 IENCODING,
836 ISUBJECT,
837 IBODY,
838 IRED, IGREEN, IBLUE, IRESET_COLOR,
Junio C Hamano199c45b2007-04-09 02:34:05 -0700839 INEWLINE,
840 ILEFT_RIGHT,
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100841 };
842 struct commit_list *p;
843 char parents[1024];
844 int i;
845 enum { HEADER, SUBJECT, BODY } state;
846
Junio C Hamano199c45b2007-04-09 02:34:05 -0700847 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100848 die("invalid interp table!");
849
850 /* these are independent of the commit */
851 interp_set_entry(table, IRED, "\033[31m");
852 interp_set_entry(table, IGREEN, "\033[32m");
853 interp_set_entry(table, IBLUE, "\033[34m");
854 interp_set_entry(table, IRESET_COLOR, "\033[m");
855 interp_set_entry(table, INEWLINE, "\n");
856
857 /* these depend on the commit */
858 if (!commit->object.parsed)
859 parse_object(commit->object.sha1);
860 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
861 interp_set_entry(table, IHASH_ABBREV,
862 find_unique_abbrev(commit->object.sha1,
863 DEFAULT_ABBREV));
864 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
865 interp_set_entry(table, ITREE_ABBREV,
866 find_unique_abbrev(commit->tree->object.sha1,
867 DEFAULT_ABBREV));
Junio C Hamano199c45b2007-04-09 02:34:05 -0700868 interp_set_entry(table, ILEFT_RIGHT,
869 (commit->object.flags & BOUNDARY)
870 ? "-"
871 : (commit->object.flags & SYMMETRIC_LEFT)
872 ? "<"
873 : ">");
Junio C Hamano542e1652007-03-28 13:33:37 -0700874
875 parents[1] = 0;
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100876 for (i = 0, p = commit->parents;
877 p && i < sizeof(parents) - 1;
878 p = p->next)
Junio C Hamano542e1652007-03-28 13:33:37 -0700879 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100880 sha1_to_hex(p->item->object.sha1));
Junio C Hamano542e1652007-03-28 13:33:37 -0700881 interp_set_entry(table, IPARENTS, parents + 1);
882
883 parents[1] = 0;
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100884 for (i = 0, p = commit->parents;
885 p && i < sizeof(parents) - 1;
886 p = p->next)
Junio C Hamano542e1652007-03-28 13:33:37 -0700887 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100888 find_unique_abbrev(p->item->object.sha1,
889 DEFAULT_ABBREV));
Junio C Hamano542e1652007-03-28 13:33:37 -0700890 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100891
892 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
893 int eol;
894 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
895 ; /* do nothing */
896
897 if (state == SUBJECT) {
898 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
899 i = eol;
900 }
901 if (i == eol) {
902 state++;
903 /* strip empty lines */
904 while (msg[eol + 1] == '\n')
905 eol++;
906 } else if (!prefixcmp(msg + i, "author "))
907 fill_person(table + IAUTHOR_NAME,
908 msg + i + 7, eol - i - 7);
909 else if (!prefixcmp(msg + i, "committer "))
910 fill_person(table + ICOMMITTER_NAME,
911 msg + i + 10, eol - i - 10);
912 else if (!prefixcmp(msg + i, "encoding "))
Jeff King6a5ea2d2007-03-28 17:09:05 -0400913 table[IENCODING].value =
914 xstrndup(msg + i + 9, eol - i - 9);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100915 i = eol;
916 }
917 if (msg[i])
918 table[IBODY].value = xstrdup(msg + i);
919 for (i = 0; i < ARRAY_SIZE(table); i++)
920 if (!table[i].value)
921 interp_set_entry(table, i, "<unknown>");
922
Junio C Hamano80583c02007-06-11 00:34:54 -0700923 do {
924 char *buf = *buf_p;
925 unsigned long space = *space_p;
926
927 space = interpolate(buf, space, user_format,
928 table, ARRAY_SIZE(table));
929 if (!space)
930 break;
931 buf = xrealloc(buf, space);
932 *buf_p = buf;
933 *space_p = space;
934 } while (1);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100935 interp_clear_table(table, ARRAY_SIZE(table));
936
Junio C Hamano80583c02007-06-11 00:34:54 -0700937 return strlen(*buf_p);
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100938}
939
Junio C Hamano4234a762007-06-11 22:10:55 -0700940static void pp_header(enum cmit_fmt fmt,
941 int abbrev,
942 enum date_mode dmode,
943 const char *encoding,
944 const struct commit *commit,
945 const char **msg_p,
946 unsigned long *len_p,
947 unsigned long *ofs_p,
948 char **buf_p,
949 unsigned long *space_p)
950{
951 int parents_shown = 0;
952
953 for (;;) {
954 const char *line = *msg_p;
955 char *dst;
956 int linelen = get_one_line(*msg_p, *len_p);
957 unsigned long len;
958
959 if (!linelen)
960 return;
961 *msg_p += linelen;
962 *len_p -= linelen;
963
964 if (linelen == 1)
965 /* End of header */
966 return;
967
968 ALLOC_GROW(*buf_p, linelen + *ofs_p + 20, *space_p);
969 dst = *buf_p + *ofs_p;
970
971 if (fmt == CMIT_FMT_RAW) {
972 memcpy(dst, line, linelen);
973 *ofs_p += linelen;
974 continue;
975 }
976
977 if (!memcmp(line, "parent ", 7)) {
978 if (linelen != 48)
979 die("bad parent line in commit");
980 continue;
981 }
982
983 if (!parents_shown) {
984 struct commit_list *parent;
985 int num;
986 for (parent = commit->parents, num = 0;
987 parent;
988 parent = parent->next, num++)
989 ;
990 /* with enough slop */
991 num = *ofs_p + num * 50 + 20;
992 ALLOC_GROW(*buf_p, num, *space_p);
993 dst = *buf_p + *ofs_p;
994 *ofs_p += add_merge_info(fmt, dst, commit, abbrev);
995 parents_shown = 1;
996 }
997
998 /*
999 * MEDIUM == DEFAULT shows only author with dates.
1000 * FULL shows both authors but not dates.
1001 * FULLER shows both authors and dates.
1002 */
1003 if (!memcmp(line, "author ", 7)) {
1004 len = linelen;
1005 if (fmt == CMIT_FMT_EMAIL)
1006 len = bound_rfc2047(linelen, encoding);
Johannes Schindelin4cd008a2007-06-15 13:19:07 +01001007 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
Junio C Hamano4234a762007-06-11 22:10:55 -07001008 dst = *buf_p + *ofs_p;
1009 *ofs_p += add_user_info("Author", fmt, dst,
1010 line + 7, dmode, encoding);
1011 }
1012
1013 if (!memcmp(line, "committer ", 10) &&
1014 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
1015 len = linelen;
1016 if (fmt == CMIT_FMT_EMAIL)
1017 len = bound_rfc2047(linelen, encoding);
Johannes Schindelin4cd008a2007-06-15 13:19:07 +01001018 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
Junio C Hamano4234a762007-06-11 22:10:55 -07001019 dst = *buf_p + *ofs_p;
1020 *ofs_p += add_user_info("Commit", fmt, dst,
1021 line + 10, dmode, encoding);
1022 }
1023 }
1024}
1025
1026static void pp_title_line(enum cmit_fmt fmt,
1027 const char **msg_p,
1028 unsigned long *len_p,
1029 unsigned long *ofs_p,
1030 char **buf_p,
1031 unsigned long *space_p,
1032 int indent,
1033 const char *subject,
1034 const char *after_subject,
1035 const char *encoding,
1036 int plain_non_ascii)
1037{
1038 char *title;
1039 unsigned long title_alloc, title_len;
1040 unsigned long len;
1041
1042 title_len = 0;
1043 title_alloc = 80;
1044 title = xmalloc(title_alloc);
1045 for (;;) {
1046 const char *line = *msg_p;
1047 int linelen = get_one_line(line, *len_p);
1048 *msg_p += linelen;
1049 *len_p -= linelen;
1050
1051 if (!linelen || is_empty_line(line, &linelen))
1052 break;
1053
1054 if (title_alloc <= title_len + linelen + 2) {
1055 title_alloc = title_len + linelen + 80;
1056 title = xrealloc(title, title_alloc);
1057 }
1058 len = 0;
1059 if (title_len) {
1060 if (fmt == CMIT_FMT_EMAIL) {
1061 len++;
1062 title[title_len++] = '\n';
1063 }
1064 len++;
1065 title[title_len++] = ' ';
1066 }
1067 memcpy(title + title_len, line, linelen);
1068 title_len += linelen;
1069 }
1070
1071 /* Enough slop for the MIME header and rfc2047 */
1072 len = bound_rfc2047(title_len, encoding)+ 1000;
1073 if (subject)
1074 len += strlen(subject);
1075 if (after_subject)
1076 len += strlen(after_subject);
1077 if (encoding)
1078 len += strlen(encoding);
1079 ALLOC_GROW(*buf_p, title_len + *ofs_p + len, *space_p);
1080
1081 if (subject) {
1082 len = strlen(subject);
1083 memcpy(*buf_p + *ofs_p, subject, len);
1084 *ofs_p += len;
1085 *ofs_p += add_rfc2047(*buf_p + *ofs_p,
1086 title, title_len, encoding);
1087 } else {
1088 memcpy(*buf_p + *ofs_p, title, title_len);
1089 *ofs_p += title_len;
1090 }
1091 (*buf_p)[(*ofs_p)++] = '\n';
1092 if (plain_non_ascii) {
1093 const char *header_fmt =
1094 "MIME-Version: 1.0\n"
1095 "Content-Type: text/plain; charset=%s\n"
1096 "Content-Transfer-Encoding: 8bit\n";
1097 *ofs_p += snprintf(*buf_p + *ofs_p,
1098 *space_p - *ofs_p,
1099 header_fmt, encoding);
1100 }
1101 if (after_subject) {
1102 len = strlen(after_subject);
1103 memcpy(*buf_p + *ofs_p, after_subject, len);
1104 *ofs_p += len;
1105 }
1106 free(title);
1107 if (fmt == CMIT_FMT_EMAIL) {
1108 ALLOC_GROW(*buf_p, *ofs_p + 20, *space_p);
1109 (*buf_p)[(*ofs_p)++] = '\n';
1110 }
1111}
1112
1113static void pp_remainder(enum cmit_fmt fmt,
1114 const char **msg_p,
1115 unsigned long *len_p,
1116 unsigned long *ofs_p,
1117 char **buf_p,
1118 unsigned long *space_p,
1119 int indent)
1120{
1121 int first = 1;
1122 for (;;) {
1123 const char *line = *msg_p;
1124 int linelen = get_one_line(line, *len_p);
1125 *msg_p += linelen;
1126 *len_p -= linelen;
1127
1128 if (!linelen)
1129 break;
1130
1131 if (is_empty_line(line, &linelen)) {
1132 if (first)
1133 continue;
1134 if (fmt == CMIT_FMT_SHORT)
1135 break;
1136 }
1137 first = 0;
1138
1139 ALLOC_GROW(*buf_p, *ofs_p + linelen + indent + 20, *space_p);
1140 if (indent) {
1141 memset(*buf_p + *ofs_p, ' ', indent);
1142 *ofs_p += indent;
1143 }
1144 memcpy(*buf_p + *ofs_p, line, linelen);
1145 *ofs_p += linelen;
1146 (*buf_p)[(*ofs_p)++] = '\n';
1147 }
Junio C Hamano52883fb2006-12-25 11:48:35 -08001148}
1149
1150unsigned long pretty_print_commit(enum cmit_fmt fmt,
1151 const struct commit *commit,
1152 unsigned long len,
Junio C Hamano80583c02007-06-11 00:34:54 -07001153 char **buf_p, unsigned long *space_p,
Jonas Fonseca3dfb9272006-08-28 15:52:13 +02001154 int abbrev, const char *subject,
Junio C Hamano52883fb2006-12-25 11:48:35 -08001155 const char *after_subject,
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -07001156 enum date_mode dmode)
Linus Torvalds000182e2005-06-05 09:02:03 -07001157{
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001158 unsigned long offset = 0;
Junio C Hamano4234a762007-06-11 22:10:55 -07001159 unsigned long beginning_of_body;
Junio C Hamano3eefc182006-04-18 16:45:27 -07001160 int indent = 4;
Junio C Hamano3815f422006-01-27 01:54:59 -08001161 const char *msg = commit->buffer;
Junio C Hamanoc831da62006-05-21 23:55:00 -07001162 int plain_non_ascii = 0;
Junio C Hamanof7e68b22007-01-12 17:32:38 -08001163 char *reencoded;
Shawn O. Pearce3a556022007-03-06 20:44:17 -05001164 const char *encoding;
Junio C Hamano80583c02007-06-11 00:34:54 -07001165 char *buf;
Junio C Hamano52883fb2006-12-25 11:48:35 -08001166
Johannes Schindeline52a5de2007-02-23 01:35:03 +01001167 if (fmt == CMIT_FMT_USERFORMAT)
Junio C Hamano80583c02007-06-11 00:34:54 -07001168 return format_commit_message(commit, msg, buf_p, space_p);
Johannes Schindeline52a5de2007-02-23 01:35:03 +01001169
Junio C Hamanof7e68b22007-01-12 17:32:38 -08001170 encoding = (git_log_output_encoding
1171 ? git_log_output_encoding
1172 : git_commit_encoding);
1173 if (!encoding)
1174 encoding = "utf-8";
1175 reencoded = logmsg_reencode(commit, encoding);
Junio C Hamano4234a762007-06-11 22:10:55 -07001176 if (reencoded) {
Junio C Hamanod2c11a32006-12-27 16:41:33 -08001177 msg = reencoded;
Junio C Hamano4234a762007-06-11 22:10:55 -07001178 len = strlen(reencoded);
1179 }
Junio C Hamano3eefc182006-04-18 16:45:27 -07001180
Junio C Hamano3eefc182006-04-18 16:45:27 -07001181 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1182 indent = 0;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001183
Junio C Hamanoc831da62006-05-21 23:55:00 -07001184 /* After-subject is used to pass in Content-Type: multipart
1185 * MIME header; in that case we do not have to do the
1186 * plaintext content type even if the commit message has
1187 * non 7-bit ASCII character. Otherwise, check if we need
1188 * to say this is not a 7-bit ASCII.
1189 */
1190 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
Junio C Hamano0da46772006-06-19 15:00:17 -07001191 int i, ch, in_body;
1192
1193 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
1194 if (!in_body) {
1195 /* author could be non 7-bit ASCII but
Junio C Hamanod2c11a32006-12-27 16:41:33 -08001196 * the log may be so; skip over the
Junio C Hamano0da46772006-06-19 15:00:17 -07001197 * header part first.
1198 */
1199 if (ch == '\n' &&
1200 i + 1 < len && msg[i+1] == '\n')
1201 in_body = 1;
1202 }
Junio C Hamanof7e68b22007-01-12 17:32:38 -08001203 else if (non_ascii(ch)) {
Junio C Hamanoc831da62006-05-21 23:55:00 -07001204 plain_non_ascii = 1;
Junio C Hamano0da46772006-06-19 15:00:17 -07001205 break;
1206 }
1207 }
Junio C Hamanoc831da62006-05-21 23:55:00 -07001208 }
1209
Junio C Hamano4234a762007-06-11 22:10:55 -07001210 pp_header(fmt, abbrev, dmode, encoding,
1211 commit, &msg, &len,
1212 &offset, buf_p, space_p);
1213 if (fmt != CMIT_FMT_ONELINE && !subject) {
1214 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1215 (*buf_p)[offset++] = '\n';
Junio C Hamano80583c02007-06-11 00:34:54 -07001216 }
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001217
Junio C Hamano4234a762007-06-11 22:10:55 -07001218 /* Skip excess blank lines at the beginning of body, if any... */
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001219 for (;;) {
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001220 int linelen = get_one_line(msg, len);
Junio C Hamano4234a762007-06-11 22:10:55 -07001221 int ll = linelen;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001222 if (!linelen)
1223 break;
Junio C Hamano4234a762007-06-11 22:10:55 -07001224 if (!is_empty_line(msg, &ll))
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001225 break;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001226 msg += linelen;
1227 len -= linelen;
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001228 }
Junio C Hamano4234a762007-06-11 22:10:55 -07001229
1230 /* These formats treat the title line specially. */
1231 if (fmt == CMIT_FMT_ONELINE
1232 || fmt == CMIT_FMT_EMAIL)
1233 pp_title_line(fmt, &msg, &len, &offset,
1234 buf_p, space_p, indent,
1235 subject, after_subject, encoding,
1236 plain_non_ascii);
1237
1238 beginning_of_body = offset;
1239 if (fmt != CMIT_FMT_ONELINE)
1240 pp_remainder(fmt, &msg, &len, &offset,
1241 buf_p, space_p, indent);
1242
1243 while (offset && isspace((*buf_p)[offset-1]))
Linus Torvalds40c2fe02006-04-14 21:20:51 -07001244 offset--;
Junio C Hamano4234a762007-06-11 22:10:55 -07001245
1246 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1247 buf = *buf_p;
1248
Linus Torvalds40c2fe02006-04-14 21:20:51 -07001249 /* Make sure there is an EOLN for the non-oneline case */
1250 if (fmt != CMIT_FMT_ONELINE)
1251 buf[offset++] = '\n';
Junio C Hamano4234a762007-06-11 22:10:55 -07001252
Robert Shearman19b3bd32006-07-13 23:17:22 +01001253 /*
Junio C Hamano4234a762007-06-11 22:10:55 -07001254 * The caller may append additional body text in e-mail
1255 * format. Make sure we did not strip the blank line
1256 * between the header and the body.
Robert Shearman19b3bd32006-07-13 23:17:22 +01001257 */
Junio C Hamano4234a762007-06-11 22:10:55 -07001258 if (fmt == CMIT_FMT_EMAIL && offset <= beginning_of_body)
Robert Shearman19b3bd32006-07-13 23:17:22 +01001259 buf[offset++] = '\n';
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001260 buf[offset] = '\0';
Junio C Hamano52883fb2006-12-25 11:48:35 -08001261 free(reencoded);
Linus Torvaldse3bc7a32005-06-01 08:34:23 -07001262 return offset;
1263}
jon@blackcubes.dyndns.orga3437b82005-06-06 15:39:40 +00001264
1265struct commit *pop_commit(struct commit_list **stack)
1266{
1267 struct commit_list *top = *stack;
1268 struct commit *item = top ? top->item : NULL;
1269
1270 if (top) {
1271 *stack = top->next;
1272 free(top);
1273 }
1274 return item;
1275}
1276
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001277void topo_sort_default_setter(struct commit *c, void *data)
1278{
Linus Torvaldsd3ff6f52006-06-17 18:26:18 -07001279 c->util = data;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001280}
1281
1282void *topo_sort_default_getter(struct commit *c)
1283{
Linus Torvaldsd3ff6f52006-06-17 18:26:18 -07001284 return c->util;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001285}
1286
Jon Seymourab580ac2005-07-07 02:39:34 +10001287/*
1288 * Performs an in-place topological sort on the list supplied.
1289 */
Junio C Hamano4c8725f2006-02-15 22:05:33 -08001290void sort_in_topological_order(struct commit_list ** list, int lifo)
Jon Seymourab580ac2005-07-07 02:39:34 +10001291{
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001292 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1293 topo_sort_default_getter);
1294}
1295
1296void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1297 topo_sort_set_fn_t setter,
1298 topo_sort_get_fn_t getter)
1299{
Jon Seymourab580ac2005-07-07 02:39:34 +10001300 struct commit_list * next = *list;
Linus Torvalds2ed02882005-11-14 10:01:26 -08001301 struct commit_list * work = NULL, **insert;
Jon Seymourab580ac2005-07-07 02:39:34 +10001302 struct commit_list ** pptr = list;
1303 struct sort_node * nodes;
1304 struct sort_node * next_nodes;
1305 int count = 0;
1306
1307 /* determine the size of the list */
1308 while (next) {
1309 next = next->next;
1310 count++;
1311 }
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001312
Eric Wong7d6fb372005-12-24 04:12:43 -08001313 if (!count)
1314 return;
Jon Seymourab580ac2005-07-07 02:39:34 +10001315 /* allocate an array to help sort the list */
1316 nodes = xcalloc(count, sizeof(*nodes));
1317 /* link the list to the array */
1318 next_nodes = nodes;
1319 next=*list;
1320 while (next) {
1321 next_nodes->list_item = next;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001322 setter(next->item, next_nodes);
Jon Seymourab580ac2005-07-07 02:39:34 +10001323 next_nodes++;
1324 next = next->next;
1325 }
1326 /* update the indegree */
1327 next=*list;
1328 while (next) {
1329 struct commit_list * parents = next->item->parents;
1330 while (parents) {
1331 struct commit * parent=parents->item;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001332 struct sort_node * pn = (struct sort_node *) getter(parent);
1333
Jon Seymourab580ac2005-07-07 02:39:34 +10001334 if (pn)
1335 pn->indegree++;
1336 parents=parents->next;
1337 }
1338 next=next->next;
1339 }
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001340 /*
Jon Seymourab580ac2005-07-07 02:39:34 +10001341 * find the tips
1342 *
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001343 * tips are nodes not reachable from any other node in the list
1344 *
Jon Seymourab580ac2005-07-07 02:39:34 +10001345 * the tips serve as a starting set for the work queue.
1346 */
1347 next=*list;
Linus Torvalds2ed02882005-11-14 10:01:26 -08001348 insert = &work;
Jon Seymourab580ac2005-07-07 02:39:34 +10001349 while (next) {
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001350 struct sort_node * node = (struct sort_node *) getter(next->item);
Jon Seymourab580ac2005-07-07 02:39:34 +10001351
1352 if (node->indegree == 0) {
Linus Torvalds2ed02882005-11-14 10:01:26 -08001353 insert = &commit_list_insert(next->item, insert)->next;
Jon Seymourab580ac2005-07-07 02:39:34 +10001354 }
1355 next=next->next;
1356 }
Junio C Hamano4c8725f2006-02-15 22:05:33 -08001357
Jon Seymourab580ac2005-07-07 02:39:34 +10001358 /* process the list in topological order */
Junio C Hamano4c8725f2006-02-15 22:05:33 -08001359 if (!lifo)
1360 sort_by_date(&work);
Jon Seymourab580ac2005-07-07 02:39:34 +10001361 while (work) {
1362 struct commit * work_item = pop_commit(&work);
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001363 struct sort_node * work_node = (struct sort_node *) getter(work_item);
Jon Seymourab580ac2005-07-07 02:39:34 +10001364 struct commit_list * parents = work_item->parents;
1365
1366 while (parents) {
1367 struct commit * parent=parents->item;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001368 struct sort_node * pn = (struct sort_node *) getter(parent);
1369
Jon Seymourab580ac2005-07-07 02:39:34 +10001370 if (pn) {
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001371 /*
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001372 * parents are only enqueued for emission
Jon Seymourab580ac2005-07-07 02:39:34 +10001373 * when all their children have been emitted thereby
1374 * guaranteeing topological order.
1375 */
1376 pn->indegree--;
Junio C Hamano4c8725f2006-02-15 22:05:33 -08001377 if (!pn->indegree) {
1378 if (!lifo)
1379 insert_by_date(parent, &work);
1380 else
1381 commit_list_insert(parent, &work);
1382 }
Jon Seymourab580ac2005-07-07 02:39:34 +10001383 }
1384 parents=parents->next;
1385 }
1386 /*
1387 * work_item is a commit all of whose children
1388 * have already been emitted. we can emit it now.
1389 */
1390 *pptr = work_node->list_item;
1391 pptr = &(*pptr)->next;
1392 *pptr = NULL;
Fredrik Kuivinen6b6dcfc2006-03-10 10:21:37 +01001393 setter(work_item, NULL);
Jon Seymourab580ac2005-07-07 02:39:34 +10001394 }
1395 free(nodes);
1396}
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001397
Junio C Hamano12952282007-01-08 23:10:49 -08001398/* merge-base stuff */
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001399
Junio C Hamano577ed5c2006-10-22 17:32:47 -07001400/* bits #0..15 in revision.h */
1401#define PARENT1 (1u<<16)
1402#define PARENT2 (1u<<17)
1403#define STALE (1u<<18)
1404#define RESULT (1u<<19)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001405
Junio C Hamano12952282007-01-08 23:10:49 -08001406static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1407
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001408static struct commit *interesting(struct commit_list *list)
1409{
1410 while (list) {
1411 struct commit *commit = list->item;
1412 list = list->next;
Junio C Hamano542ccef2006-07-02 11:34:17 -07001413 if (commit->object.flags & STALE)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001414 continue;
1415 return commit;
1416 }
1417 return NULL;
1418}
1419
Junio C Hamanof3249432006-07-04 18:46:42 -07001420static struct commit_list *merge_bases(struct commit *one, struct commit *two)
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001421{
1422 struct commit_list *list = NULL;
1423 struct commit_list *result = NULL;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001424
Junio C Hamanof3249432006-07-04 18:46:42 -07001425 if (one == two)
1426 /* We do not mark this even with RESULT so we do not
1427 * have to clean it up.
1428 */
1429 return commit_list_insert(one, &result);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001430
Junio C Hamanof3249432006-07-04 18:46:42 -07001431 parse_commit(one);
1432 parse_commit(two);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001433
Junio C Hamanof3249432006-07-04 18:46:42 -07001434 one->object.flags |= PARENT1;
1435 two->object.flags |= PARENT2;
1436 insert_by_date(one, &list);
1437 insert_by_date(two, &list);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001438
1439 while (interesting(list)) {
Junio C Hamanof3249432006-07-04 18:46:42 -07001440 struct commit *commit;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001441 struct commit_list *parents;
Junio C Hamanof3249432006-07-04 18:46:42 -07001442 struct commit_list *n;
1443 int flags;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001444
Junio C Hamanof3249432006-07-04 18:46:42 -07001445 commit = list->item;
1446 n = list->next;
1447 free(list);
1448 list = n;
1449
1450 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001451 if (flags == (PARENT1 | PARENT2)) {
Junio C Hamanof3249432006-07-04 18:46:42 -07001452 if (!(commit->object.flags & RESULT)) {
1453 commit->object.flags |= RESULT;
1454 insert_by_date(commit, &result);
1455 }
Junio C Hamano542ccef2006-07-02 11:34:17 -07001456 /* Mark parents of a found merge stale */
1457 flags |= STALE;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001458 }
1459 parents = commit->parents;
1460 while (parents) {
1461 struct commit *p = parents->item;
1462 parents = parents->next;
1463 if ((p->object.flags & flags) == flags)
1464 continue;
1465 parse_commit(p);
1466 p->object.flags |= flags;
1467 insert_by_date(p, &list);
1468 }
1469 }
1470
Junio C Hamanof3249432006-07-04 18:46:42 -07001471 /* Clean up the result to remove stale ones */
Junio C Hamano12952282007-01-08 23:10:49 -08001472 free_commit_list(list);
Junio C Hamanof3249432006-07-04 18:46:42 -07001473 list = result; result = NULL;
1474 while (list) {
1475 struct commit_list *n = list->next;
1476 if (!(list->item->object.flags & STALE))
1477 insert_by_date(list->item, &result);
1478 free(list);
1479 list = n;
1480 }
1481 return result;
1482}
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001483
Junio C Hamanof3249432006-07-04 18:46:42 -07001484struct commit_list *get_merge_bases(struct commit *one,
1485 struct commit *two,
1486 int cleanup)
1487{
Junio C Hamanof3249432006-07-04 18:46:42 -07001488 struct commit_list *list;
1489 struct commit **rslt;
1490 struct commit_list *result;
1491 int cnt, i, j;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001492
Junio C Hamanof3249432006-07-04 18:46:42 -07001493 result = merge_bases(one, two);
1494 if (one == two)
1495 return result;
1496 if (!result || !result->next) {
1497 if (cleanup) {
1498 clear_commit_marks(one, all_flags);
1499 clear_commit_marks(two, all_flags);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001500 }
Junio C Hamanof3249432006-07-04 18:46:42 -07001501 return result;
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001502 }
1503
Junio C Hamanof3249432006-07-04 18:46:42 -07001504 /* There are more than one */
1505 cnt = 0;
1506 list = result;
1507 while (list) {
1508 list = list->next;
1509 cnt++;
1510 }
1511 rslt = xcalloc(cnt, sizeof(*rslt));
1512 for (list = result, i = 0; list; list = list->next)
1513 rslt[i++] = list->item;
1514 free_commit_list(result);
1515
1516 clear_commit_marks(one, all_flags);
1517 clear_commit_marks(two, all_flags);
1518 for (i = 0; i < cnt - 1; i++) {
1519 for (j = i+1; j < cnt; j++) {
1520 if (!rslt[i] || !rslt[j])
1521 continue;
1522 result = merge_bases(rslt[i], rslt[j]);
1523 clear_commit_marks(rslt[i], all_flags);
1524 clear_commit_marks(rslt[j], all_flags);
1525 for (list = result; list; list = list->next) {
1526 if (rslt[i] == list->item)
1527 rslt[i] = NULL;
1528 if (rslt[j] == list->item)
1529 rslt[j] = NULL;
1530 }
1531 }
Junio C Hamano58ecf5c2006-07-04 17:45:22 -07001532 }
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001533
Junio C Hamanof3249432006-07-04 18:46:42 -07001534 /* Surviving ones in rslt[] are the independent results */
1535 result = NULL;
1536 for (i = 0; i < cnt; i++) {
1537 if (rslt[i])
1538 insert_by_date(rslt[i], &result);
1539 }
1540 free(rslt);
Johannes Schindelin7c6f8aa2006-06-29 15:17:32 +02001541 return result;
1542}
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001543
Junio C Hamano03840fc2007-01-08 23:22:31 -08001544int in_merge_bases(struct commit *commit, struct commit **reference, int num)
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001545{
1546 struct commit_list *bases, *b;
1547 int ret = 0;
1548
Junio C Hamano03840fc2007-01-08 23:22:31 -08001549 if (num == 1)
1550 bases = get_merge_bases(commit, *reference, 1);
1551 else
1552 die("not yet");
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001553 for (b = bases; b; b = b->next) {
Junio C Hamano03840fc2007-01-08 23:22:31 -08001554 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
Junio C Hamano2ecd2bb2006-12-19 00:14:04 -08001555 ret = 1;
1556 break;
1557 }
1558 }
1559
1560 free_commit_list(bases);
1561 return ret;
1562}