parse-options: disallow negating OPTION_SET_INT 0
[git.git] / graph.c
blob2a9dc430fae105c8d6fb5a8763320ae40fb1e5c8
1 #include "git-compat-util.h"
2 #include "gettext.h"
3 #include "config.h"
4 #include "commit.h"
5 #include "color.h"
6 #include "graph.h"
7 #include "revision.h"
8 #include "strvec.h"
10 /* Internal API */
13 * Output a padding line in the graph.
14 * This is similar to graph_next_line(). However, it is guaranteed to
15 * never print the current commit line. Instead, if the commit line is
16 * next, it will simply output a line of vertical padding, extending the
17 * branch lines downwards, but leaving them otherwise unchanged.
19 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
22 * Print a strbuf. If the graph is non-NULL, all lines but the first will be
23 * prefixed with the graph output.
25 * If the strbuf ends with a newline, the output will end after this
26 * newline. A new graph line will not be printed after the final newline.
27 * If the strbuf is empty, no output will be printed.
29 * Since the first line will not include the graph output, the caller is
30 * responsible for printing this line's graph (perhaps via
31 * graph_show_commit() or graph_show_oneline()) before calling
32 * graph_show_strbuf().
34 * Note that unlike some other graph display functions, you must pass the file
35 * handle directly. It is assumed that this is the same file handle as the
36 * file specified by the graph diff options. This is necessary so that
37 * graph_show_strbuf can be called even with a NULL graph.
38 * If a NULL graph is supplied, the strbuf is printed as-is.
40 static void graph_show_strbuf(struct git_graph *graph,
41 FILE *file,
42 struct strbuf const *sb);
45 * TODO:
46 * - Limit the number of columns, similar to the way gitk does.
47 * If we reach more than a specified number of columns, omit
48 * sections of some columns.
51 struct column {
53 * The parent commit of this column.
55 struct commit *commit;
57 * The color to (optionally) print this column in. This is an
58 * index into column_colors.
60 unsigned short color;
63 enum graph_state {
64 GRAPH_PADDING,
65 GRAPH_SKIP,
66 GRAPH_PRE_COMMIT,
67 GRAPH_COMMIT,
68 GRAPH_POST_MERGE,
69 GRAPH_COLLAPSING
72 static void graph_show_line_prefix(const struct diff_options *diffopt)
74 if (!diffopt || !diffopt->line_prefix)
75 return;
77 fwrite(diffopt->line_prefix,
78 sizeof(char),
79 diffopt->line_prefix_length,
80 diffopt->file);
83 static const char **column_colors;
84 static unsigned short column_colors_max;
86 static void parse_graph_colors_config(struct strvec *colors, const char *string)
88 const char *end, *start;
90 start = string;
91 end = string + strlen(string);
92 while (start < end) {
93 const char *comma = strchrnul(start, ',');
94 char color[COLOR_MAXLEN];
96 if (!color_parse_mem(start, comma - start, color))
97 strvec_push(colors, color);
98 else
99 warning(_("ignored invalid color '%.*s' in log.graphColors"),
100 (int)(comma - start), start);
101 start = comma + 1;
103 strvec_push(colors, GIT_COLOR_RESET);
106 void graph_set_column_colors(const char **colors, unsigned short colors_max)
108 column_colors = colors;
109 column_colors_max = colors_max;
112 static const char *column_get_color_code(unsigned short color)
114 return column_colors[color];
117 struct graph_line {
118 struct strbuf *buf;
119 size_t width;
122 static inline void graph_line_addch(struct graph_line *line, int c)
124 strbuf_addch(line->buf, c);
125 line->width++;
128 static inline void graph_line_addchars(struct graph_line *line, int c, size_t n)
130 strbuf_addchars(line->buf, c, n);
131 line->width += n;
134 static inline void graph_line_addstr(struct graph_line *line, const char *s)
136 strbuf_addstr(line->buf, s);
137 line->width += strlen(s);
140 static inline void graph_line_addcolor(struct graph_line *line, unsigned short color)
142 strbuf_addstr(line->buf, column_get_color_code(color));
145 static void graph_line_write_column(struct graph_line *line, const struct column *c,
146 char col_char)
148 if (c->color < column_colors_max)
149 graph_line_addcolor(line, c->color);
150 graph_line_addch(line, col_char);
151 if (c->color < column_colors_max)
152 graph_line_addcolor(line, column_colors_max);
155 struct git_graph {
157 * The commit currently being processed
159 struct commit *commit;
160 /* The rev-info used for the current traversal */
161 struct rev_info *revs;
163 * The number of interesting parents that this commit has.
165 * Note that this is not the same as the actual number of parents.
166 * This count excludes parents that won't be printed in the graph
167 * output, as determined by graph_is_interesting().
169 int num_parents;
171 * The width of the graph output for this commit.
172 * All rows for this commit are padded to this width, so that
173 * messages printed after the graph output are aligned.
175 int width;
177 * The next expansion row to print
178 * when state is GRAPH_PRE_COMMIT
180 int expansion_row;
182 * The current output state.
183 * This tells us what kind of line graph_next_line() should output.
185 enum graph_state state;
187 * The output state for the previous line of output.
188 * This is primarily used to determine how the first merge line
189 * should appear, based on the last line of the previous commit.
191 enum graph_state prev_state;
193 * The index of the column that refers to this commit.
195 * If none of the incoming columns refer to this commit,
196 * this will be equal to num_columns.
198 int commit_index;
200 * The commit_index for the previously displayed commit.
202 * This is used to determine how the first line of a merge
203 * graph output should appear, based on the last line of the
204 * previous commit.
206 int prev_commit_index;
208 * Which layout variant to use to display merge commits. If the
209 * commit's first parent is known to be in a column to the left of the
210 * merge, then this value is 0 and we use the layout on the left.
211 * Otherwise, the value is 1 and the layout on the right is used. This
212 * field tells us how many columns the first parent occupies.
214 * 0) 1)
216 * | | | *-. | | *---.
217 * | |_|/|\ \ | | |\ \ \
218 * |/| | | | | | | | | | *
220 int merge_layout;
222 * The number of columns added to the graph by the current commit. For
223 * 2-way and octopus merges, this is usually one less than the
224 * number of parents:
226 * | | | | | \
227 * | * | | *---. \
228 * | |\ \ | |\ \ \ \
229 * | | | | | | | | | |
231 * num_parents: 2 num_parents: 4
232 * edges_added: 1 edges_added: 3
234 * For left-skewed merges, the first parent fuses with its neighbor and
235 * so one less column is added:
237 * | | | | | \
238 * | * | | *-. \
239 * |/| | |/|\ \ \
240 * | | | | | | | |
242 * num_parents: 2 num_parents: 4
243 * edges_added: 0 edges_added: 2
245 * This number determines how edges to the right of the merge are
246 * displayed in commit and post-merge lines; if no columns have been
247 * added then a vertical line should be used where a right-tracking
248 * line would otherwise be used.
250 * | * \ | * |
251 * | |\ \ |/| |
252 * | | * \ | * |
254 int edges_added;
256 * The number of columns added by the previous commit, which is used to
257 * smooth edges appearing to the right of a commit in a commit line
258 * following a post-merge line.
260 int prev_edges_added;
262 * The maximum number of columns that can be stored in the columns
263 * and new_columns arrays. This is also half the number of entries
264 * that can be stored in the mapping and old_mapping arrays.
266 int column_capacity;
268 * The number of columns (also called "branch lines" in some places)
270 int num_columns;
272 * The number of columns in the new_columns array
274 int num_new_columns;
276 * The number of entries in the mapping array
278 int mapping_size;
280 * The column state before we output the current commit.
282 struct column *columns;
284 * The new column state after we output the current commit.
285 * Only valid when state is GRAPH_COLLAPSING.
287 struct column *new_columns;
289 * An array that tracks the current state of each
290 * character in the output line during state GRAPH_COLLAPSING.
291 * Each entry is -1 if this character is empty, or a non-negative
292 * integer if the character contains a branch line. The value of
293 * the integer indicates the target position for this branch line.
294 * (I.e., this array maps the current column positions to their
295 * desired positions.)
297 * The maximum capacity of this array is always
298 * sizeof(int) * 2 * column_capacity.
300 int *mapping;
302 * A copy of the contents of the mapping array from the last commit,
303 * which we use to improve the display of columns that are tracking
304 * from right to left through a commit line. We also use this to
305 * avoid allocating a fresh array when we compute the next mapping.
307 int *old_mapping;
309 * The current default column color being used. This is
310 * stored as an index into the array column_colors.
312 unsigned short default_column_color;
315 static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void *data)
317 struct git_graph *graph = data;
318 static struct strbuf msgbuf = STRBUF_INIT;
320 assert(opt);
322 strbuf_reset(&msgbuf);
323 if (opt->line_prefix)
324 strbuf_add(&msgbuf, opt->line_prefix,
325 opt->line_prefix_length);
326 if (graph)
327 graph_padding_line(graph, &msgbuf);
328 return &msgbuf;
331 static const struct diff_options *default_diffopt;
333 void graph_setup_line_prefix(struct diff_options *diffopt)
335 default_diffopt = diffopt;
337 /* setup an output prefix callback if necessary */
338 if (diffopt && !diffopt->output_prefix)
339 diffopt->output_prefix = diff_output_prefix_callback;
343 struct git_graph *graph_init(struct rev_info *opt)
345 struct git_graph *graph = xmalloc(sizeof(struct git_graph));
347 if (!column_colors) {
348 char *string;
349 if (git_config_get_string("log.graphcolors", &string)) {
350 /* not configured -- use default */
351 graph_set_column_colors(column_colors_ansi,
352 column_colors_ansi_max);
353 } else {
354 static struct strvec custom_colors = STRVEC_INIT;
355 strvec_clear(&custom_colors);
356 parse_graph_colors_config(&custom_colors, string);
357 free(string);
358 /* graph_set_column_colors takes a max-index, not a count */
359 graph_set_column_colors(custom_colors.v,
360 custom_colors.nr - 1);
364 graph->commit = NULL;
365 graph->revs = opt;
366 graph->num_parents = 0;
367 graph->expansion_row = 0;
368 graph->state = GRAPH_PADDING;
369 graph->prev_state = GRAPH_PADDING;
370 graph->commit_index = 0;
371 graph->prev_commit_index = 0;
372 graph->merge_layout = 0;
373 graph->edges_added = 0;
374 graph->prev_edges_added = 0;
375 graph->num_columns = 0;
376 graph->num_new_columns = 0;
377 graph->mapping_size = 0;
379 * Start the column color at the maximum value, since we'll
380 * always increment it for the first commit we output.
381 * This way we start at 0 for the first commit.
383 graph->default_column_color = column_colors_max - 1;
386 * Allocate a reasonably large default number of columns
387 * We'll automatically grow columns later if we need more room.
389 graph->column_capacity = 30;
390 ALLOC_ARRAY(graph->columns, graph->column_capacity);
391 ALLOC_ARRAY(graph->new_columns, graph->column_capacity);
392 ALLOC_ARRAY(graph->mapping, 2 * graph->column_capacity);
393 ALLOC_ARRAY(graph->old_mapping, 2 * graph->column_capacity);
396 * The diff output prefix callback, with this we can make
397 * all the diff output to align with the graph lines.
399 opt->diffopt.output_prefix = diff_output_prefix_callback;
400 opt->diffopt.output_prefix_data = graph;
402 return graph;
405 void graph_clear(struct git_graph *graph)
407 if (!graph)
408 return;
410 free(graph->columns);
411 free(graph->new_columns);
412 free(graph->mapping);
413 free(graph->old_mapping);
414 free(graph);
417 static void graph_update_state(struct git_graph *graph, enum graph_state s)
419 graph->prev_state = graph->state;
420 graph->state = s;
423 static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
425 if (graph->column_capacity >= num_columns)
426 return;
428 do {
429 graph->column_capacity *= 2;
430 } while (graph->column_capacity < num_columns);
432 REALLOC_ARRAY(graph->columns, graph->column_capacity);
433 REALLOC_ARRAY(graph->new_columns, graph->column_capacity);
434 REALLOC_ARRAY(graph->mapping, graph->column_capacity * 2);
435 REALLOC_ARRAY(graph->old_mapping, graph->column_capacity * 2);
439 * Returns 1 if the commit will be printed in the graph output,
440 * and 0 otherwise.
442 static int graph_is_interesting(struct git_graph *graph, struct commit *commit)
445 * If revs->boundary is set, commits whose children have
446 * been shown are always interesting, even if they have the
447 * UNINTERESTING or TREESAME flags set.
449 if (graph->revs && graph->revs->boundary) {
450 if (commit->object.flags & CHILD_SHOWN)
451 return 1;
455 * Otherwise, use get_commit_action() to see if this commit is
456 * interesting
458 return get_commit_action(graph->revs, commit) == commit_show;
461 static struct commit_list *next_interesting_parent(struct git_graph *graph,
462 struct commit_list *orig)
464 struct commit_list *list;
467 * If revs->first_parent_only is set, only the first
468 * parent is interesting. None of the others are.
470 if (graph->revs->first_parent_only)
471 return NULL;
474 * Return the next interesting commit after orig
476 for (list = orig->next; list; list = list->next) {
477 if (graph_is_interesting(graph, list->item))
478 return list;
481 return NULL;
484 static struct commit_list *first_interesting_parent(struct git_graph *graph)
486 struct commit_list *parents = graph->commit->parents;
489 * If this commit has no parents, ignore it
491 if (!parents)
492 return NULL;
495 * If the first parent is interesting, return it
497 if (graph_is_interesting(graph, parents->item))
498 return parents;
501 * Otherwise, call next_interesting_parent() to get
502 * the next interesting parent
504 return next_interesting_parent(graph, parents);
507 static unsigned short graph_get_current_column_color(const struct git_graph *graph)
509 if (!want_color(graph->revs->diffopt.use_color))
510 return column_colors_max;
511 return graph->default_column_color;
515 * Update the graph's default column color.
517 static void graph_increment_column_color(struct git_graph *graph)
519 graph->default_column_color = (graph->default_column_color + 1) %
520 column_colors_max;
523 static unsigned short graph_find_commit_color(const struct git_graph *graph,
524 const struct commit *commit)
526 int i;
527 for (i = 0; i < graph->num_columns; i++) {
528 if (graph->columns[i].commit == commit)
529 return graph->columns[i].color;
531 return graph_get_current_column_color(graph);
534 static int graph_find_new_column_by_commit(struct git_graph *graph,
535 struct commit *commit)
537 int i;
538 for (i = 0; i < graph->num_new_columns; i++) {
539 if (graph->new_columns[i].commit == commit)
540 return i;
542 return -1;
545 static void graph_insert_into_new_columns(struct git_graph *graph,
546 struct commit *commit,
547 int idx)
549 int i = graph_find_new_column_by_commit(graph, commit);
550 int mapping_idx;
553 * If the commit is not already in the new_columns array, then add it
554 * and record it as being in the final column.
556 if (i < 0) {
557 i = graph->num_new_columns++;
558 graph->new_columns[i].commit = commit;
559 graph->new_columns[i].color = graph_find_commit_color(graph, commit);
562 if (graph->num_parents > 1 && idx > -1 && graph->merge_layout == -1) {
564 * If this is the first parent of a merge, choose a layout for
565 * the merge line based on whether the parent appears in a
566 * column to the left of the merge
568 int dist, shift;
570 dist = idx - i;
571 shift = (dist > 1) ? 2 * dist - 3 : 1;
573 graph->merge_layout = (dist > 0) ? 0 : 1;
574 graph->edges_added = graph->num_parents + graph->merge_layout - 2;
576 mapping_idx = graph->width + (graph->merge_layout - 1) * shift;
577 graph->width += 2 * graph->merge_layout;
579 } else if (graph->edges_added > 0 && i == graph->mapping[graph->width - 2]) {
581 * If some columns have been added by a merge, but this commit
582 * was found in the last existing column, then adjust the
583 * numbers so that the two edges immediately join, i.e.:
585 * * | * |
586 * |\ \ => |\|
587 * | |/ | *
588 * | *
590 mapping_idx = graph->width - 2;
591 graph->edges_added = -1;
592 } else {
593 mapping_idx = graph->width;
594 graph->width += 2;
597 graph->mapping[mapping_idx] = i;
600 static void graph_update_columns(struct git_graph *graph)
602 struct commit_list *parent;
603 int max_new_columns;
604 int i, seen_this, is_commit_in_columns;
607 * Swap graph->columns with graph->new_columns
608 * graph->columns contains the state for the previous commit,
609 * and new_columns now contains the state for our commit.
611 * We'll re-use the old columns array as storage to compute the new
612 * columns list for the commit after this one.
614 SWAP(graph->columns, graph->new_columns);
615 graph->num_columns = graph->num_new_columns;
616 graph->num_new_columns = 0;
619 * Now update new_columns and mapping with the information for the
620 * commit after this one.
622 * First, make sure we have enough room. At most, there will
623 * be graph->num_columns + graph->num_parents columns for the next
624 * commit.
626 max_new_columns = graph->num_columns + graph->num_parents;
627 graph_ensure_capacity(graph, max_new_columns);
630 * Clear out graph->mapping
632 graph->mapping_size = 2 * max_new_columns;
633 for (i = 0; i < graph->mapping_size; i++)
634 graph->mapping[i] = -1;
636 graph->width = 0;
637 graph->prev_edges_added = graph->edges_added;
638 graph->edges_added = 0;
641 * Populate graph->new_columns and graph->mapping
643 * Some of the parents of this commit may already be in
644 * graph->columns. If so, graph->new_columns should only contain a
645 * single entry for each such commit. graph->mapping should
646 * contain information about where each current branch line is
647 * supposed to end up after the collapsing is performed.
649 seen_this = 0;
650 is_commit_in_columns = 1;
651 for (i = 0; i <= graph->num_columns; i++) {
652 struct commit *col_commit;
653 if (i == graph->num_columns) {
654 if (seen_this)
655 break;
656 is_commit_in_columns = 0;
657 col_commit = graph->commit;
658 } else {
659 col_commit = graph->columns[i].commit;
662 if (col_commit == graph->commit) {
663 seen_this = 1;
664 graph->commit_index = i;
665 graph->merge_layout = -1;
666 for (parent = first_interesting_parent(graph);
667 parent;
668 parent = next_interesting_parent(graph, parent)) {
670 * If this is a merge, or the start of a new
671 * childless column, increment the current
672 * color.
674 if (graph->num_parents > 1 ||
675 !is_commit_in_columns) {
676 graph_increment_column_color(graph);
678 graph_insert_into_new_columns(graph, parent->item, i);
681 * We always need to increment graph->width by at
682 * least 2, even if it has no interesting parents.
683 * The current commit always takes up at least 2
684 * spaces.
686 if (graph->num_parents == 0)
687 graph->width += 2;
688 } else {
689 graph_insert_into_new_columns(graph, col_commit, -1);
694 * Shrink mapping_size to be the minimum necessary
696 while (graph->mapping_size > 1 &&
697 graph->mapping[graph->mapping_size - 1] < 0)
698 graph->mapping_size--;
701 static int graph_num_dashed_parents(struct git_graph *graph)
703 return graph->num_parents + graph->merge_layout - 3;
706 static int graph_num_expansion_rows(struct git_graph *graph)
709 * Normally, we need two expansion rows for each dashed parent line from
710 * an octopus merge:
712 * | *
713 * | |\
714 * | | \
715 * | | \
716 * | *-. \
717 * | |\ \ \
719 * If the merge is skewed to the left, then its parents occupy one less
720 * column, and we don't need as many expansion rows to route around it;
721 * in some cases that means we don't need any expansion rows at all:
723 * | *
724 * | |\
725 * | * \
726 * |/|\ \
728 return graph_num_dashed_parents(graph) * 2;
731 static int graph_needs_pre_commit_line(struct git_graph *graph)
733 return graph->num_parents >= 3 &&
734 graph->commit_index < (graph->num_columns - 1) &&
735 graph->expansion_row < graph_num_expansion_rows(graph);
738 void graph_update(struct git_graph *graph, struct commit *commit)
740 struct commit_list *parent;
743 * Set the new commit
745 graph->commit = commit;
748 * Count how many interesting parents this commit has
750 graph->num_parents = 0;
751 for (parent = first_interesting_parent(graph);
752 parent;
753 parent = next_interesting_parent(graph, parent))
755 graph->num_parents++;
759 * Store the old commit_index in prev_commit_index.
760 * graph_update_columns() will update graph->commit_index for this
761 * commit.
763 graph->prev_commit_index = graph->commit_index;
766 * Call graph_update_columns() to update
767 * columns, new_columns, and mapping.
769 graph_update_columns(graph);
771 graph->expansion_row = 0;
774 * Update graph->state.
775 * Note that we don't call graph_update_state() here, since
776 * we don't want to update graph->prev_state. No line for
777 * graph->state was ever printed.
779 * If the previous commit didn't get to the GRAPH_PADDING state,
780 * it never finished its output. Goto GRAPH_SKIP, to print out
781 * a line to indicate that portion of the graph is missing.
783 * If there are 3 or more parents, we may need to print extra rows
784 * before the commit, to expand the branch lines around it and make
785 * room for it. We need to do this only if there is a branch row
786 * (or more) to the right of this commit.
788 * If there are less than 3 parents, we can immediately print the
789 * commit line.
791 if (graph->state != GRAPH_PADDING)
792 graph->state = GRAPH_SKIP;
793 else if (graph_needs_pre_commit_line(graph))
794 graph->state = GRAPH_PRE_COMMIT;
795 else
796 graph->state = GRAPH_COMMIT;
799 static int graph_is_mapping_correct(struct git_graph *graph)
801 int i;
804 * The mapping is up to date if each entry is at its target,
805 * or is 1 greater than its target.
806 * (If it is 1 greater than the target, '/' will be printed, so it
807 * will look correct on the next row.)
809 for (i = 0; i < graph->mapping_size; i++) {
810 int target = graph->mapping[i];
811 if (target < 0)
812 continue;
813 if (target == (i / 2))
814 continue;
815 return 0;
818 return 1;
821 static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line)
824 * Add additional spaces to the end of the strbuf, so that all
825 * lines for a particular commit have the same width.
827 * This way, fields printed to the right of the graph will remain
828 * aligned for the entire commit.
830 if (line->width < graph->width)
831 graph_line_addchars(line, ' ', graph->width - line->width);
834 static void graph_output_padding_line(struct git_graph *graph,
835 struct graph_line *line)
837 int i;
840 * Output a padding row, that leaves all branch lines unchanged
842 for (i = 0; i < graph->num_new_columns; i++) {
843 graph_line_write_column(line, &graph->new_columns[i], '|');
844 graph_line_addch(line, ' ');
849 int graph_width(struct git_graph *graph)
851 return graph->width;
855 static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line)
858 * Output an ellipsis to indicate that a portion
859 * of the graph is missing.
861 graph_line_addstr(line, "...");
863 if (graph_needs_pre_commit_line(graph))
864 graph_update_state(graph, GRAPH_PRE_COMMIT);
865 else
866 graph_update_state(graph, GRAPH_COMMIT);
869 static void graph_output_pre_commit_line(struct git_graph *graph,
870 struct graph_line *line)
872 int i, seen_this;
875 * This function formats a row that increases the space around a commit
876 * with multiple parents, to make room for it. It should only be
877 * called when there are 3 or more parents.
879 * We need 2 extra rows for every parent over 2.
881 assert(graph->num_parents >= 3);
884 * graph->expansion_row tracks the current expansion row we are on.
885 * It should be in the range [0, num_expansion_rows - 1]
887 assert(0 <= graph->expansion_row &&
888 graph->expansion_row < graph_num_expansion_rows(graph));
891 * Output the row
893 seen_this = 0;
894 for (i = 0; i < graph->num_columns; i++) {
895 struct column *col = &graph->columns[i];
896 if (col->commit == graph->commit) {
897 seen_this = 1;
898 graph_line_write_column(line, col, '|');
899 graph_line_addchars(line, ' ', graph->expansion_row);
900 } else if (seen_this && (graph->expansion_row == 0)) {
902 * This is the first line of the pre-commit output.
903 * If the previous commit was a merge commit and
904 * ended in the GRAPH_POST_MERGE state, all branch
905 * lines after graph->prev_commit_index were
906 * printed as "\" on the previous line. Continue
907 * to print them as "\" on this line. Otherwise,
908 * print the branch lines as "|".
910 if (graph->prev_state == GRAPH_POST_MERGE &&
911 graph->prev_commit_index < i)
912 graph_line_write_column(line, col, '\\');
913 else
914 graph_line_write_column(line, col, '|');
915 } else if (seen_this && (graph->expansion_row > 0)) {
916 graph_line_write_column(line, col, '\\');
917 } else {
918 graph_line_write_column(line, col, '|');
920 graph_line_addch(line, ' ');
924 * Increment graph->expansion_row,
925 * and move to state GRAPH_COMMIT if necessary
927 graph->expansion_row++;
928 if (!graph_needs_pre_commit_line(graph))
929 graph_update_state(graph, GRAPH_COMMIT);
932 static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line)
935 * For boundary commits, print 'o'
936 * (We should only see boundary commits when revs->boundary is set.)
938 if (graph->commit->object.flags & BOUNDARY) {
939 assert(graph->revs->boundary);
940 graph_line_addch(line, 'o');
941 return;
945 * get_revision_mark() handles all other cases without assert()
947 graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
951 * Draw the horizontal dashes of an octopus merge.
953 static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line)
956 * The parents of a merge commit can be arbitrarily reordered as they
957 * are mapped onto display columns, for example this is a valid merge:
959 * | | *---.
960 * | | |\ \ \
961 * | | |/ / /
962 * | |/| | /
963 * | |_|_|/
964 * |/| | |
965 * 3 1 0 2
967 * The numbers denote which parent of the merge each visual column
968 * corresponds to; we can't assume that the parents will initially
969 * display in the order given by new_columns.
971 * To find the right color for each dash, we need to consult the
972 * mapping array, starting from the column 2 places to the right of the
973 * merge commit, and use that to find out which logical column each
974 * edge will collapse to.
976 * Commits are rendered once all edges have collapsed to their correct
977 * logcial column, so commit_index gives us the right visual offset for
978 * the merge commit.
981 int i, j;
982 struct column *col;
984 int dashed_parents = graph_num_dashed_parents(graph);
986 for (i = 0; i < dashed_parents; i++) {
987 j = graph->mapping[(graph->commit_index + i + 2) * 2];
988 col = &graph->new_columns[j];
990 graph_line_write_column(line, col, '-');
991 graph_line_write_column(line, col, (i == dashed_parents - 1) ? '.' : '-');
994 return;
997 static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line)
999 int seen_this = 0;
1000 int i;
1003 * Output the row containing this commit
1004 * Iterate up to and including graph->num_columns,
1005 * since the current commit may not be in any of the existing
1006 * columns. (This happens when the current commit doesn't have any
1007 * children that we have already processed.)
1009 seen_this = 0;
1010 for (i = 0; i <= graph->num_columns; i++) {
1011 struct column *col = &graph->columns[i];
1012 struct commit *col_commit;
1013 if (i == graph->num_columns) {
1014 if (seen_this)
1015 break;
1016 col_commit = graph->commit;
1017 } else {
1018 col_commit = graph->columns[i].commit;
1021 if (col_commit == graph->commit) {
1022 seen_this = 1;
1023 graph_output_commit_char(graph, line);
1025 if (graph->num_parents > 2)
1026 graph_draw_octopus_merge(graph, line);
1027 } else if (seen_this && (graph->edges_added > 1)) {
1028 graph_line_write_column(line, col, '\\');
1029 } else if (seen_this && (graph->edges_added == 1)) {
1031 * This is either a right-skewed 2-way merge
1032 * commit, or a left-skewed 3-way merge.
1033 * There is no GRAPH_PRE_COMMIT stage for such
1034 * merges, so this is the first line of output
1035 * for this commit. Check to see what the previous
1036 * line of output was.
1038 * If it was GRAPH_POST_MERGE, the branch line
1039 * coming into this commit may have been '\',
1040 * and not '|' or '/'. If so, output the branch
1041 * line as '\' on this line, instead of '|'. This
1042 * makes the output look nicer.
1044 if (graph->prev_state == GRAPH_POST_MERGE &&
1045 graph->prev_edges_added > 0 &&
1046 graph->prev_commit_index < i)
1047 graph_line_write_column(line, col, '\\');
1048 else
1049 graph_line_write_column(line, col, '|');
1050 } else if (graph->prev_state == GRAPH_COLLAPSING &&
1051 graph->old_mapping[2 * i + 1] == i &&
1052 graph->mapping[2 * i] < i) {
1053 graph_line_write_column(line, col, '/');
1054 } else {
1055 graph_line_write_column(line, col, '|');
1057 graph_line_addch(line, ' ');
1061 * Update graph->state
1063 if (graph->num_parents > 1)
1064 graph_update_state(graph, GRAPH_POST_MERGE);
1065 else if (graph_is_mapping_correct(graph))
1066 graph_update_state(graph, GRAPH_PADDING);
1067 else
1068 graph_update_state(graph, GRAPH_COLLAPSING);
1071 static const char merge_chars[] = {'/', '|', '\\'};
1073 static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
1075 int seen_this = 0;
1076 int i, j;
1078 struct commit_list *first_parent = first_interesting_parent(graph);
1079 struct column *parent_col = NULL;
1082 * Output the post-merge row
1084 for (i = 0; i <= graph->num_columns; i++) {
1085 struct column *col = &graph->columns[i];
1086 struct commit *col_commit;
1087 if (i == graph->num_columns) {
1088 if (seen_this)
1089 break;
1090 col_commit = graph->commit;
1091 } else {
1092 col_commit = col->commit;
1095 if (col_commit == graph->commit) {
1097 * Since the current commit is a merge find
1098 * the columns for the parent commits in
1099 * new_columns and use those to format the
1100 * edges.
1102 struct commit_list *parents = first_parent;
1103 int par_column;
1104 int idx = graph->merge_layout;
1105 char c;
1106 seen_this = 1;
1108 for (j = 0; j < graph->num_parents; j++) {
1109 par_column = graph_find_new_column_by_commit(graph, parents->item);
1110 assert(par_column >= 0);
1112 c = merge_chars[idx];
1113 graph_line_write_column(line, &graph->new_columns[par_column], c);
1114 if (idx == 2) {
1115 if (graph->edges_added > 0 || j < graph->num_parents - 1)
1116 graph_line_addch(line, ' ');
1117 } else {
1118 idx++;
1120 parents = next_interesting_parent(graph, parents);
1122 if (graph->edges_added == 0)
1123 graph_line_addch(line, ' ');
1125 } else if (seen_this) {
1126 if (graph->edges_added > 0)
1127 graph_line_write_column(line, col, '\\');
1128 else
1129 graph_line_write_column(line, col, '|');
1130 graph_line_addch(line, ' ');
1131 } else {
1132 graph_line_write_column(line, col, '|');
1133 if (graph->merge_layout != 0 || i != graph->commit_index - 1) {
1134 if (parent_col)
1135 graph_line_write_column(
1136 line, parent_col, '_');
1137 else
1138 graph_line_addch(line, ' ');
1142 if (col_commit == first_parent->item)
1143 parent_col = col;
1147 * Update graph->state
1149 if (graph_is_mapping_correct(graph))
1150 graph_update_state(graph, GRAPH_PADDING);
1151 else
1152 graph_update_state(graph, GRAPH_COLLAPSING);
1155 static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line)
1157 int i;
1158 short used_horizontal = 0;
1159 int horizontal_edge = -1;
1160 int horizontal_edge_target = -1;
1163 * Swap the mapping and old_mapping arrays
1165 SWAP(graph->mapping, graph->old_mapping);
1168 * Clear out the mapping array
1170 for (i = 0; i < graph->mapping_size; i++)
1171 graph->mapping[i] = -1;
1173 for (i = 0; i < graph->mapping_size; i++) {
1174 int target = graph->old_mapping[i];
1175 if (target < 0)
1176 continue;
1179 * Since update_columns() always inserts the leftmost
1180 * column first, each branch's target location should
1181 * always be either its current location or to the left of
1182 * its current location.
1184 * We never have to move branches to the right. This makes
1185 * the graph much more legible, since whenever branches
1186 * cross, only one is moving directions.
1188 assert(target * 2 <= i);
1190 if (target * 2 == i) {
1192 * This column is already in the
1193 * correct place
1195 assert(graph->mapping[i] == -1);
1196 graph->mapping[i] = target;
1197 } else if (graph->mapping[i - 1] < 0) {
1199 * Nothing is to the left.
1200 * Move to the left by one
1202 graph->mapping[i - 1] = target;
1204 * If there isn't already an edge moving horizontally
1205 * select this one.
1207 if (horizontal_edge == -1) {
1208 int j;
1209 horizontal_edge = i;
1210 horizontal_edge_target = target;
1212 * The variable target is the index of the graph
1213 * column, and therefore target*2+3 is the
1214 * actual screen column of the first horizontal
1215 * line.
1217 for (j = (target * 2)+3; j < (i - 2); j += 2)
1218 graph->mapping[j] = target;
1220 } else if (graph->mapping[i - 1] == target) {
1222 * There is a branch line to our left
1223 * already, and it is our target. We
1224 * combine with this line, since we share
1225 * the same parent commit.
1227 * We don't have to add anything to the
1228 * output or mapping, since the
1229 * existing branch line has already taken
1230 * care of it.
1232 } else {
1234 * There is a branch line to our left,
1235 * but it isn't our target. We need to
1236 * cross over it.
1238 * The space just to the left of this
1239 * branch should always be empty.
1241 assert(graph->mapping[i - 1] > target);
1242 assert(graph->mapping[i - 2] < 0);
1243 graph->mapping[i - 2] = target;
1245 * Mark this branch as the horizontal edge to
1246 * prevent any other edges from moving
1247 * horizontally.
1249 if (horizontal_edge == -1) {
1250 int j;
1251 horizontal_edge_target = target;
1252 horizontal_edge = i - 1;
1254 for (j = (target * 2) + 3; j < (i - 2); j += 2)
1255 graph->mapping[j] = target;
1261 * Copy the current mapping array into old_mapping
1263 COPY_ARRAY(graph->old_mapping, graph->mapping, graph->mapping_size);
1266 * The new mapping may be 1 smaller than the old mapping
1268 if (graph->mapping[graph->mapping_size - 1] < 0)
1269 graph->mapping_size--;
1272 * Output out a line based on the new mapping info
1274 for (i = 0; i < graph->mapping_size; i++) {
1275 int target = graph->mapping[i];
1276 if (target < 0)
1277 graph_line_addch(line, ' ');
1278 else if (target * 2 == i)
1279 graph_line_write_column(line, &graph->new_columns[target], '|');
1280 else if (target == horizontal_edge_target &&
1281 i != horizontal_edge - 1) {
1283 * Set the mappings for all but the
1284 * first segment to -1 so that they
1285 * won't continue into the next line.
1287 if (i != (target * 2)+3)
1288 graph->mapping[i] = -1;
1289 used_horizontal = 1;
1290 graph_line_write_column(line, &graph->new_columns[target], '_');
1291 } else {
1292 if (used_horizontal && i < horizontal_edge)
1293 graph->mapping[i] = -1;
1294 graph_line_write_column(line, &graph->new_columns[target], '/');
1300 * If graph->mapping indicates that all of the branch lines
1301 * are already in the correct positions, we are done.
1302 * Otherwise, we need to collapse some branch lines together.
1304 if (graph_is_mapping_correct(graph))
1305 graph_update_state(graph, GRAPH_PADDING);
1308 int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1310 int shown_commit_line = 0;
1311 struct graph_line line = { .buf = sb, .width = 0 };
1314 * We could conceivable be called with a NULL commit
1315 * if our caller has a bug, and invokes graph_next_line()
1316 * immediately after graph_init(), without first calling
1317 * graph_update(). Return without outputting anything in this
1318 * case.
1320 if (!graph->commit)
1321 return -1;
1323 switch (graph->state) {
1324 case GRAPH_PADDING:
1325 graph_output_padding_line(graph, &line);
1326 break;
1327 case GRAPH_SKIP:
1328 graph_output_skip_line(graph, &line);
1329 break;
1330 case GRAPH_PRE_COMMIT:
1331 graph_output_pre_commit_line(graph, &line);
1332 break;
1333 case GRAPH_COMMIT:
1334 graph_output_commit_line(graph, &line);
1335 shown_commit_line = 1;
1336 break;
1337 case GRAPH_POST_MERGE:
1338 graph_output_post_merge_line(graph, &line);
1339 break;
1340 case GRAPH_COLLAPSING:
1341 graph_output_collapsing_line(graph, &line);
1342 break;
1345 graph_pad_horizontally(graph, &line);
1346 return shown_commit_line;
1349 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1351 int i;
1352 struct graph_line line = { .buf = sb, .width = 0 };
1354 if (graph->state != GRAPH_COMMIT) {
1355 graph_next_line(graph, sb);
1356 return;
1360 * Output the row containing this commit
1361 * Iterate up to and including graph->num_columns,
1362 * since the current commit may not be in any of the existing
1363 * columns. (This happens when the current commit doesn't have any
1364 * children that we have already processed.)
1366 for (i = 0; i < graph->num_columns; i++) {
1367 struct column *col = &graph->columns[i];
1369 graph_line_write_column(&line, col, '|');
1371 if (col->commit == graph->commit && graph->num_parents > 2) {
1372 int len = (graph->num_parents - 2) * 2;
1373 graph_line_addchars(&line, ' ', len);
1374 } else {
1375 graph_line_addch(&line, ' ');
1379 graph_pad_horizontally(graph, &line);
1382 * Update graph->prev_state since we have output a padding line
1384 graph->prev_state = GRAPH_PADDING;
1387 int graph_is_commit_finished(struct git_graph const *graph)
1389 return (graph->state == GRAPH_PADDING);
1392 void graph_show_commit(struct git_graph *graph)
1394 struct strbuf msgbuf = STRBUF_INIT;
1395 int shown_commit_line = 0;
1397 graph_show_line_prefix(default_diffopt);
1399 if (!graph)
1400 return;
1403 * When showing a diff of a merge against each of its parents, we
1404 * are called once for each parent without graph_update having been
1405 * called. In this case, simply output a single padding line.
1407 if (graph_is_commit_finished(graph)) {
1408 graph_show_padding(graph);
1409 shown_commit_line = 1;
1412 while (!shown_commit_line && !graph_is_commit_finished(graph)) {
1413 shown_commit_line = graph_next_line(graph, &msgbuf);
1414 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1415 graph->revs->diffopt.file);
1416 if (!shown_commit_line) {
1417 putc('\n', graph->revs->diffopt.file);
1418 graph_show_line_prefix(&graph->revs->diffopt);
1420 strbuf_setlen(&msgbuf, 0);
1423 strbuf_release(&msgbuf);
1426 void graph_show_oneline(struct git_graph *graph)
1428 struct strbuf msgbuf = STRBUF_INIT;
1430 graph_show_line_prefix(default_diffopt);
1432 if (!graph)
1433 return;
1435 graph_next_line(graph, &msgbuf);
1436 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1437 strbuf_release(&msgbuf);
1440 void graph_show_padding(struct git_graph *graph)
1442 struct strbuf msgbuf = STRBUF_INIT;
1444 graph_show_line_prefix(default_diffopt);
1446 if (!graph)
1447 return;
1449 graph_padding_line(graph, &msgbuf);
1450 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1451 strbuf_release(&msgbuf);
1454 int graph_show_remainder(struct git_graph *graph)
1456 struct strbuf msgbuf = STRBUF_INIT;
1457 int shown = 0;
1459 graph_show_line_prefix(default_diffopt);
1461 if (!graph)
1462 return 0;
1464 if (graph_is_commit_finished(graph))
1465 return 0;
1467 for (;;) {
1468 graph_next_line(graph, &msgbuf);
1469 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1470 graph->revs->diffopt.file);
1471 strbuf_setlen(&msgbuf, 0);
1472 shown = 1;
1474 if (!graph_is_commit_finished(graph)) {
1475 putc('\n', graph->revs->diffopt.file);
1476 graph_show_line_prefix(&graph->revs->diffopt);
1477 } else {
1478 break;
1481 strbuf_release(&msgbuf);
1483 return shown;
1486 static void graph_show_strbuf(struct git_graph *graph,
1487 FILE *file,
1488 struct strbuf const *sb)
1490 char *p;
1493 * Print the strbuf line by line,
1494 * and display the graph info before each line but the first.
1496 p = sb->buf;
1497 while (p) {
1498 size_t len;
1499 char *next_p = strchr(p, '\n');
1500 if (next_p) {
1501 next_p++;
1502 len = next_p - p;
1503 } else {
1504 len = (sb->buf + sb->len) - p;
1506 fwrite(p, sizeof(char), len, file);
1507 if (next_p && *next_p != '\0')
1508 graph_show_oneline(graph);
1509 p = next_p;
1513 void graph_show_commit_msg(struct git_graph *graph,
1514 FILE *file,
1515 struct strbuf const *sb)
1517 int newline_terminated;
1520 * Show the commit message
1522 graph_show_strbuf(graph, file, sb);
1524 if (!graph)
1525 return;
1527 newline_terminated = (sb->len && sb->buf[sb->len - 1] == '\n');
1530 * If there is more output needed for this commit, show it now
1532 if (!graph_is_commit_finished(graph)) {
1534 * If sb doesn't have a terminating newline, print one now,
1535 * so we can start the remainder of the graph output on a
1536 * new line.
1538 if (!newline_terminated)
1539 putc('\n', file);
1541 graph_show_remainder(graph);
1544 * If sb ends with a newline, our output should too.
1546 if (newline_terminated)
1547 putc('\n', file);