graph: example of graph output that can be simplified
[git] / graph.c
1 #include "cache.h"
2 #include "config.h"
3 #include "commit.h"
4 #include "color.h"
5 #include "graph.h"
6 #include "revision.h"
7 #include "argv-array.h"
8
9 /* Internal API */
10
11 /*
12  * Output a padding line in the graph.
13  * This is similar to graph_next_line().  However, it is guaranteed to
14  * never print the current commit line.  Instead, if the commit line is
15  * next, it will simply output a line of vertical padding, extending the
16  * branch lines downwards, but leaving them otherwise unchanged.
17  */
18 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
19
20 /*
21  * Print a strbuf.  If the graph is non-NULL, all lines but the first will be
22  * prefixed with the graph output.
23  *
24  * If the strbuf ends with a newline, the output will end after this
25  * newline.  A new graph line will not be printed after the final newline.
26  * If the strbuf is empty, no output will be printed.
27  *
28  * Since the first line will not include the graph output, the caller is
29  * responsible for printing this line's graph (perhaps via
30  * graph_show_commit() or graph_show_oneline()) before calling
31  * graph_show_strbuf().
32  *
33  * Note that unlike some other graph display functions, you must pass the file
34  * handle directly. It is assumed that this is the same file handle as the
35  * file specified by the graph diff options. This is necessary so that
36  * graph_show_strbuf can be called even with a NULL graph.
37  */
38 static void graph_show_strbuf(struct git_graph *graph,
39                               FILE *file,
40                               struct strbuf const *sb);
41
42 /*
43  * TODO:
44  * - Limit the number of columns, similar to the way gitk does.
45  *   If we reach more than a specified number of columns, omit
46  *   sections of some columns.
47  */
48
49 struct column {
50         /*
51          * The parent commit of this column.
52          */
53         struct commit *commit;
54         /*
55          * The color to (optionally) print this column in.  This is an
56          * index into column_colors.
57          */
58         unsigned short color;
59 };
60
61 enum graph_state {
62         GRAPH_PADDING,
63         GRAPH_SKIP,
64         GRAPH_PRE_COMMIT,
65         GRAPH_COMMIT,
66         GRAPH_POST_MERGE,
67         GRAPH_COLLAPSING
68 };
69
70 static void graph_show_line_prefix(const struct diff_options *diffopt)
71 {
72         if (!diffopt || !diffopt->line_prefix)
73                 return;
74
75         fwrite(diffopt->line_prefix,
76                sizeof(char),
77                diffopt->line_prefix_length,
78                diffopt->file);
79 }
80
81 static const char **column_colors;
82 static unsigned short column_colors_max;
83
84 static void parse_graph_colors_config(struct argv_array *colors, const char *string)
85 {
86         const char *end, *start;
87
88         start = string;
89         end = string + strlen(string);
90         while (start < end) {
91                 const char *comma = strchrnul(start, ',');
92                 char color[COLOR_MAXLEN];
93
94                 if (!color_parse_mem(start, comma - start, color))
95                         argv_array_push(colors, color);
96                 else
97                         warning(_("ignore invalid color '%.*s' in log.graphColors"),
98                                 (int)(comma - start), start);
99                 start = comma + 1;
100         }
101         argv_array_push(colors, GIT_COLOR_RESET);
102 }
103
104 void graph_set_column_colors(const char **colors, unsigned short colors_max)
105 {
106         column_colors = colors;
107         column_colors_max = colors_max;
108 }
109
110 static const char *column_get_color_code(unsigned short color)
111 {
112         return column_colors[color];
113 }
114
115 struct graph_line {
116         struct strbuf *buf;
117         size_t width;
118 };
119
120 static inline void graph_line_addch(struct graph_line *line, int c)
121 {
122         strbuf_addch(line->buf, c);
123         line->width++;
124 }
125
126 static inline void graph_line_addchars(struct graph_line *line, int c, size_t n)
127 {
128         strbuf_addchars(line->buf, c, n);
129         line->width += n;
130 }
131
132 static inline void graph_line_addstr(struct graph_line *line, const char *s)
133 {
134         strbuf_addstr(line->buf, s);
135         line->width += strlen(s);
136 }
137
138 static inline void graph_line_addcolor(struct graph_line *line, unsigned short color)
139 {
140         strbuf_addstr(line->buf, column_get_color_code(color));
141 }
142
143 static void graph_line_write_column(struct graph_line *line, const struct column *c,
144                                     char col_char)
145 {
146         if (c->color < column_colors_max)
147                 graph_line_addcolor(line, c->color);
148         graph_line_addch(line, col_char);
149         if (c->color < column_colors_max)
150                 graph_line_addcolor(line, column_colors_max);
151 }
152
153 struct git_graph {
154         /*
155          * The commit currently being processed
156          */
157         struct commit *commit;
158         /* The rev-info used for the current traversal */
159         struct rev_info *revs;
160         /*
161          * The number of interesting parents that this commit has.
162          *
163          * Note that this is not the same as the actual number of parents.
164          * This count excludes parents that won't be printed in the graph
165          * output, as determined by graph_is_interesting().
166          */
167         int num_parents;
168         /*
169          * The width of the graph output for this commit.
170          * All rows for this commit are padded to this width, so that
171          * messages printed after the graph output are aligned.
172          */
173         int width;
174         /*
175          * The next expansion row to print
176          * when state is GRAPH_PRE_COMMIT
177          */
178         int expansion_row;
179         /*
180          * The current output state.
181          * This tells us what kind of line graph_next_line() should output.
182          */
183         enum graph_state state;
184         /*
185          * The output state for the previous line of output.
186          * This is primarily used to determine how the first merge line
187          * should appear, based on the last line of the previous commit.
188          */
189         enum graph_state prev_state;
190         /*
191          * The index of the column that refers to this commit.
192          *
193          * If none of the incoming columns refer to this commit,
194          * this will be equal to num_columns.
195          */
196         int commit_index;
197         /*
198          * The commit_index for the previously displayed commit.
199          *
200          * This is used to determine how the first line of a merge
201          * graph output should appear, based on the last line of the
202          * previous commit.
203          */
204         int prev_commit_index;
205         /*
206          * The maximum number of columns that can be stored in the columns
207          * and new_columns arrays.  This is also half the number of entries
208          * that can be stored in the mapping and new_mapping arrays.
209          */
210         int column_capacity;
211         /*
212          * The number of columns (also called "branch lines" in some places)
213          */
214         int num_columns;
215         /*
216          * The number of columns in the new_columns array
217          */
218         int num_new_columns;
219         /*
220          * The number of entries in the mapping array
221          */
222         int mapping_size;
223         /*
224          * The column state before we output the current commit.
225          */
226         struct column *columns;
227         /*
228          * The new column state after we output the current commit.
229          * Only valid when state is GRAPH_COLLAPSING.
230          */
231         struct column *new_columns;
232         /*
233          * An array that tracks the current state of each
234          * character in the output line during state GRAPH_COLLAPSING.
235          * Each entry is -1 if this character is empty, or a non-negative
236          * integer if the character contains a branch line.  The value of
237          * the integer indicates the target position for this branch line.
238          * (I.e., this array maps the current column positions to their
239          * desired positions.)
240          *
241          * The maximum capacity of this array is always
242          * sizeof(int) * 2 * column_capacity.
243          */
244         int *mapping;
245         /*
246          * A temporary array for computing the next mapping state
247          * while we are outputting a mapping line.  This is stored as part
248          * of the git_graph simply so we don't have to allocate a new
249          * temporary array each time we have to output a collapsing line.
250          */
251         int *new_mapping;
252         /*
253          * The current default column color being used.  This is
254          * stored as an index into the array column_colors.
255          */
256         unsigned short default_column_color;
257 };
258
259 static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void *data)
260 {
261         struct git_graph *graph = data;
262         static struct strbuf msgbuf = STRBUF_INIT;
263
264         assert(opt);
265
266         strbuf_reset(&msgbuf);
267         if (opt->line_prefix)
268                 strbuf_add(&msgbuf, opt->line_prefix,
269                            opt->line_prefix_length);
270         if (graph)
271                 graph_padding_line(graph, &msgbuf);
272         return &msgbuf;
273 }
274
275 static const struct diff_options *default_diffopt;
276
277 void graph_setup_line_prefix(struct diff_options *diffopt)
278 {
279         default_diffopt = diffopt;
280
281         /* setup an output prefix callback if necessary */
282         if (diffopt && !diffopt->output_prefix)
283                 diffopt->output_prefix = diff_output_prefix_callback;
284 }
285
286
287 struct git_graph *graph_init(struct rev_info *opt)
288 {
289         struct git_graph *graph = xmalloc(sizeof(struct git_graph));
290
291         if (!column_colors) {
292                 char *string;
293                 if (git_config_get_string("log.graphcolors", &string)) {
294                         /* not configured -- use default */
295                         graph_set_column_colors(column_colors_ansi,
296                                                 column_colors_ansi_max);
297                 } else {
298                         static struct argv_array custom_colors = ARGV_ARRAY_INIT;
299                         argv_array_clear(&custom_colors);
300                         parse_graph_colors_config(&custom_colors, string);
301                         free(string);
302                         /* graph_set_column_colors takes a max-index, not a count */
303                         graph_set_column_colors(custom_colors.argv,
304                                                 custom_colors.argc - 1);
305                 }
306         }
307
308         graph->commit = NULL;
309         graph->revs = opt;
310         graph->num_parents = 0;
311         graph->expansion_row = 0;
312         graph->state = GRAPH_PADDING;
313         graph->prev_state = GRAPH_PADDING;
314         graph->commit_index = 0;
315         graph->prev_commit_index = 0;
316         graph->num_columns = 0;
317         graph->num_new_columns = 0;
318         graph->mapping_size = 0;
319         /*
320          * Start the column color at the maximum value, since we'll
321          * always increment it for the first commit we output.
322          * This way we start at 0 for the first commit.
323          */
324         graph->default_column_color = column_colors_max - 1;
325
326         /*
327          * Allocate a reasonably large default number of columns
328          * We'll automatically grow columns later if we need more room.
329          */
330         graph->column_capacity = 30;
331         ALLOC_ARRAY(graph->columns, graph->column_capacity);
332         ALLOC_ARRAY(graph->new_columns, graph->column_capacity);
333         ALLOC_ARRAY(graph->mapping, 2 * graph->column_capacity);
334         ALLOC_ARRAY(graph->new_mapping, 2 * graph->column_capacity);
335
336         /*
337          * The diff output prefix callback, with this we can make
338          * all the diff output to align with the graph lines.
339          */
340         opt->diffopt.output_prefix = diff_output_prefix_callback;
341         opt->diffopt.output_prefix_data = graph;
342
343         return graph;
344 }
345
346 static void graph_update_state(struct git_graph *graph, enum graph_state s)
347 {
348         graph->prev_state = graph->state;
349         graph->state = s;
350 }
351
352 static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
353 {
354         if (graph->column_capacity >= num_columns)
355                 return;
356
357         do {
358                 graph->column_capacity *= 2;
359         } while (graph->column_capacity < num_columns);
360
361         REALLOC_ARRAY(graph->columns, graph->column_capacity);
362         REALLOC_ARRAY(graph->new_columns, graph->column_capacity);
363         REALLOC_ARRAY(graph->mapping, graph->column_capacity * 2);
364         REALLOC_ARRAY(graph->new_mapping, graph->column_capacity * 2);
365 }
366
367 /*
368  * Returns 1 if the commit will be printed in the graph output,
369  * and 0 otherwise.
370  */
371 static int graph_is_interesting(struct git_graph *graph, struct commit *commit)
372 {
373         /*
374          * If revs->boundary is set, commits whose children have
375          * been shown are always interesting, even if they have the
376          * UNINTERESTING or TREESAME flags set.
377          */
378         if (graph->revs && graph->revs->boundary) {
379                 if (commit->object.flags & CHILD_SHOWN)
380                         return 1;
381         }
382
383         /*
384          * Otherwise, use get_commit_action() to see if this commit is
385          * interesting
386          */
387         return get_commit_action(graph->revs, commit) == commit_show;
388 }
389
390 static struct commit_list *next_interesting_parent(struct git_graph *graph,
391                                                    struct commit_list *orig)
392 {
393         struct commit_list *list;
394
395         /*
396          * If revs->first_parent_only is set, only the first
397          * parent is interesting.  None of the others are.
398          */
399         if (graph->revs->first_parent_only)
400                 return NULL;
401
402         /*
403          * Return the next interesting commit after orig
404          */
405         for (list = orig->next; list; list = list->next) {
406                 if (graph_is_interesting(graph, list->item))
407                         return list;
408         }
409
410         return NULL;
411 }
412
413 static struct commit_list *first_interesting_parent(struct git_graph *graph)
414 {
415         struct commit_list *parents = graph->commit->parents;
416
417         /*
418          * If this commit has no parents, ignore it
419          */
420         if (!parents)
421                 return NULL;
422
423         /*
424          * If the first parent is interesting, return it
425          */
426         if (graph_is_interesting(graph, parents->item))
427                 return parents;
428
429         /*
430          * Otherwise, call next_interesting_parent() to get
431          * the next interesting parent
432          */
433         return next_interesting_parent(graph, parents);
434 }
435
436 static unsigned short graph_get_current_column_color(const struct git_graph *graph)
437 {
438         if (!want_color(graph->revs->diffopt.use_color))
439                 return column_colors_max;
440         return graph->default_column_color;
441 }
442
443 /*
444  * Update the graph's default column color.
445  */
446 static void graph_increment_column_color(struct git_graph *graph)
447 {
448         graph->default_column_color = (graph->default_column_color + 1) %
449                 column_colors_max;
450 }
451
452 static unsigned short graph_find_commit_color(const struct git_graph *graph,
453                                               const struct commit *commit)
454 {
455         int i;
456         for (i = 0; i < graph->num_columns; i++) {
457                 if (graph->columns[i].commit == commit)
458                         return graph->columns[i].color;
459         }
460         return graph_get_current_column_color(graph);
461 }
462
463 static int graph_find_new_column_by_commit(struct git_graph *graph,
464                                            struct commit *commit)
465 {
466         int i;
467         for (i = 0; i < graph->num_new_columns; i++) {
468                 if (graph->new_columns[i].commit == commit)
469                         return i;
470         }
471         return -1;
472 }
473
474 static void graph_insert_into_new_columns(struct git_graph *graph,
475                                           struct commit *commit)
476 {
477         int i = graph_find_new_column_by_commit(graph, commit);
478
479         /*
480          * If the commit is not already in the new_columns array, then add it
481          * and record it as being in the final column.
482          */
483         if (i < 0) {
484                 i = graph->num_new_columns++;
485                 graph->new_columns[i].commit = commit;
486                 graph->new_columns[i].color = graph_find_commit_color(graph, commit);
487         }
488
489         graph->mapping[graph->width] = i;
490         graph->width += 2;
491 }
492
493 static void graph_update_columns(struct git_graph *graph)
494 {
495         struct commit_list *parent;
496         int max_new_columns;
497         int i, seen_this, is_commit_in_columns;
498
499         /*
500          * Swap graph->columns with graph->new_columns
501          * graph->columns contains the state for the previous commit,
502          * and new_columns now contains the state for our commit.
503          *
504          * We'll re-use the old columns array as storage to compute the new
505          * columns list for the commit after this one.
506          */
507         SWAP(graph->columns, graph->new_columns);
508         graph->num_columns = graph->num_new_columns;
509         graph->num_new_columns = 0;
510
511         /*
512          * Now update new_columns and mapping with the information for the
513          * commit after this one.
514          *
515          * First, make sure we have enough room.  At most, there will
516          * be graph->num_columns + graph->num_parents columns for the next
517          * commit.
518          */
519         max_new_columns = graph->num_columns + graph->num_parents;
520         graph_ensure_capacity(graph, max_new_columns);
521
522         /*
523          * Clear out graph->mapping
524          */
525         graph->mapping_size = 2 * max_new_columns;
526         for (i = 0; i < graph->mapping_size; i++)
527                 graph->mapping[i] = -1;
528
529         graph->width = 0;
530
531         /*
532          * Populate graph->new_columns and graph->mapping
533          *
534          * Some of the parents of this commit may already be in
535          * graph->columns.  If so, graph->new_columns should only contain a
536          * single entry for each such commit.  graph->mapping should
537          * contain information about where each current branch line is
538          * supposed to end up after the collapsing is performed.
539          */
540         seen_this = 0;
541         is_commit_in_columns = 1;
542         for (i = 0; i <= graph->num_columns; i++) {
543                 struct commit *col_commit;
544                 if (i == graph->num_columns) {
545                         if (seen_this)
546                                 break;
547                         is_commit_in_columns = 0;
548                         col_commit = graph->commit;
549                 } else {
550                         col_commit = graph->columns[i].commit;
551                 }
552
553                 if (col_commit == graph->commit) {
554                         seen_this = 1;
555                         graph->commit_index = i;
556                         for (parent = first_interesting_parent(graph);
557                              parent;
558                              parent = next_interesting_parent(graph, parent)) {
559                                 /*
560                                  * If this is a merge, or the start of a new
561                                  * childless column, increment the current
562                                  * color.
563                                  */
564                                 if (graph->num_parents > 1 ||
565                                     !is_commit_in_columns) {
566                                         graph_increment_column_color(graph);
567                                 }
568                                 graph_insert_into_new_columns(graph, parent->item);
569                         }
570                         /*
571                          * We always need to increment graph->width by at
572                          * least 2, even if it has no interesting parents.
573                          * The current commit always takes up at least 2
574                          * spaces.
575                          */
576                         if (graph->num_parents == 0)
577                                 graph->width += 2;
578                 } else {
579                         graph_insert_into_new_columns(graph, col_commit);
580                 }
581         }
582
583         /*
584          * Shrink mapping_size to be the minimum necessary
585          */
586         while (graph->mapping_size > 1 &&
587                graph->mapping[graph->mapping_size - 1] < 0)
588                 graph->mapping_size--;
589 }
590
591 static int graph_needs_pre_commit_line(struct git_graph *graph)
592 {
593         return graph->num_parents >= 3 &&
594                graph->commit_index < (graph->num_columns - 1);
595 }
596
597 void graph_update(struct git_graph *graph, struct commit *commit)
598 {
599         struct commit_list *parent;
600
601         /*
602          * Set the new commit
603          */
604         graph->commit = commit;
605
606         /*
607          * Count how many interesting parents this commit has
608          */
609         graph->num_parents = 0;
610         for (parent = first_interesting_parent(graph);
611              parent;
612              parent = next_interesting_parent(graph, parent))
613         {
614                 graph->num_parents++;
615         }
616
617         /*
618          * Store the old commit_index in prev_commit_index.
619          * graph_update_columns() will update graph->commit_index for this
620          * commit.
621          */
622         graph->prev_commit_index = graph->commit_index;
623
624         /*
625          * Call graph_update_columns() to update
626          * columns, new_columns, and mapping.
627          */
628         graph_update_columns(graph);
629
630         graph->expansion_row = 0;
631
632         /*
633          * Update graph->state.
634          * Note that we don't call graph_update_state() here, since
635          * we don't want to update graph->prev_state.  No line for
636          * graph->state was ever printed.
637          *
638          * If the previous commit didn't get to the GRAPH_PADDING state,
639          * it never finished its output.  Goto GRAPH_SKIP, to print out
640          * a line to indicate that portion of the graph is missing.
641          *
642          * If there are 3 or more parents, we may need to print extra rows
643          * before the commit, to expand the branch lines around it and make
644          * room for it.  We need to do this only if there is a branch row
645          * (or more) to the right of this commit.
646          *
647          * If there are less than 3 parents, we can immediately print the
648          * commit line.
649          */
650         if (graph->state != GRAPH_PADDING)
651                 graph->state = GRAPH_SKIP;
652         else if (graph_needs_pre_commit_line(graph))
653                 graph->state = GRAPH_PRE_COMMIT;
654         else
655                 graph->state = GRAPH_COMMIT;
656 }
657
658 static int graph_is_mapping_correct(struct git_graph *graph)
659 {
660         int i;
661
662         /*
663          * The mapping is up to date if each entry is at its target,
664          * or is 1 greater than its target.
665          * (If it is 1 greater than the target, '/' will be printed, so it
666          * will look correct on the next row.)
667          */
668         for (i = 0; i < graph->mapping_size; i++) {
669                 int target = graph->mapping[i];
670                 if (target < 0)
671                         continue;
672                 if (target == (i / 2))
673                         continue;
674                 return 0;
675         }
676
677         return 1;
678 }
679
680 static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line)
681 {
682         /*
683          * Add additional spaces to the end of the strbuf, so that all
684          * lines for a particular commit have the same width.
685          *
686          * This way, fields printed to the right of the graph will remain
687          * aligned for the entire commit.
688          */
689         if (line->width < graph->width)
690                 graph_line_addchars(line, ' ', graph->width - line->width);
691 }
692
693 static void graph_output_padding_line(struct git_graph *graph,
694                                       struct graph_line *line)
695 {
696         int i;
697
698         /*
699          * Output a padding row, that leaves all branch lines unchanged
700          */
701         for (i = 0; i < graph->num_new_columns; i++) {
702                 graph_line_write_column(line, &graph->new_columns[i], '|');
703                 graph_line_addch(line, ' ');
704         }
705 }
706
707
708 int graph_width(struct git_graph *graph)
709 {
710         return graph->width;
711 }
712
713
714 static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line)
715 {
716         /*
717          * Output an ellipsis to indicate that a portion
718          * of the graph is missing.
719          */
720         graph_line_addstr(line, "...");
721
722         if (graph_needs_pre_commit_line(graph))
723                 graph_update_state(graph, GRAPH_PRE_COMMIT);
724         else
725                 graph_update_state(graph, GRAPH_COMMIT);
726 }
727
728 static void graph_output_pre_commit_line(struct git_graph *graph,
729                                          struct graph_line *line)
730 {
731         int num_expansion_rows;
732         int i, seen_this;
733
734         /*
735          * This function formats a row that increases the space around a commit
736          * with multiple parents, to make room for it.  It should only be
737          * called when there are 3 or more parents.
738          *
739          * We need 2 extra rows for every parent over 2.
740          */
741         assert(graph->num_parents >= 3);
742         num_expansion_rows = (graph->num_parents - 2) * 2;
743
744         /*
745          * graph->expansion_row tracks the current expansion row we are on.
746          * It should be in the range [0, num_expansion_rows - 1]
747          */
748         assert(0 <= graph->expansion_row &&
749                graph->expansion_row < num_expansion_rows);
750
751         /*
752          * Output the row
753          */
754         seen_this = 0;
755         for (i = 0; i < graph->num_columns; i++) {
756                 struct column *col = &graph->columns[i];
757                 if (col->commit == graph->commit) {
758                         seen_this = 1;
759                         graph_line_write_column(line, col, '|');
760                         graph_line_addchars(line, ' ', graph->expansion_row);
761                 } else if (seen_this && (graph->expansion_row == 0)) {
762                         /*
763                          * This is the first line of the pre-commit output.
764                          * If the previous commit was a merge commit and
765                          * ended in the GRAPH_POST_MERGE state, all branch
766                          * lines after graph->prev_commit_index were
767                          * printed as "\" on the previous line.  Continue
768                          * to print them as "\" on this line.  Otherwise,
769                          * print the branch lines as "|".
770                          */
771                         if (graph->prev_state == GRAPH_POST_MERGE &&
772                             graph->prev_commit_index < i)
773                                 graph_line_write_column(line, col, '\\');
774                         else
775                                 graph_line_write_column(line, col, '|');
776                 } else if (seen_this && (graph->expansion_row > 0)) {
777                         graph_line_write_column(line, col, '\\');
778                 } else {
779                         graph_line_write_column(line, col, '|');
780                 }
781                 graph_line_addch(line, ' ');
782         }
783
784         /*
785          * Increment graph->expansion_row,
786          * and move to state GRAPH_COMMIT if necessary
787          */
788         graph->expansion_row++;
789         if (graph->expansion_row >= num_expansion_rows)
790                 graph_update_state(graph, GRAPH_COMMIT);
791 }
792
793 static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line)
794 {
795         /*
796          * For boundary commits, print 'o'
797          * (We should only see boundary commits when revs->boundary is set.)
798          */
799         if (graph->commit->object.flags & BOUNDARY) {
800                 assert(graph->revs->boundary);
801                 graph_line_addch(line, 'o');
802                 return;
803         }
804
805         /*
806          * get_revision_mark() handles all other cases without assert()
807          */
808         graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
809 }
810
811 /*
812  * Draw the horizontal dashes of an octopus merge.
813  */
814 static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line)
815 {
816         /*
817          * Here dashless_parents represents the number of parents which don't
818          * need to have dashes (the edges labeled "0" and "1").  And
819          * dashful_parents are the remaining ones.
820          *
821          * | *---.
822          * | |\ \ \
823          * | | | | |
824          * x 0 1 2 3
825          *
826          */
827         const int dashless_parents = 2;
828         int dashful_parents = graph->num_parents - dashless_parents;
829
830         /*
831          * Usually, we add one new column for each parent (like the diagram
832          * above) but sometimes the first parent goes into an existing column,
833          * like this:
834          *
835          * | *---.
836          * | |\ \ \
837          * |/ / / /
838          * x 0 1 2
839          *
840          * In which case the number of parents will be one greater than the
841          * number of added columns.
842          */
843         int added_cols = (graph->num_new_columns - graph->num_columns);
844         int parent_in_old_cols = graph->num_parents - added_cols;
845
846         /*
847          * In both cases, commit_index corresponds to the edge labeled "0".
848          */
849         int first_col = graph->commit_index + dashless_parents
850             - parent_in_old_cols;
851
852         int i;
853         for (i = 0; i < dashful_parents; i++) {
854                 graph_line_write_column(line, &graph->new_columns[i+first_col], '-');
855                 graph_line_write_column(line, &graph->new_columns[i+first_col],
856                                           i == dashful_parents-1 ? '.' : '-');
857         }
858 }
859
860 static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line)
861 {
862         int seen_this = 0;
863         int i;
864
865         /*
866          * Output the row containing this commit
867          * Iterate up to and including graph->num_columns,
868          * since the current commit may not be in any of the existing
869          * columns.  (This happens when the current commit doesn't have any
870          * children that we have already processed.)
871          */
872         seen_this = 0;
873         for (i = 0; i <= graph->num_columns; i++) {
874                 struct column *col = &graph->columns[i];
875                 struct commit *col_commit;
876                 if (i == graph->num_columns) {
877                         if (seen_this)
878                                 break;
879                         col_commit = graph->commit;
880                 } else {
881                         col_commit = graph->columns[i].commit;
882                 }
883
884                 if (col_commit == graph->commit) {
885                         seen_this = 1;
886                         graph_output_commit_char(graph, line);
887
888                         if (graph->num_parents > 2)
889                                 graph_draw_octopus_merge(graph, line);
890                 } else if (seen_this && (graph->num_parents > 2)) {
891                         graph_line_write_column(line, col, '\\');
892                 } else if (seen_this && (graph->num_parents == 2)) {
893                         /*
894                          * This is a 2-way merge commit.
895                          * There is no GRAPH_PRE_COMMIT stage for 2-way
896                          * merges, so this is the first line of output
897                          * for this commit.  Check to see what the previous
898                          * line of output was.
899                          *
900                          * If it was GRAPH_POST_MERGE, the branch line
901                          * coming into this commit may have been '\',
902                          * and not '|' or '/'.  If so, output the branch
903                          * line as '\' on this line, instead of '|'.  This
904                          * makes the output look nicer.
905                          */
906                         if (graph->prev_state == GRAPH_POST_MERGE &&
907                             graph->prev_commit_index < i)
908                                 graph_line_write_column(line, col, '\\');
909                         else
910                                 graph_line_write_column(line, col, '|');
911                 } else {
912                         graph_line_write_column(line, col, '|');
913                 }
914                 graph_line_addch(line, ' ');
915         }
916
917         /*
918          * Update graph->state
919          */
920         if (graph->num_parents > 1)
921                 graph_update_state(graph, GRAPH_POST_MERGE);
922         else if (graph_is_mapping_correct(graph))
923                 graph_update_state(graph, GRAPH_PADDING);
924         else
925                 graph_update_state(graph, GRAPH_COLLAPSING);
926 }
927
928 static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
929 {
930         int seen_this = 0;
931         int i, j;
932
933         /*
934          * Output the post-merge row
935          */
936         for (i = 0; i <= graph->num_columns; i++) {
937                 struct column *col = &graph->columns[i];
938                 struct commit *col_commit;
939                 if (i == graph->num_columns) {
940                         if (seen_this)
941                                 break;
942                         col_commit = graph->commit;
943                 } else {
944                         col_commit = col->commit;
945                 }
946
947                 if (col_commit == graph->commit) {
948                         /*
949                          * Since the current commit is a merge find
950                          * the columns for the parent commits in
951                          * new_columns and use those to format the
952                          * edges.
953                          */
954                         struct commit_list *parents = NULL;
955                         int par_column;
956                         seen_this = 1;
957                         parents = first_interesting_parent(graph);
958                         assert(parents);
959                         par_column = graph_find_new_column_by_commit(graph, parents->item);
960                         assert(par_column >= 0);
961
962                         graph_line_write_column(line, &graph->new_columns[par_column], '|');
963                         for (j = 0; j < graph->num_parents - 1; j++) {
964                                 parents = next_interesting_parent(graph, parents);
965                                 assert(parents);
966                                 par_column = graph_find_new_column_by_commit(graph, parents->item);
967                                 assert(par_column >= 0);
968                                 graph_line_write_column(line, &graph->new_columns[par_column], '\\');
969                                 graph_line_addch(line, ' ');
970                         }
971                 } else if (seen_this) {
972                         graph_line_write_column(line, col, '\\');
973                         graph_line_addch(line, ' ');
974                 } else {
975                         graph_line_write_column(line, col, '|');
976                         graph_line_addch(line, ' ');
977                 }
978         }
979
980         /*
981          * Update graph->state
982          */
983         if (graph_is_mapping_correct(graph))
984                 graph_update_state(graph, GRAPH_PADDING);
985         else
986                 graph_update_state(graph, GRAPH_COLLAPSING);
987 }
988
989 static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line)
990 {
991         int i;
992         short used_horizontal = 0;
993         int horizontal_edge = -1;
994         int horizontal_edge_target = -1;
995
996         /*
997          * Clear out the new_mapping array
998          */
999         for (i = 0; i < graph->mapping_size; i++)
1000                 graph->new_mapping[i] = -1;
1001
1002         for (i = 0; i < graph->mapping_size; i++) {
1003                 int target = graph->mapping[i];
1004                 if (target < 0)
1005                         continue;
1006
1007                 /*
1008                  * Since update_columns() always inserts the leftmost
1009                  * column first, each branch's target location should
1010                  * always be either its current location or to the left of
1011                  * its current location.
1012                  *
1013                  * We never have to move branches to the right.  This makes
1014                  * the graph much more legible, since whenever branches
1015                  * cross, only one is moving directions.
1016                  */
1017                 assert(target * 2 <= i);
1018
1019                 if (target * 2 == i) {
1020                         /*
1021                          * This column is already in the
1022                          * correct place
1023                          */
1024                         assert(graph->new_mapping[i] == -1);
1025                         graph->new_mapping[i] = target;
1026                 } else if (graph->new_mapping[i - 1] < 0) {
1027                         /*
1028                          * Nothing is to the left.
1029                          * Move to the left by one
1030                          */
1031                         graph->new_mapping[i - 1] = target;
1032                         /*
1033                          * If there isn't already an edge moving horizontally
1034                          * select this one.
1035                          */
1036                         if (horizontal_edge == -1) {
1037                                 int j;
1038                                 horizontal_edge = i;
1039                                 horizontal_edge_target = target;
1040                                 /*
1041                                  * The variable target is the index of the graph
1042                                  * column, and therefore target*2+3 is the
1043                                  * actual screen column of the first horizontal
1044                                  * line.
1045                                  */
1046                                 for (j = (target * 2)+3; j < (i - 2); j += 2)
1047                                         graph->new_mapping[j] = target;
1048                         }
1049                 } else if (graph->new_mapping[i - 1] == target) {
1050                         /*
1051                          * There is a branch line to our left
1052                          * already, and it is our target.  We
1053                          * combine with this line, since we share
1054                          * the same parent commit.
1055                          *
1056                          * We don't have to add anything to the
1057                          * output or new_mapping, since the
1058                          * existing branch line has already taken
1059                          * care of it.
1060                          */
1061                 } else {
1062                         /*
1063                          * There is a branch line to our left,
1064                          * but it isn't our target.  We need to
1065                          * cross over it.
1066                          *
1067                          * The space just to the left of this
1068                          * branch should always be empty.
1069                          *
1070                          * The branch to the left of that space
1071                          * should be our eventual target.
1072                          */
1073                         assert(graph->new_mapping[i - 1] > target);
1074                         assert(graph->new_mapping[i - 2] < 0);
1075                         assert(graph->new_mapping[i - 3] == target);
1076                         graph->new_mapping[i - 2] = target;
1077                         /*
1078                          * Mark this branch as the horizontal edge to
1079                          * prevent any other edges from moving
1080                          * horizontally.
1081                          */
1082                         if (horizontal_edge == -1)
1083                                 horizontal_edge = i;
1084                 }
1085         }
1086
1087         /*
1088          * The new mapping may be 1 smaller than the old mapping
1089          */
1090         if (graph->new_mapping[graph->mapping_size - 1] < 0)
1091                 graph->mapping_size--;
1092
1093         /*
1094          * Output out a line based on the new mapping info
1095          */
1096         for (i = 0; i < graph->mapping_size; i++) {
1097                 int target = graph->new_mapping[i];
1098                 if (target < 0)
1099                         graph_line_addch(line, ' ');
1100                 else if (target * 2 == i)
1101                         graph_line_write_column(line, &graph->new_columns[target], '|');
1102                 else if (target == horizontal_edge_target &&
1103                          i != horizontal_edge - 1) {
1104                                 /*
1105                                  * Set the mappings for all but the
1106                                  * first segment to -1 so that they
1107                                  * won't continue into the next line.
1108                                  */
1109                                 if (i != (target * 2)+3)
1110                                         graph->new_mapping[i] = -1;
1111                                 used_horizontal = 1;
1112                         graph_line_write_column(line, &graph->new_columns[target], '_');
1113                 } else {
1114                         if (used_horizontal && i < horizontal_edge)
1115                                 graph->new_mapping[i] = -1;
1116                         graph_line_write_column(line, &graph->new_columns[target], '/');
1117
1118                 }
1119         }
1120
1121         /*
1122          * Swap mapping and new_mapping
1123          */
1124         SWAP(graph->mapping, graph->new_mapping);
1125
1126         /*
1127          * If graph->mapping indicates that all of the branch lines
1128          * are already in the correct positions, we are done.
1129          * Otherwise, we need to collapse some branch lines together.
1130          */
1131         if (graph_is_mapping_correct(graph))
1132                 graph_update_state(graph, GRAPH_PADDING);
1133 }
1134
1135 int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1136 {
1137         int shown_commit_line = 0;
1138         struct graph_line line = { .buf = sb, .width = 0 };
1139
1140         /*
1141          * We could conceivable be called with a NULL commit
1142          * if our caller has a bug, and invokes graph_next_line()
1143          * immediately after graph_init(), without first calling
1144          * graph_update().  Return without outputting anything in this
1145          * case.
1146          */
1147         if (!graph->commit)
1148                 return -1;
1149
1150         switch (graph->state) {
1151         case GRAPH_PADDING:
1152                 graph_output_padding_line(graph, &line);
1153                 break;
1154         case GRAPH_SKIP:
1155                 graph_output_skip_line(graph, &line);
1156                 break;
1157         case GRAPH_PRE_COMMIT:
1158                 graph_output_pre_commit_line(graph, &line);
1159                 break;
1160         case GRAPH_COMMIT:
1161                 graph_output_commit_line(graph, &line);
1162                 shown_commit_line = 1;
1163                 break;
1164         case GRAPH_POST_MERGE:
1165                 graph_output_post_merge_line(graph, &line);
1166                 break;
1167         case GRAPH_COLLAPSING:
1168                 graph_output_collapsing_line(graph, &line);
1169                 break;
1170         }
1171
1172         graph_pad_horizontally(graph, &line);
1173         return shown_commit_line;
1174 }
1175
1176 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1177 {
1178         int i;
1179         struct graph_line line = { .buf = sb, .width = 0 };
1180
1181         if (graph->state != GRAPH_COMMIT) {
1182                 graph_next_line(graph, sb);
1183                 return;
1184         }
1185
1186         /*
1187          * Output the row containing this commit
1188          * Iterate up to and including graph->num_columns,
1189          * since the current commit may not be in any of the existing
1190          * columns.  (This happens when the current commit doesn't have any
1191          * children that we have already processed.)
1192          */
1193         for (i = 0; i < graph->num_columns; i++) {
1194                 struct column *col = &graph->columns[i];
1195
1196                 graph_line_write_column(&line, col, '|');
1197
1198                 if (col->commit == graph->commit && graph->num_parents > 2) {
1199                         int len = (graph->num_parents - 2) * 2;
1200                         graph_line_addchars(&line, ' ', len);
1201                 } else {
1202                         graph_line_addch(&line, ' ');
1203                 }
1204         }
1205
1206         graph_pad_horizontally(graph, &line);
1207
1208         /*
1209          * Update graph->prev_state since we have output a padding line
1210          */
1211         graph->prev_state = GRAPH_PADDING;
1212 }
1213
1214 int graph_is_commit_finished(struct git_graph const *graph)
1215 {
1216         return (graph->state == GRAPH_PADDING);
1217 }
1218
1219 void graph_show_commit(struct git_graph *graph)
1220 {
1221         struct strbuf msgbuf = STRBUF_INIT;
1222         int shown_commit_line = 0;
1223
1224         graph_show_line_prefix(default_diffopt);
1225
1226         if (!graph)
1227                 return;
1228
1229         /*
1230          * When showing a diff of a merge against each of its parents, we
1231          * are called once for each parent without graph_update having been
1232          * called.  In this case, simply output a single padding line.
1233          */
1234         if (graph_is_commit_finished(graph)) {
1235                 graph_show_padding(graph);
1236                 shown_commit_line = 1;
1237         }
1238
1239         while (!shown_commit_line && !graph_is_commit_finished(graph)) {
1240                 shown_commit_line = graph_next_line(graph, &msgbuf);
1241                 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1242                         graph->revs->diffopt.file);
1243                 if (!shown_commit_line) {
1244                         putc('\n', graph->revs->diffopt.file);
1245                         graph_show_line_prefix(&graph->revs->diffopt);
1246                 }
1247                 strbuf_setlen(&msgbuf, 0);
1248         }
1249
1250         strbuf_release(&msgbuf);
1251 }
1252
1253 void graph_show_oneline(struct git_graph *graph)
1254 {
1255         struct strbuf msgbuf = STRBUF_INIT;
1256
1257         graph_show_line_prefix(default_diffopt);
1258
1259         if (!graph)
1260                 return;
1261
1262         graph_next_line(graph, &msgbuf);
1263         fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1264         strbuf_release(&msgbuf);
1265 }
1266
1267 void graph_show_padding(struct git_graph *graph)
1268 {
1269         struct strbuf msgbuf = STRBUF_INIT;
1270
1271         graph_show_line_prefix(default_diffopt);
1272
1273         if (!graph)
1274                 return;
1275
1276         graph_padding_line(graph, &msgbuf);
1277         fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1278         strbuf_release(&msgbuf);
1279 }
1280
1281 int graph_show_remainder(struct git_graph *graph)
1282 {
1283         struct strbuf msgbuf = STRBUF_INIT;
1284         int shown = 0;
1285
1286         graph_show_line_prefix(default_diffopt);
1287
1288         if (!graph)
1289                 return 0;
1290
1291         if (graph_is_commit_finished(graph))
1292                 return 0;
1293
1294         for (;;) {
1295                 graph_next_line(graph, &msgbuf);
1296                 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1297                         graph->revs->diffopt.file);
1298                 strbuf_setlen(&msgbuf, 0);
1299                 shown = 1;
1300
1301                 if (!graph_is_commit_finished(graph)) {
1302                         putc('\n', graph->revs->diffopt.file);
1303                         graph_show_line_prefix(&graph->revs->diffopt);
1304                 } else {
1305                         break;
1306                 }
1307         }
1308         strbuf_release(&msgbuf);
1309
1310         return shown;
1311 }
1312
1313 static void graph_show_strbuf(struct git_graph *graph,
1314                               FILE *file,
1315                               struct strbuf const *sb)
1316 {
1317         char *p;
1318
1319         /*
1320          * Print the strbuf line by line,
1321          * and display the graph info before each line but the first.
1322          */
1323         p = sb->buf;
1324         while (p) {
1325                 size_t len;
1326                 char *next_p = strchr(p, '\n');
1327                 if (next_p) {
1328                         next_p++;
1329                         len = next_p - p;
1330                 } else {
1331                         len = (sb->buf + sb->len) - p;
1332                 }
1333                 fwrite(p, sizeof(char), len, file);
1334                 if (next_p && *next_p != '\0')
1335                         graph_show_oneline(graph);
1336                 p = next_p;
1337         }
1338 }
1339
1340 void graph_show_commit_msg(struct git_graph *graph,
1341                            FILE *file,
1342                            struct strbuf const *sb)
1343 {
1344         int newline_terminated;
1345
1346         /*
1347          * Show the commit message
1348          */
1349         graph_show_strbuf(graph, file, sb);
1350
1351         if (!graph)
1352                 return;
1353
1354         newline_terminated = (sb->len && sb->buf[sb->len - 1] == '\n');
1355
1356         /*
1357          * If there is more output needed for this commit, show it now
1358          */
1359         if (!graph_is_commit_finished(graph)) {
1360                 /*
1361                  * If sb doesn't have a terminating newline, print one now,
1362                  * so we can start the remainder of the graph output on a
1363                  * new line.
1364                  */
1365                 if (!newline_terminated)
1366                         putc('\n', file);
1367
1368                 graph_show_remainder(graph);
1369
1370                 /*
1371                  * If sb ends with a newline, our output should too.
1372                  */
1373                 if (newline_terminated)
1374                         putc('\n', file);
1375         }
1376 }