Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 667 lines (601 sloc) 15.278 kB
8f1d2e6 [PATCH] Compilation: zero-length array declaration.
Junio C Hamano authored
1 #include "cache.h"
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
2 #include "tag.h"
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
3 #include "commit.h"
4
60ab26d [PATCH] Avoid wasting memory in git-rev-list
Linus Torvalds authored
5 int save_commit_buffer = 1;
6
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
7 struct sort_node
8 {
9 /*
10 * the number of children of the associated commit
11 * that also occur in the list being sorted.
12 */
13 unsigned int indegree;
14
15 /*
16 * reference to original list item that we will re-use
17 * on output.
18 */
19 struct commit_list * list_item;
20
21 };
22
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
23 const char *commit_type = "commit";
24
9b66ec0 Add "--pretty=full" format that also shows committer.
Linus Torvalds authored
25 enum cmit_fmt get_commit_format(const char *arg)
26 {
27 if (!*arg)
28 return CMIT_FMT_DEFAULT;
29 if (!strcmp(arg, "=raw"))
30 return CMIT_FMT_RAW;
31 if (!strcmp(arg, "=medium"))
32 return CMIT_FMT_MEDIUM;
33 if (!strcmp(arg, "=short"))
34 return CMIT_FMT_SHORT;
35 if (!strcmp(arg, "=full"))
36 return CMIT_FMT_FULL;
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
37 if (!strcmp(arg, "=fuller"))
38 return CMIT_FMT_FULLER;
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
39 if (!strcmp(arg, "=oneline"))
40 return CMIT_FMT_ONELINE;
9b66ec0 Add "--pretty=full" format that also shows committer.
Linus Torvalds authored
41 die("invalid --pretty format");
42 }
43
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
44 static struct commit *check_commit(struct object *obj,
45 const unsigned char *sha1,
46 int quiet)
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
47 {
48 if (obj->type != commit_type) {
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
49 if (!quiet)
50 error("Object %s is a %s, not a commit",
51 sha1_to_hex(sha1), obj->type);
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
52 return NULL;
53 }
54 return (struct commit *) obj;
55 }
56
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
57 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
58 int quiet)
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
59 {
9534f40 Be careful when dereferencing tags.
Junio C Hamano authored
60 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
61
62 if (!obj)
63 return NULL;
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
64 return check_commit(obj, sha1, quiet);
65 }
66
67 struct commit *lookup_commit_reference(const unsigned char *sha1)
68 {
69 return lookup_commit_reference_gently(sha1, 0);
961784e commit: add "lookup_commit_reference()" helper function
Linus Torvalds authored
70 }
71
5d6ccf5 [PATCH] Anal retentive 'const unsigned char *sha1'
Jason McMullan authored
72 struct commit *lookup_commit(const unsigned char *sha1)
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
73 {
74 struct object *obj = lookup_object(sha1);
75 if (!obj) {
812666c [PATCH] introduce xmalloc and xrealloc
Christopher Li authored
76 struct commit *ret = xmalloc(sizeof(struct commit));
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
77 memset(ret, 0, sizeof(struct commit));
78 created_object(sha1, &ret->object);
d32987b Set object type at object creation time, not object parse time.
Linus Torvalds authored
79 ret->object.type = commit_type;
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
80 return ret;
81 }
d1af002 [PATCH] delta check
Nicolas Pitre authored
82 if (!obj->type)
83 obj->type = commit_type;
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
84 return check_commit(obj, sha1, 0);
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
85 }
86
87 static unsigned long parse_commit_date(const char *buf)
88 {
89 unsigned long date;
90
91 if (memcmp(buf, "author", 6))
92 return 0;
93 while (*buf++ != '\n')
94 /* nada */;
95 if (memcmp(buf, "committer", 9))
96 return 0;
97 while (*buf++ != '>')
98 /* nada */;
99 date = strtoul(buf, NULL, 10);
100 if (date == ULONG_MAX)
101 date = 0;
102 return date;
103 }
104
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
105 static struct commit_graft {
106 unsigned char sha1[20];
107 int nr_parent;
2c04662 Revert "Replace zero-length array decls with []."
Junio C Hamano authored
108 unsigned char parent[0][20]; /* more */
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
109 } **commit_graft;
110 static int commit_graft_alloc, commit_graft_nr;
111
112 static int commit_graft_pos(const unsigned char *sha1)
113 {
114 int lo, hi;
115 lo = 0;
116 hi = commit_graft_nr;
117 while (lo < hi) {
118 int mi = (lo + hi) / 2;
119 struct commit_graft *graft = commit_graft[mi];
120 int cmp = memcmp(sha1, graft->sha1, 20);
121 if (!cmp)
122 return mi;
123 if (cmp < 0)
124 hi = mi;
125 else
126 lo = mi + 1;
127 }
128 return -lo - 1;
129 }
130
131 static void prepare_commit_graft(void)
132 {
133 char *graft_file = get_graft_file();
134 FILE *fp = fopen(graft_file, "r");
135 char buf[1024];
136 if (!fp) {
137 commit_graft = (struct commit_graft **) "hack";
138 return;
139 }
140 while (fgets(buf, sizeof(buf), fp)) {
141 /* The format is just "Commit Parent1 Parent2 ...\n" */
142 int len = strlen(buf);
143 int i;
144 struct commit_graft *graft = NULL;
145
146 if (buf[len-1] == '\n')
147 buf[--len] = 0;
148 if (buf[0] == '#')
149 continue;
150 if ((len + 1) % 41) {
151 bad_graft_data:
152 error("bad graft data: %s", buf);
153 free(graft);
154 continue;
155 }
156 i = (len + 1) / 41 - 1;
157 graft = xmalloc(sizeof(*graft) + 20 * i);
158 graft->nr_parent = i;
159 if (get_sha1_hex(buf, graft->sha1))
160 goto bad_graft_data;
161 for (i = 40; i < len; i += 41) {
162 if (buf[i] != ' ')
163 goto bad_graft_data;
164 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
165 goto bad_graft_data;
166 }
167 i = commit_graft_pos(graft->sha1);
168 if (0 <= i) {
169 error("duplicate graft data: %s", buf);
170 free(graft);
171 continue;
172 }
173 i = -i - 1;
174 if (commit_graft_alloc <= ++commit_graft_nr) {
175 commit_graft_alloc = alloc_nr(commit_graft_alloc);
176 commit_graft = xrealloc(commit_graft,
177 sizeof(*commit_graft) *
178 commit_graft_alloc);
179 }
180 if (i < commit_graft_nr)
181 memmove(commit_graft + i + 1,
182 commit_graft + i,
183 (commit_graft_nr - i - 1) *
184 sizeof(*commit_graft));
185 commit_graft[i] = graft;
186 }
187 fclose(fp);
188 }
189
190 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
191 {
192 int pos;
193 if (!commit_graft)
194 prepare_commit_graft();
195 pos = commit_graft_pos(sha1);
196 if (pos < 0)
197 return NULL;
198 return commit_graft[pos];
199 }
200
bd2c39f [PATCH] don't load and decompress objects twice with parse_object()
Nicolas Pitre authored
201 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
202 {
f7cc77d Make "parse_commit()" be a lot more careful
Linus Torvalds authored
203 char *bufptr = buffer;
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
204 unsigned char parent[20];
6c88be1 Keep the parents in order when parsing commits
Linus Torvalds authored
205 struct commit_list **pptr;
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
206 struct commit_graft *graft;
27dedf0 GIT 0.99.9j aka 1.0rc3
Junio C Hamano authored
207 unsigned n_refs = 0;
bd2c39f [PATCH] don't load and decompress objects twice with parse_object()
Nicolas Pitre authored
208
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
209 if (item->object.parsed)
210 return 0;
211 item->object.parsed = 1;
f7cc77d Make "parse_commit()" be a lot more careful
Linus Torvalds authored
212 if (memcmp(bufptr, "tree ", 5))
213 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
214 if (get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde Give no terminating LF to error() function.
Junio C Hamano authored
215 return error("bad tree pointer in commit %s",
216 sha1_to_hex(item->object.sha1));
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
217 item->tree = lookup_tree(parent);
235ac40 Don't add references to objects we couldn't find.
Linus Torvalds authored
218 if (item->tree)
27dedf0 GIT 0.99.9j aka 1.0rc3
Junio C Hamano authored
219 n_refs++;
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
220 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be1 Keep the parents in order when parsing commits
Linus Torvalds authored
221 pptr = &item->parents;
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
222
223 graft = lookup_commit_graft(item->object.sha1);
f7cc77d Make "parse_commit()" be a lot more careful
Linus Torvalds authored
224 while (!memcmp(bufptr, "parent ", 7)) {
225 struct commit *new_parent;
226
227 if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
228 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
229 bufptr += 48;
230 if (graft)
231 continue;
f7cc77d Make "parse_commit()" be a lot more careful
Linus Torvalds authored
232 new_parent = lookup_commit(parent);
235ac40 Don't add references to objects we couldn't find.
Linus Torvalds authored
233 if (new_parent) {
6c88be1 Keep the parents in order when parsing commits
Linus Torvalds authored
234 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0 GIT 0.99.9j aka 1.0rc3
Junio C Hamano authored
235 n_refs++;
235ac40 Don't add references to objects we couldn't find.
Linus Torvalds authored
236 }
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
237 }
238 if (graft) {
239 int i;
240 struct commit *new_parent;
241 for (i = 0; i < graft->nr_parent; i++) {
242 new_parent = lookup_commit(graft->parent[i]);
243 if (!new_parent)
244 continue;
245 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0 GIT 0.99.9j aka 1.0rc3
Junio C Hamano authored
246 n_refs++;
5da5c8f Teach parse_commit_buffer about grafting.
Junio C Hamano authored
247 }
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
248 }
249 item->date = parse_commit_date(bufptr);
27dedf0 GIT 0.99.9j aka 1.0rc3
Junio C Hamano authored
250
251 if (track_object_refs) {
252 unsigned i = 0;
253 struct commit_list *p;
254 struct object_refs *refs = alloc_object_refs(n_refs);
255 if (item->tree)
256 refs->ref[i++] = &item->tree->object;
257 for (p = item->parents; p; p = p->next)
258 refs->ref[i++] = &p->item->object;
259 set_object_refs(&item->object, refs);
260 }
261
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
262 return 0;
263 }
264
bd2c39f [PATCH] don't load and decompress objects twice with parse_object()
Nicolas Pitre authored
265 int parse_commit(struct commit *item)
266 {
267 char type[20];
268 void *buffer;
269 unsigned long size;
270 int ret;
271
272 if (item->object.parsed)
273 return 0;
274 buffer = read_sha1_file(item->object.sha1, type, &size);
275 if (!buffer)
276 return error("Could not read %s",
277 sha1_to_hex(item->object.sha1));
278 if (strcmp(type, commit_type)) {
279 free(buffer);
280 return error("Object %s not a commit",
281 sha1_to_hex(item->object.sha1));
282 }
283 ret = parse_commit_buffer(item, buffer, size);
60ab26d [PATCH] Avoid wasting memory in git-rev-list
Linus Torvalds authored
284 if (save_commit_buffer && !ret) {
3ff1fbb commit: save the commit buffer off when parsing a commit
Linus Torvalds authored
285 item->buffer = buffer;
286 return 0;
287 }
bd2c39f [PATCH] don't load and decompress objects twice with parse_object()
Nicolas Pitre authored
288 free(buffer);
289 return ret;
290 }
291
ac5155e commit_list_insert: return the new commit list entry
Linus Torvalds authored
292 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
293 {
812666c [PATCH] introduce xmalloc and xrealloc
Christopher Li authored
294 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
295 new_list->item = item;
296 new_list->next = *list_p;
297 *list_p = new_list;
ac5155e commit_list_insert: return the new commit list entry
Linus Torvalds authored
298 return new_list;
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
299 }
300
175785e [PATCH] Implementations of parsing functions
Daniel Barkalow authored
301 void free_commit_list(struct commit_list *list)
302 {
303 while (list) {
304 struct commit_list *temp = list;
305 list = temp->next;
306 free(temp);
307 }
308 }
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
309
f755494 Make "insert_by_date()" match "commit_list_insert()"
Linus Torvalds authored
310 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
311 {
312 struct commit_list **pp = list;
313 struct commit_list *p;
314 while ((p = *pp) != NULL) {
315 if (p->item->date < item->date) {
316 break;
317 }
318 pp = &p->next;
319 }
f755494 Make "insert_by_date()" match "commit_list_insert()"
Linus Torvalds authored
320 return commit_list_insert(item, pp);
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
321 }
322
323
324 void sort_by_date(struct commit_list **list)
325 {
326 struct commit_list *ret = NULL;
327 while (*list) {
f755494 Make "insert_by_date()" match "commit_list_insert()"
Linus Torvalds authored
328 insert_by_date((*list)->item, &ret);
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
329 *list = (*list)->next;
330 }
331 *list = ret;
332 }
333
58e28af [PATCH] Allow multiple date-ordered lists
Daniel Barkalow authored
334 struct commit *pop_most_recent_commit(struct commit_list **list,
335 unsigned int mark)
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
336 {
337 struct commit *ret = (*list)->item;
338 struct commit_list *parents = ret->parents;
339 struct commit_list *old = *list;
340
341 *list = (*list)->next;
342 free(old);
343
344 while (parents) {
4056c09 Don't add parents to the commit list if we have already
Linus Torvalds authored
345 struct commit *commit = parents->item;
58e28af [PATCH] Allow multiple date-ordered lists
Daniel Barkalow authored
346 parse_commit(commit);
347 if (!(commit->object.flags & mark)) {
348 commit->object.flags |= mark;
f755494 Make "insert_by_date()" match "commit_list_insert()"
Linus Torvalds authored
349 insert_by_date(commit, list);
4056c09 Don't add parents to the commit list if we have already
Linus Torvalds authored
350 }
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
351 parents = parents->next;
352 }
353 return ret;
354 }
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
355
f8f9c73 describe: allow more than one revs to be named.
Junio C Hamano authored
356 void clear_commit_marks(struct commit *commit, unsigned int mark)
357 {
358 struct commit_list *parents;
359
360 parents = commit->parents;
361 commit->object.flags &= ~mark;
362 while (parents) {
181dc77 describe: omit clearing marks on the last one.
Junio C Hamano authored
363 struct commit *parent = parents->item;
364 if (parent && parent->object.parsed &&
365 (parent->object.flags & mark))
366 clear_commit_marks(parent, mark);
f8f9c73 describe: allow more than one revs to be named.
Junio C Hamano authored
367 parents = parents->next;
368 }
369 }
370
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
371 /*
372 * Generic support for pretty-printing the header
373 */
374 static int get_one_line(const char *msg, unsigned long len)
375 {
376 int ret = 0;
377
378 while (len--) {
379 char c = *msg++;
380 ret++;
381 if (c == '\n')
382 break;
383 if (!c)
384 return 0;
385 }
386 return ret;
387 }
388
9b66ec0 Add "--pretty=full" format that also shows committer.
Linus Torvalds authored
389 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
390 {
391 char *date;
5de36bf Fix compilation warnings.
Junio C Hamano authored
392 int namelen;
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
393 unsigned long time;
000182e pretty_print_commit: add different formats
Linus Torvalds authored
394 int tz, ret;
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
395 const char *filler = " ";
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
396
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
397 if (fmt == CMIT_FMT_ONELINE)
398 return 0;
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
399 date = strchr(line, '>');
400 if (!date)
401 return 0;
402 namelen = ++date - line;
403 time = strtoul(date, &date, 10);
404 tz = strtol(date, NULL, 10);
405
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
406 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
407 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
408 filler, namelen, line);
409 switch (fmt) {
410 case CMIT_FMT_MEDIUM:
000182e pretty_print_commit: add different formats
Linus Torvalds authored
411 ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
412 break;
413 case CMIT_FMT_FULLER:
414 ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
415 break;
416 default:
417 /* notin' */
418 break;
419 }
000182e pretty_print_commit: add different formats
Linus Torvalds authored
420 return ret;
421 }
422
423 static int is_empty_line(const char *line, int len)
424 {
425 while (len && isspace(line[len-1]))
426 len--;
427 return !len;
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
428 }
429
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
430 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
28342a5 Make "pretty" commit logs always show merge information
Linus Torvalds authored
431 {
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
432 struct commit_list *parent = commit->parents;
433 int offset;
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
434
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
435 if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
436 return 0;
437
438 offset = sprintf(buf, "Merge:");
439
440 while (parent) {
441 struct commit *p = parent->item;
6bfb27a commit.c: "Merge" fix in pretty_print_commit.
Junio C Hamano authored
442 const char *hex = abbrev
443 ? find_unique_abbrev(p->object.sha1, abbrev)
444 : sha1_to_hex(p->object.sha1);
445 char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
446 parent = parent->next;
447
6bfb27a commit.c: "Merge" fix in pretty_print_commit.
Junio C Hamano authored
448 offset += sprintf(buf + offset, " %s%s", hex, dots);
28342a5 Make "pretty" commit logs always show merge information
Linus Torvalds authored
449 }
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
450 buf[offset++] = '\n';
28342a5 Make "pretty" commit logs always show merge information
Linus Torvalds authored
451 return offset;
452 }
453
3815f42 pretty_print_commit(): pass commit object instead of commit->buffer.
Junio C Hamano authored
454 unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev)
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
455 {
000182e pretty_print_commit: add different formats
Linus Torvalds authored
456 int hdr = 1, body = 0;
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
457 unsigned long offset = 0;
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
458 int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
459 int parents_shown = 0;
3815f42 pretty_print_commit(): pass commit object instead of commit->buffer.
Junio C Hamano authored
460 const char *msg = commit->buffer;
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
461
462 for (;;) {
463 const char *line = msg;
464 int linelen = get_one_line(msg, len);
465
466 if (!linelen)
467 break;
468
469 /*
470 * We want some slop for indentation and a possible
471 * final "...". Thus the "+ 20".
472 */
473 if (offset + linelen + 20 > space) {
474 memcpy(buf + offset, " ...\n", 8);
475 offset += 8;
476 break;
477 }
478
479 msg += linelen;
480 len -= linelen;
481 if (hdr) {
000182e pretty_print_commit: add different formats
Linus Torvalds authored
482 if (linelen == 1) {
483 hdr = 0;
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
484 if (fmt != CMIT_FMT_ONELINE)
485 buf[offset++] = '\n';
000182e pretty_print_commit: add different formats
Linus Torvalds authored
486 continue;
487 }
488 if (fmt == CMIT_FMT_RAW) {
489 memcpy(buf + offset, line, linelen);
490 offset += linelen;
491 continue;
492 }
28342a5 Make "pretty" commit logs always show merge information
Linus Torvalds authored
493 if (!memcmp(line, "parent ", 7)) {
494 if (linelen != 48)
495 die("bad parent line in commit");
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
496 continue;
28342a5 Make "pretty" commit logs always show merge information
Linus Torvalds authored
497 }
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
498
f2d4227 pretty_print_commit: honor grafts.
Junio C Hamano authored
499 if (!parents_shown) {
500 offset += add_merge_info(fmt, buf + offset,
501 commit, abbrev);
502 parents_shown = 1;
503 continue;
504 }
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
505 /*
506 * MEDIUM == DEFAULT shows only author with dates.
507 * FULL shows both authors but not dates.
508 * FULLER shows both authors and dates.
509 */
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
510 if (!memcmp(line, "author ", 7))
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
511 offset += add_user_info("Author", fmt,
512 buf + offset,
513 line + 7);
514 if (!memcmp(line, "committer ", 10) &&
515 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
516 offset += add_user_info("Commit", fmt,
517 buf + offset,
518 line + 10);
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
519 continue;
520 }
000182e pretty_print_commit: add different formats
Linus Torvalds authored
521
522 if (is_empty_line(line, linelen)) {
523 if (!body)
524 continue;
525 if (fmt == CMIT_FMT_SHORT)
526 break;
527 } else {
528 body = 1;
529 }
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
530
531 memset(buf + offset, ' ', indent);
532 memcpy(buf + offset + indent, line, linelen);
533 offset += linelen + indent;
534 if (fmt == CMIT_FMT_ONELINE)
535 break;
536 }
537 if (fmt == CMIT_FMT_ONELINE) {
538 /* We do not want the terminating newline */
539 if (buf[offset - 1] == '\n')
540 offset--;
541 }
542 else {
543 /* Make sure there is an EOLN */
544 if (buf[offset - 1] != '\n')
545 buf[offset++] = '\n';
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
546 }
547 buf[offset] = '\0';
548 return offset;
549 }
a3437b8 [PATCH] Modify git-rev-list to linearise the commit history in merge …
jon@blackcubes.dyndns.org authored
550
551 struct commit *pop_commit(struct commit_list **stack)
552 {
553 struct commit_list *top = *stack;
554 struct commit *item = top ? top->item : NULL;
555
556 if (top) {
557 *stack = top->next;
558 free(top);
559 }
560 return item;
561 }
562
563 int count_parents(struct commit * commit)
564 {
565 int count = 0;
566 struct commit_list * parents = commit->parents;
567 for (count=0;parents; parents=parents->next,count++)
568 ;
569 return count;
570 }
571
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
572 /*
573 * Performs an in-place topological sort on the list supplied.
574 */
575 void sort_in_topological_order(struct commit_list ** list)
576 {
577 struct commit_list * next = *list;
2ed0288 Fix git-rev-list "date order" with --topo-order
Linus Torvalds authored
578 struct commit_list * work = NULL, **insert;
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
579 struct commit_list ** pptr = list;
580 struct sort_node * nodes;
581 struct sort_node * next_nodes;
582 int count = 0;
583
584 /* determine the size of the list */
585 while (next) {
586 next = next->next;
587 count++;
588 }
7d6fb37 short circuit out of a few places where we would allocate zero bytes
Eric Wong authored
589
590 if (!count)
591 return;
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
592 /* allocate an array to help sort the list */
593 nodes = xcalloc(count, sizeof(*nodes));
594 /* link the list to the array */
595 next_nodes = nodes;
596 next=*list;
597 while (next) {
598 next_nodes->list_item = next;
599 next->item->object.util = next_nodes;
600 next_nodes++;
601 next = next->next;
602 }
603 /* update the indegree */
604 next=*list;
605 while (next) {
606 struct commit_list * parents = next->item->parents;
607 while (parents) {
608 struct commit * parent=parents->item;
609 struct sort_node * pn = (struct sort_node *)parent->object.util;
610
611 if (pn)
612 pn->indegree++;
613 parents=parents->next;
614 }
615 next=next->next;
616 }
617 /*
618 * find the tips
619 *
620 * tips are nodes not reachable from any other node in the list
621 *
622 * the tips serve as a starting set for the work queue.
623 */
624 next=*list;
2ed0288 Fix git-rev-list "date order" with --topo-order
Linus Torvalds authored
625 insert = &work;
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
626 while (next) {
627 struct sort_node * node = (struct sort_node *)next->item->object.util;
628
629 if (node->indegree == 0) {
2ed0288 Fix git-rev-list "date order" with --topo-order
Linus Torvalds authored
630 insert = &commit_list_insert(next->item, insert)->next;
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
631 }
632 next=next->next;
633 }
634 /* process the list in topological order */
635 while (work) {
636 struct commit * work_item = pop_commit(&work);
637 struct sort_node * work_node = (struct sort_node *)work_item->object.util;
638 struct commit_list * parents = work_item->parents;
639
640 while (parents) {
641 struct commit * parent=parents->item;
642 struct sort_node * pn = (struct sort_node *)parent->object.util;
643
644 if (pn) {
645 /*
646 * parents are only enqueued for emission
647 * when all their children have been emitted thereby
648 * guaranteeing topological order.
649 */
650 pn->indegree--;
651 if (!pn->indegree)
652 commit_list_insert(parent, &work);
653 }
654 parents=parents->next;
655 }
656 /*
657 * work_item is a commit all of whose children
658 * have already been emitted. we can emit it now.
659 */
660 *pptr = work_node->list_item;
661 pptr = &(*pptr)->next;
662 *pptr = NULL;
663 work_item->object.util = NULL;
664 }
665 free(nodes);
666 }
Something went wrong with that request. Please try again.