7 #include "argv-array.h"
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.
18 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
21 * Print a strbuf. If the graph is non-NULL, all lines but the first will be
22 * prefixed with the graph output.
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.
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().
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.
38 static void graph_show_strbuf(struct git_graph *graph,
40 struct strbuf const *sb);
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.
51 * The parent commit of this column.
53 struct commit *commit;
55 * The color to (optionally) print this column in. This is an
56 * index into column_colors.
70 static void graph_show_line_prefix(const struct diff_options *diffopt)
72 if (!diffopt || !diffopt->line_prefix)
75 fwrite(diffopt->line_prefix,
77 diffopt->line_prefix_length,
81 static const char **column_colors;
82 static unsigned short column_colors_max;
84 static void parse_graph_colors_config(struct argv_array *colors, const char *string)
86 const char *end, *start;
89 end = string + strlen(string);
91 const char *comma = strchrnul(start, ',');
92 char color[COLOR_MAXLEN];
94 if (!color_parse_mem(start, comma - start, color))
95 argv_array_push(colors, color);
97 warning(_("ignore invalid color '%.*s' in log.graphColors"),
98 (int)(comma - start), start);
101 argv_array_push(colors, GIT_COLOR_RESET);
104 void graph_set_column_colors(const char **colors, unsigned short colors_max)
106 column_colors = colors;
107 column_colors_max = colors_max;
110 static const char *column_get_color_code(unsigned short color)
112 return column_colors[color];
120 static inline void graph_line_addch(struct graph_line *line, int c)
122 strbuf_addch(line->buf, c);
126 static inline void graph_line_addchars(struct graph_line *line, int c, size_t n)
128 strbuf_addchars(line->buf, c, n);
132 static inline void graph_line_addstr(struct graph_line *line, const char *s)
134 strbuf_addstr(line->buf, s);
135 line->width += strlen(s);
138 static inline void graph_line_addcolor(struct graph_line *line, unsigned short color)
140 strbuf_addstr(line->buf, column_get_color_code(color));
143 static void graph_line_write_column(struct graph_line *line, const struct column *c,
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);
155 * The commit currently being processed
157 struct commit *commit;
158 /* The rev-info used for the current traversal */
159 struct rev_info *revs;
161 * The number of interesting parents that this commit has.
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().
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.
175 * The next expansion row to print
176 * when state is GRAPH_PRE_COMMIT
180 * The current output state.
181 * This tells us what kind of line graph_next_line() should output.
183 enum graph_state state;
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.
189 enum graph_state prev_state;
191 * The index of the column that refers to this commit.
193 * If none of the incoming columns refer to this commit,
194 * this will be equal to num_columns.
198 * The commit_index for the previously displayed commit.
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
204 int prev_commit_index;
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.
212 * The number of columns (also called "branch lines" in some places)
216 * The number of columns in the new_columns array
220 * The number of entries in the mapping array
224 * The column state before we output the current commit.
226 struct column *columns;
228 * The new column state after we output the current commit.
229 * Only valid when state is GRAPH_COLLAPSING.
231 struct column *new_columns;
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.)
241 * The maximum capacity of this array is always
242 * sizeof(int) * 2 * column_capacity.
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.
253 * The current default column color being used. This is
254 * stored as an index into the array column_colors.
256 unsigned short default_column_color;
259 static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void *data)
261 struct git_graph *graph = data;
262 static struct strbuf msgbuf = STRBUF_INIT;
266 strbuf_reset(&msgbuf);
267 if (opt->line_prefix)
268 strbuf_add(&msgbuf, opt->line_prefix,
269 opt->line_prefix_length);
271 graph_padding_line(graph, &msgbuf);
275 static const struct diff_options *default_diffopt;
277 void graph_setup_line_prefix(struct diff_options *diffopt)
279 default_diffopt = diffopt;
281 /* setup an output prefix callback if necessary */
282 if (diffopt && !diffopt->output_prefix)
283 diffopt->output_prefix = diff_output_prefix_callback;
287 struct git_graph *graph_init(struct rev_info *opt)
289 struct git_graph *graph = xmalloc(sizeof(struct git_graph));
291 if (!column_colors) {
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);
298 static struct argv_array custom_colors = ARGV_ARRAY_INIT;
299 argv_array_clear(&custom_colors);
300 parse_graph_colors_config(&custom_colors, 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);
308 graph->commit = NULL;
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;
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.
324 graph->default_column_color = column_colors_max - 1;
327 * Allocate a reasonably large default number of columns
328 * We'll automatically grow columns later if we need more room.
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);
337 * The diff output prefix callback, with this we can make
338 * all the diff output to align with the graph lines.
340 opt->diffopt.output_prefix = diff_output_prefix_callback;
341 opt->diffopt.output_prefix_data = graph;
346 static void graph_update_state(struct git_graph *graph, enum graph_state s)
348 graph->prev_state = graph->state;
352 static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
354 if (graph->column_capacity >= num_columns)
358 graph->column_capacity *= 2;
359 } while (graph->column_capacity < num_columns);
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);
368 * Returns 1 if the commit will be printed in the graph output,
371 static int graph_is_interesting(struct git_graph *graph, struct commit *commit)
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.
378 if (graph->revs && graph->revs->boundary) {
379 if (commit->object.flags & CHILD_SHOWN)
384 * Otherwise, use get_commit_action() to see if this commit is
387 return get_commit_action(graph->revs, commit) == commit_show;
390 static struct commit_list *next_interesting_parent(struct git_graph *graph,
391 struct commit_list *orig)
393 struct commit_list *list;
396 * If revs->first_parent_only is set, only the first
397 * parent is interesting. None of the others are.
399 if (graph->revs->first_parent_only)
403 * Return the next interesting commit after orig
405 for (list = orig->next; list; list = list->next) {
406 if (graph_is_interesting(graph, list->item))
413 static struct commit_list *first_interesting_parent(struct git_graph *graph)
415 struct commit_list *parents = graph->commit->parents;
418 * If this commit has no parents, ignore it
424 * If the first parent is interesting, return it
426 if (graph_is_interesting(graph, parents->item))
430 * Otherwise, call next_interesting_parent() to get
431 * the next interesting parent
433 return next_interesting_parent(graph, parents);
436 static unsigned short graph_get_current_column_color(const struct git_graph *graph)
438 if (!want_color(graph->revs->diffopt.use_color))
439 return column_colors_max;
440 return graph->default_column_color;
444 * Update the graph's default column color.
446 static void graph_increment_column_color(struct git_graph *graph)
448 graph->default_column_color = (graph->default_column_color + 1) %
452 static unsigned short graph_find_commit_color(const struct git_graph *graph,
453 const struct commit *commit)
456 for (i = 0; i < graph->num_columns; i++) {
457 if (graph->columns[i].commit == commit)
458 return graph->columns[i].color;
460 return graph_get_current_column_color(graph);
463 static int graph_find_new_column_by_commit(struct git_graph *graph,
464 struct commit *commit)
467 for (i = 0; i < graph->num_new_columns; i++) {
468 if (graph->new_columns[i].commit == commit)
474 static void graph_insert_into_new_columns(struct git_graph *graph,
475 struct commit *commit)
477 int i = graph_find_new_column_by_commit(graph, commit);
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.
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);
489 graph->mapping[graph->width] = i;
493 static void graph_update_columns(struct git_graph *graph)
495 struct commit_list *parent;
497 int i, seen_this, is_commit_in_columns;
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.
504 * We'll re-use the old columns array as storage to compute the new
505 * columns list for the commit after this one.
507 SWAP(graph->columns, graph->new_columns);
508 graph->num_columns = graph->num_new_columns;
509 graph->num_new_columns = 0;
512 * Now update new_columns and mapping with the information for the
513 * commit after this one.
515 * First, make sure we have enough room. At most, there will
516 * be graph->num_columns + graph->num_parents columns for the next
519 max_new_columns = graph->num_columns + graph->num_parents;
520 graph_ensure_capacity(graph, max_new_columns);
523 * Clear out graph->mapping
525 graph->mapping_size = 2 * max_new_columns;
526 for (i = 0; i < graph->mapping_size; i++)
527 graph->mapping[i] = -1;
532 * Populate graph->new_columns and graph->mapping
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.
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) {
547 is_commit_in_columns = 0;
548 col_commit = graph->commit;
550 col_commit = graph->columns[i].commit;
553 if (col_commit == graph->commit) {
555 graph->commit_index = i;
556 for (parent = first_interesting_parent(graph);
558 parent = next_interesting_parent(graph, parent)) {
560 * If this is a merge, or the start of a new
561 * childless column, increment the current
564 if (graph->num_parents > 1 ||
565 !is_commit_in_columns) {
566 graph_increment_column_color(graph);
568 graph_insert_into_new_columns(graph, parent->item);
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
576 if (graph->num_parents == 0)
579 graph_insert_into_new_columns(graph, col_commit);
584 * Shrink mapping_size to be the minimum necessary
586 while (graph->mapping_size > 1 &&
587 graph->mapping[graph->mapping_size - 1] < 0)
588 graph->mapping_size--;
591 void graph_update(struct git_graph *graph, struct commit *commit)
593 struct commit_list *parent;
598 graph->commit = commit;
601 * Count how many interesting parents this commit has
603 graph->num_parents = 0;
604 for (parent = first_interesting_parent(graph);
606 parent = next_interesting_parent(graph, parent))
608 graph->num_parents++;
612 * Store the old commit_index in prev_commit_index.
613 * graph_update_columns() will update graph->commit_index for this
616 graph->prev_commit_index = graph->commit_index;
619 * Call graph_update_columns() to update
620 * columns, new_columns, and mapping.
622 graph_update_columns(graph);
624 graph->expansion_row = 0;
627 * Update graph->state.
628 * Note that we don't call graph_update_state() here, since
629 * we don't want to update graph->prev_state. No line for
630 * graph->state was ever printed.
632 * If the previous commit didn't get to the GRAPH_PADDING state,
633 * it never finished its output. Goto GRAPH_SKIP, to print out
634 * a line to indicate that portion of the graph is missing.
636 * If there are 3 or more parents, we may need to print extra rows
637 * before the commit, to expand the branch lines around it and make
638 * room for it. We need to do this only if there is a branch row
639 * (or more) to the right of this commit.
641 * If there are less than 3 parents, we can immediately print the
644 if (graph->state != GRAPH_PADDING)
645 graph->state = GRAPH_SKIP;
646 else if (graph->num_parents >= 3 &&
647 graph->commit_index < (graph->num_columns - 1))
648 graph->state = GRAPH_PRE_COMMIT;
650 graph->state = GRAPH_COMMIT;
653 static int graph_is_mapping_correct(struct git_graph *graph)
658 * The mapping is up to date if each entry is at its target,
659 * or is 1 greater than its target.
660 * (If it is 1 greater than the target, '/' will be printed, so it
661 * will look correct on the next row.)
663 for (i = 0; i < graph->mapping_size; i++) {
664 int target = graph->mapping[i];
667 if (target == (i / 2))
675 static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line)
678 * Add additional spaces to the end of the strbuf, so that all
679 * lines for a particular commit have the same width.
681 * This way, fields printed to the right of the graph will remain
682 * aligned for the entire commit.
684 if (line->width < graph->width)
685 graph_line_addchars(line, ' ', graph->width - line->width);
688 static void graph_output_padding_line(struct git_graph *graph,
689 struct graph_line *line)
694 * Output a padding row, that leaves all branch lines unchanged
696 for (i = 0; i < graph->num_new_columns; i++) {
697 graph_line_write_column(line, &graph->new_columns[i], '|');
698 graph_line_addch(line, ' ');
703 int graph_width(struct git_graph *graph)
709 static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line)
712 * Output an ellipsis to indicate that a portion
713 * of the graph is missing.
715 graph_line_addstr(line, "...");
717 if (graph->num_parents >= 3 &&
718 graph->commit_index < (graph->num_columns - 1))
719 graph_update_state(graph, GRAPH_PRE_COMMIT);
721 graph_update_state(graph, GRAPH_COMMIT);
724 static void graph_output_pre_commit_line(struct git_graph *graph,
725 struct graph_line *line)
727 int num_expansion_rows;
731 * This function formats a row that increases the space around a commit
732 * with multiple parents, to make room for it. It should only be
733 * called when there are 3 or more parents.
735 * We need 2 extra rows for every parent over 2.
737 assert(graph->num_parents >= 3);
738 num_expansion_rows = (graph->num_parents - 2) * 2;
741 * graph->expansion_row tracks the current expansion row we are on.
742 * It should be in the range [0, num_expansion_rows - 1]
744 assert(0 <= graph->expansion_row &&
745 graph->expansion_row < num_expansion_rows);
751 for (i = 0; i < graph->num_columns; i++) {
752 struct column *col = &graph->columns[i];
753 if (col->commit == graph->commit) {
755 graph_line_write_column(line, col, '|');
756 graph_line_addchars(line, ' ', graph->expansion_row);
757 } else if (seen_this && (graph->expansion_row == 0)) {
759 * This is the first line of the pre-commit output.
760 * If the previous commit was a merge commit and
761 * ended in the GRAPH_POST_MERGE state, all branch
762 * lines after graph->prev_commit_index were
763 * printed as "\" on the previous line. Continue
764 * to print them as "\" on this line. Otherwise,
765 * print the branch lines as "|".
767 if (graph->prev_state == GRAPH_POST_MERGE &&
768 graph->prev_commit_index < i)
769 graph_line_write_column(line, col, '\\');
771 graph_line_write_column(line, col, '|');
772 } else if (seen_this && (graph->expansion_row > 0)) {
773 graph_line_write_column(line, col, '\\');
775 graph_line_write_column(line, col, '|');
777 graph_line_addch(line, ' ');
781 * Increment graph->expansion_row,
782 * and move to state GRAPH_COMMIT if necessary
784 graph->expansion_row++;
785 if (graph->expansion_row >= num_expansion_rows)
786 graph_update_state(graph, GRAPH_COMMIT);
789 static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line)
792 * For boundary commits, print 'o'
793 * (We should only see boundary commits when revs->boundary is set.)
795 if (graph->commit->object.flags & BOUNDARY) {
796 assert(graph->revs->boundary);
797 graph_line_addch(line, 'o');
802 * get_revision_mark() handles all other cases without assert()
804 graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
808 * Draw the horizontal dashes of an octopus merge.
810 static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line)
813 * Here dashless_parents represents the number of parents which don't
814 * need to have dashes (the edges labeled "0" and "1"). And
815 * dashful_parents are the remaining ones.
823 const int dashless_parents = 2;
824 int dashful_parents = graph->num_parents - dashless_parents;
827 * Usually, we add one new column for each parent (like the diagram
828 * above) but sometimes the first parent goes into an existing column,
836 * In which case the number of parents will be one greater than the
837 * number of added columns.
839 int added_cols = (graph->num_new_columns - graph->num_columns);
840 int parent_in_old_cols = graph->num_parents - added_cols;
843 * In both cases, commit_index corresponds to the edge labeled "0".
845 int first_col = graph->commit_index + dashless_parents
846 - parent_in_old_cols;
849 for (i = 0; i < dashful_parents; i++) {
850 graph_line_write_column(line, &graph->new_columns[i+first_col], '-');
851 graph_line_write_column(line, &graph->new_columns[i+first_col],
852 i == dashful_parents-1 ? '.' : '-');
856 static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line)
862 * Output the row containing this commit
863 * Iterate up to and including graph->num_columns,
864 * since the current commit may not be in any of the existing
865 * columns. (This happens when the current commit doesn't have any
866 * children that we have already processed.)
869 for (i = 0; i <= graph->num_columns; i++) {
870 struct column *col = &graph->columns[i];
871 struct commit *col_commit;
872 if (i == graph->num_columns) {
875 col_commit = graph->commit;
877 col_commit = graph->columns[i].commit;
880 if (col_commit == graph->commit) {
882 graph_output_commit_char(graph, line);
884 if (graph->num_parents > 2)
885 graph_draw_octopus_merge(graph, line);
886 } else if (seen_this && (graph->num_parents > 2)) {
887 graph_line_write_column(line, col, '\\');
888 } else if (seen_this && (graph->num_parents == 2)) {
890 * This is a 2-way merge commit.
891 * There is no GRAPH_PRE_COMMIT stage for 2-way
892 * merges, so this is the first line of output
893 * for this commit. Check to see what the previous
894 * line of output was.
896 * If it was GRAPH_POST_MERGE, the branch line
897 * coming into this commit may have been '\',
898 * and not '|' or '/'. If so, output the branch
899 * line as '\' on this line, instead of '|'. This
900 * makes the output look nicer.
902 if (graph->prev_state == GRAPH_POST_MERGE &&
903 graph->prev_commit_index < i)
904 graph_line_write_column(line, col, '\\');
906 graph_line_write_column(line, col, '|');
908 graph_line_write_column(line, col, '|');
910 graph_line_addch(line, ' ');
914 * Update graph->state
916 if (graph->num_parents > 1)
917 graph_update_state(graph, GRAPH_POST_MERGE);
918 else if (graph_is_mapping_correct(graph))
919 graph_update_state(graph, GRAPH_PADDING);
921 graph_update_state(graph, GRAPH_COLLAPSING);
924 static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
930 * Output the post-merge row
932 for (i = 0; i <= graph->num_columns; i++) {
933 struct column *col = &graph->columns[i];
934 struct commit *col_commit;
935 if (i == graph->num_columns) {
938 col_commit = graph->commit;
940 col_commit = col->commit;
943 if (col_commit == graph->commit) {
945 * Since the current commit is a merge find
946 * the columns for the parent commits in
947 * new_columns and use those to format the
950 struct commit_list *parents = NULL;
953 parents = first_interesting_parent(graph);
955 par_column = graph_find_new_column_by_commit(graph, parents->item);
956 assert(par_column >= 0);
958 graph_line_write_column(line, &graph->new_columns[par_column], '|');
959 for (j = 0; j < graph->num_parents - 1; j++) {
960 parents = next_interesting_parent(graph, parents);
962 par_column = graph_find_new_column_by_commit(graph, parents->item);
963 assert(par_column >= 0);
964 graph_line_write_column(line, &graph->new_columns[par_column], '\\');
965 graph_line_addch(line, ' ');
967 } else if (seen_this) {
968 graph_line_write_column(line, col, '\\');
969 graph_line_addch(line, ' ');
971 graph_line_write_column(line, col, '|');
972 graph_line_addch(line, ' ');
977 * Update graph->state
979 if (graph_is_mapping_correct(graph))
980 graph_update_state(graph, GRAPH_PADDING);
982 graph_update_state(graph, GRAPH_COLLAPSING);
985 static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line)
988 short used_horizontal = 0;
989 int horizontal_edge = -1;
990 int horizontal_edge_target = -1;
993 * Clear out the new_mapping array
995 for (i = 0; i < graph->mapping_size; i++)
996 graph->new_mapping[i] = -1;
998 for (i = 0; i < graph->mapping_size; i++) {
999 int target = graph->mapping[i];
1004 * Since update_columns() always inserts the leftmost
1005 * column first, each branch's target location should
1006 * always be either its current location or to the left of
1007 * its current location.
1009 * We never have to move branches to the right. This makes
1010 * the graph much more legible, since whenever branches
1011 * cross, only one is moving directions.
1013 assert(target * 2 <= i);
1015 if (target * 2 == i) {
1017 * This column is already in the
1020 assert(graph->new_mapping[i] == -1);
1021 graph->new_mapping[i] = target;
1022 } else if (graph->new_mapping[i - 1] < 0) {
1024 * Nothing is to the left.
1025 * Move to the left by one
1027 graph->new_mapping[i - 1] = target;
1029 * If there isn't already an edge moving horizontally
1032 if (horizontal_edge == -1) {
1034 horizontal_edge = i;
1035 horizontal_edge_target = target;
1037 * The variable target is the index of the graph
1038 * column, and therefore target*2+3 is the
1039 * actual screen column of the first horizontal
1042 for (j = (target * 2)+3; j < (i - 2); j += 2)
1043 graph->new_mapping[j] = target;
1045 } else if (graph->new_mapping[i - 1] == target) {
1047 * There is a branch line to our left
1048 * already, and it is our target. We
1049 * combine with this line, since we share
1050 * the same parent commit.
1052 * We don't have to add anything to the
1053 * output or new_mapping, since the
1054 * existing branch line has already taken
1059 * There is a branch line to our left,
1060 * but it isn't our target. We need to
1063 * The space just to the left of this
1064 * branch should always be empty.
1066 * The branch to the left of that space
1067 * should be our eventual target.
1069 assert(graph->new_mapping[i - 1] > target);
1070 assert(graph->new_mapping[i - 2] < 0);
1071 assert(graph->new_mapping[i - 3] == target);
1072 graph->new_mapping[i - 2] = target;
1074 * Mark this branch as the horizontal edge to
1075 * prevent any other edges from moving
1078 if (horizontal_edge == -1)
1079 horizontal_edge = i;
1084 * The new mapping may be 1 smaller than the old mapping
1086 if (graph->new_mapping[graph->mapping_size - 1] < 0)
1087 graph->mapping_size--;
1090 * Output out a line based on the new mapping info
1092 for (i = 0; i < graph->mapping_size; i++) {
1093 int target = graph->new_mapping[i];
1095 graph_line_addch(line, ' ');
1096 else if (target * 2 == i)
1097 graph_line_write_column(line, &graph->new_columns[target], '|');
1098 else if (target == horizontal_edge_target &&
1099 i != horizontal_edge - 1) {
1101 * Set the mappings for all but the
1102 * first segment to -1 so that they
1103 * won't continue into the next line.
1105 if (i != (target * 2)+3)
1106 graph->new_mapping[i] = -1;
1107 used_horizontal = 1;
1108 graph_line_write_column(line, &graph->new_columns[target], '_');
1110 if (used_horizontal && i < horizontal_edge)
1111 graph->new_mapping[i] = -1;
1112 graph_line_write_column(line, &graph->new_columns[target], '/');
1118 * Swap mapping and new_mapping
1120 SWAP(graph->mapping, graph->new_mapping);
1123 * If graph->mapping indicates that all of the branch lines
1124 * are already in the correct positions, we are done.
1125 * Otherwise, we need to collapse some branch lines together.
1127 if (graph_is_mapping_correct(graph))
1128 graph_update_state(graph, GRAPH_PADDING);
1131 int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1133 int shown_commit_line = 0;
1134 struct graph_line line = { .buf = sb, .width = 0 };
1137 * We could conceivable be called with a NULL commit
1138 * if our caller has a bug, and invokes graph_next_line()
1139 * immediately after graph_init(), without first calling
1140 * graph_update(). Return without outputting anything in this
1146 switch (graph->state) {
1148 graph_output_padding_line(graph, &line);
1151 graph_output_skip_line(graph, &line);
1153 case GRAPH_PRE_COMMIT:
1154 graph_output_pre_commit_line(graph, &line);
1157 graph_output_commit_line(graph, &line);
1158 shown_commit_line = 1;
1160 case GRAPH_POST_MERGE:
1161 graph_output_post_merge_line(graph, &line);
1163 case GRAPH_COLLAPSING:
1164 graph_output_collapsing_line(graph, &line);
1168 graph_pad_horizontally(graph, &line);
1169 return shown_commit_line;
1172 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1175 struct graph_line line = { .buf = sb, .width = 0 };
1177 if (graph->state != GRAPH_COMMIT) {
1178 graph_next_line(graph, sb);
1183 * Output the row containing this commit
1184 * Iterate up to and including graph->num_columns,
1185 * since the current commit may not be in any of the existing
1186 * columns. (This happens when the current commit doesn't have any
1187 * children that we have already processed.)
1189 for (i = 0; i < graph->num_columns; i++) {
1190 struct column *col = &graph->columns[i];
1192 graph_line_write_column(&line, col, '|');
1194 if (col->commit == graph->commit && graph->num_parents > 2) {
1195 int len = (graph->num_parents - 2) * 2;
1196 graph_line_addchars(&line, ' ', len);
1198 graph_line_addch(&line, ' ');
1202 graph_pad_horizontally(graph, &line);
1205 * Update graph->prev_state since we have output a padding line
1207 graph->prev_state = GRAPH_PADDING;
1210 int graph_is_commit_finished(struct git_graph const *graph)
1212 return (graph->state == GRAPH_PADDING);
1215 void graph_show_commit(struct git_graph *graph)
1217 struct strbuf msgbuf = STRBUF_INIT;
1218 int shown_commit_line = 0;
1220 graph_show_line_prefix(default_diffopt);
1226 * When showing a diff of a merge against each of its parents, we
1227 * are called once for each parent without graph_update having been
1228 * called. In this case, simply output a single padding line.
1230 if (graph_is_commit_finished(graph)) {
1231 graph_show_padding(graph);
1232 shown_commit_line = 1;
1235 while (!shown_commit_line && !graph_is_commit_finished(graph)) {
1236 shown_commit_line = graph_next_line(graph, &msgbuf);
1237 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1238 graph->revs->diffopt.file);
1239 if (!shown_commit_line) {
1240 putc('\n', graph->revs->diffopt.file);
1241 graph_show_line_prefix(&graph->revs->diffopt);
1243 strbuf_setlen(&msgbuf, 0);
1246 strbuf_release(&msgbuf);
1249 void graph_show_oneline(struct git_graph *graph)
1251 struct strbuf msgbuf = STRBUF_INIT;
1253 graph_show_line_prefix(default_diffopt);
1258 graph_next_line(graph, &msgbuf);
1259 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1260 strbuf_release(&msgbuf);
1263 void graph_show_padding(struct git_graph *graph)
1265 struct strbuf msgbuf = STRBUF_INIT;
1267 graph_show_line_prefix(default_diffopt);
1272 graph_padding_line(graph, &msgbuf);
1273 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, graph->revs->diffopt.file);
1274 strbuf_release(&msgbuf);
1277 int graph_show_remainder(struct git_graph *graph)
1279 struct strbuf msgbuf = STRBUF_INIT;
1282 graph_show_line_prefix(default_diffopt);
1287 if (graph_is_commit_finished(graph))
1291 graph_next_line(graph, &msgbuf);
1292 fwrite(msgbuf.buf, sizeof(char), msgbuf.len,
1293 graph->revs->diffopt.file);
1294 strbuf_setlen(&msgbuf, 0);
1297 if (!graph_is_commit_finished(graph)) {
1298 putc('\n', graph->revs->diffopt.file);
1299 graph_show_line_prefix(&graph->revs->diffopt);
1304 strbuf_release(&msgbuf);
1309 static void graph_show_strbuf(struct git_graph *graph,
1311 struct strbuf const *sb)
1316 * Print the strbuf line by line,
1317 * and display the graph info before each line but the first.
1322 char *next_p = strchr(p, '\n');
1327 len = (sb->buf + sb->len) - p;
1329 fwrite(p, sizeof(char), len, file);
1330 if (next_p && *next_p != '\0')
1331 graph_show_oneline(graph);
1336 void graph_show_commit_msg(struct git_graph *graph,
1338 struct strbuf const *sb)
1340 int newline_terminated;
1343 * Show the commit message
1345 graph_show_strbuf(graph, file, sb);
1350 newline_terminated = (sb->len && sb->buf[sb->len - 1] == '\n');
1353 * If there is more output needed for this commit, show it now
1355 if (!graph_is_commit_finished(graph)) {
1357 * If sb doesn't have a terminating newline, print one now,
1358 * so we can start the remainder of the graph output on a
1361 if (!newline_terminated)
1364 graph_show_remainder(graph);
1367 * If sb ends with a newline, our output should too.
1369 if (newline_terminated)