11 * Output a padding line in the graph.
12 * This is similar to graph_next_line(). However, it is guaranteed to
13 * never print the current commit line. Instead, if the commit line is
14 * next, it will simply output a line of vertical padding, extending the
15 * branch lines downwards, but leaving them otherwise unchanged.
17 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
);
20 * Print a strbuf to stdout. If the graph is non-NULL, all lines but the
21 * first will be prefixed with the graph output.
23 * If the strbuf ends with a newline, the output will end after this
24 * newline. A new graph line will not be printed after the final newline.
25 * If the strbuf is empty, no output will be printed.
27 * Since the first line will not include the graph output, the caller is
28 * responsible for printing this line's graph (perhaps via
29 * graph_show_commit() or graph_show_oneline()) before calling
30 * graph_show_strbuf().
32 static void graph_show_strbuf(struct git_graph
*graph
, struct strbuf
const *sb
);
36 * - Limit the number of columns, similar to the way gitk does.
37 * If we reach more than a specified number of columns, omit
38 * sections of some columns.
43 * The parent commit of this column.
45 struct commit
*commit
;
47 * The color to (optionally) print this column in. This is an
48 * index into column_colors.
62 static const char **column_colors
;
63 static unsigned short column_colors_max
;
65 void graph_set_column_colors(const char **colors
, unsigned short colors_max
)
67 column_colors
= colors
;
68 column_colors_max
= colors_max
;
71 static const char *column_get_color_code(unsigned short color
)
73 return column_colors
[color
];
76 static void strbuf_write_column(struct strbuf
*sb
, const struct column
*c
,
79 if (c
->color
< column_colors_max
)
80 strbuf_addstr(sb
, column_get_color_code(c
->color
));
81 strbuf_addch(sb
, col_char
);
82 if (c
->color
< column_colors_max
)
83 strbuf_addstr(sb
, column_get_color_code(column_colors_max
));
88 * The commit currently being processed
90 struct commit
*commit
;
91 /* The rev-info used for the current traversal */
92 struct rev_info
*revs
;
94 * The number of interesting parents that this commit has.
96 * Note that this is not the same as the actual number of parents.
97 * This count excludes parents that won't be printed in the graph
98 * output, as determined by graph_is_interesting().
102 * The width of the graph output for this commit.
103 * All rows for this commit are padded to this width, so that
104 * messages printed after the graph output are aligned.
108 * The next expansion row to print
109 * when state is GRAPH_PRE_COMMIT
113 * The current output state.
114 * This tells us what kind of line graph_next_line() should output.
116 enum graph_state state
;
118 * The output state for the previous line of output.
119 * This is primarily used to determine how the first merge line
120 * should appear, based on the last line of the previous commit.
122 enum graph_state prev_state
;
124 * The index of the column that refers to this commit.
126 * If none of the incoming columns refer to this commit,
127 * this will be equal to num_columns.
131 * The commit_index for the previously displayed commit.
133 * This is used to determine how the first line of a merge
134 * graph output should appear, based on the last line of the
137 int prev_commit_index
;
139 * The maximum number of columns that can be stored in the columns
140 * and new_columns arrays. This is also half the number of entries
141 * that can be stored in the mapping and new_mapping arrays.
145 * The number of columns (also called "branch lines" in some places)
149 * The number of columns in the new_columns array
153 * The number of entries in the mapping array
157 * The column state before we output the current commit.
159 struct column
*columns
;
161 * The new column state after we output the current commit.
162 * Only valid when state is GRAPH_COLLAPSING.
164 struct column
*new_columns
;
166 * An array that tracks the current state of each
167 * character in the output line during state GRAPH_COLLAPSING.
168 * Each entry is -1 if this character is empty, or a non-negative
169 * integer if the character contains a branch line. The value of
170 * the integer indicates the target position for this branch line.
171 * (I.e., this array maps the current column positions to their
172 * desired positions.)
174 * The maximum capacity of this array is always
175 * sizeof(int) * 2 * column_capacity.
179 * A temporary array for computing the next mapping state
180 * while we are outputting a mapping line. This is stored as part
181 * of the git_graph simply so we don't have to allocate a new
182 * temporary array each time we have to output a collapsing line.
186 * The current default column color being used. This is
187 * stored as an index into the array column_colors.
189 unsigned short default_column_color
;
192 static struct strbuf
*diff_output_prefix_callback(struct diff_options
*opt
, void *data
)
194 struct git_graph
*graph
= data
;
195 static struct strbuf msgbuf
= STRBUF_INIT
;
200 opt
->output_prefix_length
= graph
->width
;
201 strbuf_reset(&msgbuf
);
202 graph_padding_line(graph
, &msgbuf
);
206 struct git_graph
*graph_init(struct rev_info
*opt
)
208 struct git_graph
*graph
= xmalloc(sizeof(struct git_graph
));
211 graph_set_column_colors(column_colors_ansi
,
212 column_colors_ansi_max
);
214 graph
->commit
= NULL
;
216 graph
->num_parents
= 0;
217 graph
->expansion_row
= 0;
218 graph
->state
= GRAPH_PADDING
;
219 graph
->prev_state
= GRAPH_PADDING
;
220 graph
->commit_index
= 0;
221 graph
->prev_commit_index
= 0;
222 graph
->num_columns
= 0;
223 graph
->num_new_columns
= 0;
224 graph
->mapping_size
= 0;
226 * Start the column color at the maximum value, since we'll
227 * always increment it for the first commit we output.
228 * This way we start at 0 for the first commit.
230 graph
->default_column_color
= column_colors_max
- 1;
233 * Allocate a reasonably large default number of columns
234 * We'll automatically grow columns later if we need more room.
236 graph
->column_capacity
= 30;
237 ALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
238 ALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
239 ALLOC_ARRAY(graph
->mapping
, 2 * graph
->column_capacity
);
240 ALLOC_ARRAY(graph
->new_mapping
, 2 * graph
->column_capacity
);
243 * The diff output prefix callback, with this we can make
244 * all the diff output to align with the graph lines.
246 opt
->diffopt
.output_prefix
= diff_output_prefix_callback
;
247 opt
->diffopt
.output_prefix_data
= graph
;
248 opt
->diffopt
.output_prefix_length
= 0;
253 static void graph_update_state(struct git_graph
*graph
, enum graph_state s
)
255 graph
->prev_state
= graph
->state
;
259 static void graph_ensure_capacity(struct git_graph
*graph
, int num_columns
)
261 if (graph
->column_capacity
>= num_columns
)
265 graph
->column_capacity
*= 2;
266 } while (graph
->column_capacity
< num_columns
);
268 REALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
269 REALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
270 REALLOC_ARRAY(graph
->mapping
, graph
->column_capacity
* 2);
271 REALLOC_ARRAY(graph
->new_mapping
, graph
->column_capacity
* 2);
275 * Returns 1 if the commit will be printed in the graph output,
278 static int graph_is_interesting(struct git_graph
*graph
, struct commit
*commit
)
281 * If revs->boundary is set, commits whose children have
282 * been shown are always interesting, even if they have the
283 * UNINTERESTING or TREESAME flags set.
285 if (graph
->revs
&& graph
->revs
->boundary
) {
286 if (commit
->object
.flags
& CHILD_SHOWN
)
291 * Otherwise, use get_commit_action() to see if this commit is
294 return get_commit_action(graph
->revs
, commit
) == commit_show
;
297 static struct commit_list
*next_interesting_parent(struct git_graph
*graph
,
298 struct commit_list
*orig
)
300 struct commit_list
*list
;
303 * If revs->first_parent_only is set, only the first
304 * parent is interesting. None of the others are.
306 if (graph
->revs
->first_parent_only
)
310 * Return the next interesting commit after orig
312 for (list
= orig
->next
; list
; list
= list
->next
) {
313 if (graph_is_interesting(graph
, list
->item
))
320 static struct commit_list
*first_interesting_parent(struct git_graph
*graph
)
322 struct commit_list
*parents
= graph
->commit
->parents
;
325 * If this commit has no parents, ignore it
331 * If the first parent is interesting, return it
333 if (graph_is_interesting(graph
, parents
->item
))
337 * Otherwise, call next_interesting_parent() to get
338 * the next interesting parent
340 return next_interesting_parent(graph
, parents
);
343 static unsigned short graph_get_current_column_color(const struct git_graph
*graph
)
345 if (!want_color(graph
->revs
->diffopt
.use_color
))
346 return column_colors_max
;
347 return graph
->default_column_color
;
351 * Update the graph's default column color.
353 static void graph_increment_column_color(struct git_graph
*graph
)
355 graph
->default_column_color
= (graph
->default_column_color
+ 1) %
359 static unsigned short graph_find_commit_color(const struct git_graph
*graph
,
360 const struct commit
*commit
)
363 for (i
= 0; i
< graph
->num_columns
; i
++) {
364 if (graph
->columns
[i
].commit
== commit
)
365 return graph
->columns
[i
].color
;
367 return graph_get_current_column_color(graph
);
370 static void graph_insert_into_new_columns(struct git_graph
*graph
,
371 struct commit
*commit
,
377 * If the commit is already in the new_columns list, we don't need to
378 * add it. Just update the mapping correctly.
380 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
381 if (graph
->new_columns
[i
].commit
== commit
) {
382 graph
->mapping
[*mapping_index
] = i
;
389 * This commit isn't already in new_columns. Add it.
391 graph
->new_columns
[graph
->num_new_columns
].commit
= commit
;
392 graph
->new_columns
[graph
->num_new_columns
].color
= graph_find_commit_color(graph
, commit
);
393 graph
->mapping
[*mapping_index
] = graph
->num_new_columns
;
395 graph
->num_new_columns
++;
398 static void graph_update_width(struct git_graph
*graph
,
399 int is_commit_in_existing_columns
)
402 * Compute the width needed to display the graph for this commit.
403 * This is the maximum width needed for any row. All other rows
404 * will be padded to this width.
406 * Compute the number of columns in the widest row:
407 * Count each existing column (graph->num_columns), and each new
408 * column added by this commit.
410 int max_cols
= graph
->num_columns
+ graph
->num_parents
;
413 * Even if the current commit has no parents to be printed, it
414 * still takes up a column for itself.
416 if (graph
->num_parents
< 1)
420 * We added a column for the current commit as part of
421 * graph->num_parents. If the current commit was already in
422 * graph->columns, then we have double counted it.
424 if (is_commit_in_existing_columns
)
428 * Each column takes up 2 spaces
430 graph
->width
= max_cols
* 2;
433 static void graph_update_columns(struct git_graph
*graph
)
435 struct commit_list
*parent
;
436 struct column
*tmp_columns
;
439 int i
, seen_this
, is_commit_in_columns
;
442 * Swap graph->columns with graph->new_columns
443 * graph->columns contains the state for the previous commit,
444 * and new_columns now contains the state for our commit.
446 * We'll re-use the old columns array as storage to compute the new
447 * columns list for the commit after this one.
449 tmp_columns
= graph
->columns
;
450 graph
->columns
= graph
->new_columns
;
451 graph
->num_columns
= graph
->num_new_columns
;
453 graph
->new_columns
= tmp_columns
;
454 graph
->num_new_columns
= 0;
457 * Now update new_columns and mapping with the information for the
458 * commit after this one.
460 * First, make sure we have enough room. At most, there will
461 * be graph->num_columns + graph->num_parents columns for the next
464 max_new_columns
= graph
->num_columns
+ graph
->num_parents
;
465 graph_ensure_capacity(graph
, max_new_columns
);
468 * Clear out graph->mapping
470 graph
->mapping_size
= 2 * max_new_columns
;
471 for (i
= 0; i
< graph
->mapping_size
; i
++)
472 graph
->mapping
[i
] = -1;
475 * Populate graph->new_columns and graph->mapping
477 * Some of the parents of this commit may already be in
478 * graph->columns. If so, graph->new_columns should only contain a
479 * single entry for each such commit. graph->mapping should
480 * contain information about where each current branch line is
481 * supposed to end up after the collapsing is performed.
485 is_commit_in_columns
= 1;
486 for (i
= 0; i
<= graph
->num_columns
; i
++) {
487 struct commit
*col_commit
;
488 if (i
== graph
->num_columns
) {
491 is_commit_in_columns
= 0;
492 col_commit
= graph
->commit
;
494 col_commit
= graph
->columns
[i
].commit
;
497 if (col_commit
== graph
->commit
) {
498 int old_mapping_idx
= mapping_idx
;
500 graph
->commit_index
= i
;
501 for (parent
= first_interesting_parent(graph
);
503 parent
= next_interesting_parent(graph
, parent
)) {
505 * If this is a merge, or the start of a new
506 * childless column, increment the current
509 if (graph
->num_parents
> 1 ||
510 !is_commit_in_columns
) {
511 graph_increment_column_color(graph
);
513 graph_insert_into_new_columns(graph
,
518 * We always need to increment mapping_idx by at
519 * least 2, even if it has no interesting parents.
520 * The current commit always takes up at least 2
523 if (mapping_idx
== old_mapping_idx
)
526 graph_insert_into_new_columns(graph
, col_commit
,
532 * Shrink mapping_size to be the minimum necessary
534 while (graph
->mapping_size
> 1 &&
535 graph
->mapping
[graph
->mapping_size
- 1] < 0)
536 graph
->mapping_size
--;
539 * Compute graph->width for this commit
541 graph_update_width(graph
, is_commit_in_columns
);
544 void graph_update(struct git_graph
*graph
, struct commit
*commit
)
546 struct commit_list
*parent
;
551 graph
->commit
= commit
;
554 * Count how many interesting parents this commit has
556 graph
->num_parents
= 0;
557 for (parent
= first_interesting_parent(graph
);
559 parent
= next_interesting_parent(graph
, parent
))
561 graph
->num_parents
++;
565 * Store the old commit_index in prev_commit_index.
566 * graph_update_columns() will update graph->commit_index for this
569 graph
->prev_commit_index
= graph
->commit_index
;
572 * Call graph_update_columns() to update
573 * columns, new_columns, and mapping.
575 graph_update_columns(graph
);
577 graph
->expansion_row
= 0;
580 * Update graph->state.
581 * Note that we don't call graph_update_state() here, since
582 * we don't want to update graph->prev_state. No line for
583 * graph->state was ever printed.
585 * If the previous commit didn't get to the GRAPH_PADDING state,
586 * it never finished its output. Goto GRAPH_SKIP, to print out
587 * a line to indicate that portion of the graph is missing.
589 * If there are 3 or more parents, we may need to print extra rows
590 * before the commit, to expand the branch lines around it and make
591 * room for it. We need to do this only if there is a branch row
592 * (or more) to the right of this commit.
594 * If there are less than 3 parents, we can immediately print the
597 if (graph
->state
!= GRAPH_PADDING
)
598 graph
->state
= GRAPH_SKIP
;
599 else if (graph
->num_parents
>= 3 &&
600 graph
->commit_index
< (graph
->num_columns
- 1))
601 graph
->state
= GRAPH_PRE_COMMIT
;
603 graph
->state
= GRAPH_COMMIT
;
606 static int graph_is_mapping_correct(struct git_graph
*graph
)
611 * The mapping is up to date if each entry is at its target,
612 * or is 1 greater than its target.
613 * (If it is 1 greater than the target, '/' will be printed, so it
614 * will look correct on the next row.)
616 for (i
= 0; i
< graph
->mapping_size
; i
++) {
617 int target
= graph
->mapping
[i
];
620 if (target
== (i
/ 2))
628 static void graph_pad_horizontally(struct git_graph
*graph
, struct strbuf
*sb
,
632 * Add additional spaces to the end of the strbuf, so that all
633 * lines for a particular commit have the same width.
635 * This way, fields printed to the right of the graph will remain
636 * aligned for the entire commit.
639 if (chars_written
>= graph
->width
)
642 extra
= graph
->width
- chars_written
;
643 strbuf_addf(sb
, "%*s", (int) extra
, "");
646 static void graph_output_padding_line(struct git_graph
*graph
,
652 * We could conceivable be called with a NULL commit
653 * if our caller has a bug, and invokes graph_next_line()
654 * immediately after graph_init(), without first calling
655 * graph_update(). Return without outputting anything in this
662 * Output a padding row, that leaves all branch lines unchanged
664 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
665 strbuf_write_column(sb
, &graph
->new_columns
[i
], '|');
666 strbuf_addch(sb
, ' ');
669 graph_pad_horizontally(graph
, sb
, graph
->num_new_columns
* 2);
672 static void graph_output_skip_line(struct git_graph
*graph
, struct strbuf
*sb
)
675 * Output an ellipsis to indicate that a portion
676 * of the graph is missing.
678 strbuf_addstr(sb
, "...");
679 graph_pad_horizontally(graph
, sb
, 3);
681 if (graph
->num_parents
>= 3 &&
682 graph
->commit_index
< (graph
->num_columns
- 1))
683 graph_update_state(graph
, GRAPH_PRE_COMMIT
);
685 graph_update_state(graph
, GRAPH_COMMIT
);
688 static void graph_output_pre_commit_line(struct git_graph
*graph
,
691 int num_expansion_rows
;
696 * This function formats a row that increases the space around a commit
697 * with multiple parents, to make room for it. It should only be
698 * called when there are 3 or more parents.
700 * We need 2 extra rows for every parent over 2.
702 assert(graph
->num_parents
>= 3);
703 num_expansion_rows
= (graph
->num_parents
- 2) * 2;
706 * graph->expansion_row tracks the current expansion row we are on.
707 * It should be in the range [0, num_expansion_rows - 1]
709 assert(0 <= graph
->expansion_row
&&
710 graph
->expansion_row
< num_expansion_rows
);
717 for (i
= 0; i
< graph
->num_columns
; i
++) {
718 struct column
*col
= &graph
->columns
[i
];
719 if (col
->commit
== graph
->commit
) {
721 strbuf_write_column(sb
, col
, '|');
722 strbuf_addf(sb
, "%*s", graph
->expansion_row
, "");
723 chars_written
+= 1 + graph
->expansion_row
;
724 } else if (seen_this
&& (graph
->expansion_row
== 0)) {
726 * This is the first line of the pre-commit output.
727 * If the previous commit was a merge commit and
728 * ended in the GRAPH_POST_MERGE state, all branch
729 * lines after graph->prev_commit_index were
730 * printed as "\" on the previous line. Continue
731 * to print them as "\" on this line. Otherwise,
732 * print the branch lines as "|".
734 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
735 graph
->prev_commit_index
< i
)
736 strbuf_write_column(sb
, col
, '\\');
738 strbuf_write_column(sb
, col
, '|');
740 } else if (seen_this
&& (graph
->expansion_row
> 0)) {
741 strbuf_write_column(sb
, col
, '\\');
744 strbuf_write_column(sb
, col
, '|');
747 strbuf_addch(sb
, ' ');
751 graph_pad_horizontally(graph
, sb
, chars_written
);
754 * Increment graph->expansion_row,
755 * and move to state GRAPH_COMMIT if necessary
757 graph
->expansion_row
++;
758 if (graph
->expansion_row
>= num_expansion_rows
)
759 graph_update_state(graph
, GRAPH_COMMIT
);
762 static void graph_output_commit_char(struct git_graph
*graph
, struct strbuf
*sb
)
765 * For boundary commits, print 'o'
766 * (We should only see boundary commits when revs->boundary is set.)
768 if (graph
->commit
->object
.flags
& BOUNDARY
) {
769 assert(graph
->revs
->boundary
);
770 strbuf_addch(sb
, 'o');
775 * get_revision_mark() handles all other cases without assert()
777 strbuf_addstr(sb
, get_revision_mark(graph
->revs
, graph
->commit
));
781 * Draw an octopus merge and return the number of characters written.
783 static int graph_draw_octopus_merge(struct git_graph
*graph
,
787 * Here dashless_commits represents the number of parents
788 * which don't need to have dashes (because their edges fit
789 * neatly under the commit).
791 const int dashless_commits
= 2;
794 ((graph
->num_parents
- dashless_commits
) * 2) - 1;
795 for (i
= 0; i
< num_dashes
; i
++) {
796 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
797 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '-');
799 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
800 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '.');
801 return num_dashes
+ 1;
804 static void graph_output_commit_line(struct git_graph
*graph
, struct strbuf
*sb
)
807 int i
, chars_written
;
810 * Output the row containing this commit
811 * Iterate up to and including graph->num_columns,
812 * since the current commit may not be in any of the existing
813 * columns. (This happens when the current commit doesn't have any
814 * children that we have already processed.)
818 for (i
= 0; i
<= graph
->num_columns
; i
++) {
819 struct column
*col
= &graph
->columns
[i
];
820 struct commit
*col_commit
;
821 if (i
== graph
->num_columns
) {
824 col_commit
= graph
->commit
;
826 col_commit
= graph
->columns
[i
].commit
;
829 if (col_commit
== graph
->commit
) {
831 graph_output_commit_char(graph
, sb
);
834 if (graph
->num_parents
> 2)
835 chars_written
+= graph_draw_octopus_merge(graph
,
837 } else if (seen_this
&& (graph
->num_parents
> 2)) {
838 strbuf_write_column(sb
, col
, '\\');
840 } else if (seen_this
&& (graph
->num_parents
== 2)) {
842 * This is a 2-way merge commit.
843 * There is no GRAPH_PRE_COMMIT stage for 2-way
844 * merges, so this is the first line of output
845 * for this commit. Check to see what the previous
846 * line of output was.
848 * If it was GRAPH_POST_MERGE, the branch line
849 * coming into this commit may have been '\',
850 * and not '|' or '/'. If so, output the branch
851 * line as '\' on this line, instead of '|'. This
852 * makes the output look nicer.
854 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
855 graph
->prev_commit_index
< i
)
856 strbuf_write_column(sb
, col
, '\\');
858 strbuf_write_column(sb
, col
, '|');
861 strbuf_write_column(sb
, col
, '|');
864 strbuf_addch(sb
, ' ');
868 graph_pad_horizontally(graph
, sb
, chars_written
);
871 * Update graph->state
873 if (graph
->num_parents
> 1)
874 graph_update_state(graph
, GRAPH_POST_MERGE
);
875 else if (graph_is_mapping_correct(graph
))
876 graph_update_state(graph
, GRAPH_PADDING
);
878 graph_update_state(graph
, GRAPH_COLLAPSING
);
881 static struct column
*find_new_column_by_commit(struct git_graph
*graph
,
882 struct commit
*commit
)
885 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
886 if (graph
->new_columns
[i
].commit
== commit
)
887 return &graph
->new_columns
[i
];
892 static void graph_output_post_merge_line(struct git_graph
*graph
, struct strbuf
*sb
)
895 int i
, j
, chars_written
;
898 * Output the post-merge row
901 for (i
= 0; i
<= graph
->num_columns
; i
++) {
902 struct column
*col
= &graph
->columns
[i
];
903 struct commit
*col_commit
;
904 if (i
== graph
->num_columns
) {
907 col_commit
= graph
->commit
;
909 col_commit
= col
->commit
;
912 if (col_commit
== graph
->commit
) {
914 * Since the current commit is a merge find
915 * the columns for the parent commits in
916 * new_columns and use those to format the
919 struct commit_list
*parents
= NULL
;
920 struct column
*par_column
;
922 parents
= first_interesting_parent(graph
);
924 par_column
= find_new_column_by_commit(graph
, parents
->item
);
927 strbuf_write_column(sb
, par_column
, '|');
929 for (j
= 0; j
< graph
->num_parents
- 1; j
++) {
930 parents
= next_interesting_parent(graph
, parents
);
932 par_column
= find_new_column_by_commit(graph
, parents
->item
);
934 strbuf_write_column(sb
, par_column
, '\\');
935 strbuf_addch(sb
, ' ');
937 chars_written
+= j
* 2;
938 } else if (seen_this
) {
939 strbuf_write_column(sb
, col
, '\\');
940 strbuf_addch(sb
, ' ');
943 strbuf_write_column(sb
, col
, '|');
944 strbuf_addch(sb
, ' ');
949 graph_pad_horizontally(graph
, sb
, chars_written
);
952 * Update graph->state
954 if (graph_is_mapping_correct(graph
))
955 graph_update_state(graph
, GRAPH_PADDING
);
957 graph_update_state(graph
, GRAPH_COLLAPSING
);
960 static void graph_output_collapsing_line(struct git_graph
*graph
, struct strbuf
*sb
)
964 short used_horizontal
= 0;
965 int horizontal_edge
= -1;
966 int horizontal_edge_target
= -1;
969 * Clear out the new_mapping array
971 for (i
= 0; i
< graph
->mapping_size
; i
++)
972 graph
->new_mapping
[i
] = -1;
974 for (i
= 0; i
< graph
->mapping_size
; i
++) {
975 int target
= graph
->mapping
[i
];
980 * Since update_columns() always inserts the leftmost
981 * column first, each branch's target location should
982 * always be either its current location or to the left of
983 * its current location.
985 * We never have to move branches to the right. This makes
986 * the graph much more legible, since whenever branches
987 * cross, only one is moving directions.
989 assert(target
* 2 <= i
);
991 if (target
* 2 == i
) {
993 * This column is already in the
996 assert(graph
->new_mapping
[i
] == -1);
997 graph
->new_mapping
[i
] = target
;
998 } else if (graph
->new_mapping
[i
- 1] < 0) {
1000 * Nothing is to the left.
1001 * Move to the left by one
1003 graph
->new_mapping
[i
- 1] = target
;
1005 * If there isn't already an edge moving horizontally
1008 if (horizontal_edge
== -1) {
1010 horizontal_edge
= i
;
1011 horizontal_edge_target
= target
;
1013 * The variable target is the index of the graph
1014 * column, and therefore target*2+3 is the
1015 * actual screen column of the first horizontal
1018 for (j
= (target
* 2)+3; j
< (i
- 2); j
+= 2)
1019 graph
->new_mapping
[j
] = target
;
1021 } else if (graph
->new_mapping
[i
- 1] == target
) {
1023 * There is a branch line to our left
1024 * already, and it is our target. We
1025 * combine with this line, since we share
1026 * the same parent commit.
1028 * We don't have to add anything to the
1029 * output or new_mapping, since the
1030 * existing branch line has already taken
1035 * There is a branch line to our left,
1036 * but it isn't our target. We need to
1039 * The space just to the left of this
1040 * branch should always be empty.
1042 * The branch to the left of that space
1043 * should be our eventual target.
1045 assert(graph
->new_mapping
[i
- 1] > target
);
1046 assert(graph
->new_mapping
[i
- 2] < 0);
1047 assert(graph
->new_mapping
[i
- 3] == target
);
1048 graph
->new_mapping
[i
- 2] = target
;
1050 * Mark this branch as the horizontal edge to
1051 * prevent any other edges from moving
1054 if (horizontal_edge
== -1)
1055 horizontal_edge
= i
;
1060 * The new mapping may be 1 smaller than the old mapping
1062 if (graph
->new_mapping
[graph
->mapping_size
- 1] < 0)
1063 graph
->mapping_size
--;
1066 * Output out a line based on the new mapping info
1068 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1069 int target
= graph
->new_mapping
[i
];
1071 strbuf_addch(sb
, ' ');
1072 else if (target
* 2 == i
)
1073 strbuf_write_column(sb
, &graph
->new_columns
[target
], '|');
1074 else if (target
== horizontal_edge_target
&&
1075 i
!= horizontal_edge
- 1) {
1077 * Set the mappings for all but the
1078 * first segment to -1 so that they
1079 * won't continue into the next line.
1081 if (i
!= (target
* 2)+3)
1082 graph
->new_mapping
[i
] = -1;
1083 used_horizontal
= 1;
1084 strbuf_write_column(sb
, &graph
->new_columns
[target
], '_');
1086 if (used_horizontal
&& i
< horizontal_edge
)
1087 graph
->new_mapping
[i
] = -1;
1088 strbuf_write_column(sb
, &graph
->new_columns
[target
], '/');
1093 graph_pad_horizontally(graph
, sb
, graph
->mapping_size
);
1096 * Swap mapping and new_mapping
1098 tmp_mapping
= graph
->mapping
;
1099 graph
->mapping
= graph
->new_mapping
;
1100 graph
->new_mapping
= tmp_mapping
;
1103 * If graph->mapping indicates that all of the branch lines
1104 * are already in the correct positions, we are done.
1105 * Otherwise, we need to collapse some branch lines together.
1107 if (graph_is_mapping_correct(graph
))
1108 graph_update_state(graph
, GRAPH_PADDING
);
1111 int graph_next_line(struct git_graph
*graph
, struct strbuf
*sb
)
1113 switch (graph
->state
) {
1115 graph_output_padding_line(graph
, sb
);
1118 graph_output_skip_line(graph
, sb
);
1120 case GRAPH_PRE_COMMIT
:
1121 graph_output_pre_commit_line(graph
, sb
);
1124 graph_output_commit_line(graph
, sb
);
1126 case GRAPH_POST_MERGE
:
1127 graph_output_post_merge_line(graph
, sb
);
1129 case GRAPH_COLLAPSING
:
1130 graph_output_collapsing_line(graph
, sb
);
1138 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
)
1142 if (graph
->state
!= GRAPH_COMMIT
) {
1143 graph_next_line(graph
, sb
);
1148 * Output the row containing this commit
1149 * Iterate up to and including graph->num_columns,
1150 * since the current commit may not be in any of the existing
1151 * columns. (This happens when the current commit doesn't have any
1152 * children that we have already processed.)
1154 for (i
= 0; i
< graph
->num_columns
; i
++) {
1155 struct column
*col
= &graph
->columns
[i
];
1156 strbuf_write_column(sb
, col
, '|');
1157 if (col
->commit
== graph
->commit
&& graph
->num_parents
> 2)
1158 strbuf_addchars(sb
, ' ', (graph
->num_parents
- 2) * 2);
1160 strbuf_addch(sb
, ' ');
1163 graph_pad_horizontally(graph
, sb
, graph
->num_columns
);
1166 * Update graph->prev_state since we have output a padding line
1168 graph
->prev_state
= GRAPH_PADDING
;
1171 int graph_is_commit_finished(struct git_graph
const *graph
)
1173 return (graph
->state
== GRAPH_PADDING
);
1176 void graph_show_commit(struct git_graph
*graph
)
1178 struct strbuf msgbuf
= STRBUF_INIT
;
1179 int shown_commit_line
= 0;
1185 * When showing a diff of a merge against each of its parents, we
1186 * are called once for each parent without graph_update having been
1187 * called. In this case, simply output a single padding line.
1189 if (graph_is_commit_finished(graph
)) {
1190 graph_show_padding(graph
);
1191 shown_commit_line
= 1;
1194 while (!shown_commit_line
&& !graph_is_commit_finished(graph
)) {
1195 shown_commit_line
= graph_next_line(graph
, &msgbuf
);
1196 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1197 if (!shown_commit_line
)
1199 strbuf_setlen(&msgbuf
, 0);
1202 strbuf_release(&msgbuf
);
1205 void graph_show_oneline(struct git_graph
*graph
)
1207 struct strbuf msgbuf
= STRBUF_INIT
;
1212 graph_next_line(graph
, &msgbuf
);
1213 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1214 strbuf_release(&msgbuf
);
1217 void graph_show_padding(struct git_graph
*graph
)
1219 struct strbuf msgbuf
= STRBUF_INIT
;
1224 graph_padding_line(graph
, &msgbuf
);
1225 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1226 strbuf_release(&msgbuf
);
1229 int graph_show_remainder(struct git_graph
*graph
)
1231 struct strbuf msgbuf
= STRBUF_INIT
;
1237 if (graph_is_commit_finished(graph
))
1241 graph_next_line(graph
, &msgbuf
);
1242 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1243 strbuf_setlen(&msgbuf
, 0);
1246 if (!graph_is_commit_finished(graph
))
1251 strbuf_release(&msgbuf
);
1257 static void graph_show_strbuf(struct git_graph
*graph
, struct strbuf
const *sb
)
1262 fwrite(sb
->buf
, sizeof(char), sb
->len
, stdout
);
1267 * Print the strbuf line by line,
1268 * and display the graph info before each line but the first.
1273 char *next_p
= strchr(p
, '\n');
1278 len
= (sb
->buf
+ sb
->len
) - p
;
1280 fwrite(p
, sizeof(char), len
, stdout
);
1281 if (next_p
&& *next_p
!= '\0')
1282 graph_show_oneline(graph
);
1287 void graph_show_commit_msg(struct git_graph
*graph
,
1288 struct strbuf
const *sb
)
1290 int newline_terminated
;
1294 * If there's no graph, just print the message buffer.
1296 * The message buffer for CMIT_FMT_ONELINE and
1297 * CMIT_FMT_USERFORMAT are already missing a terminating
1298 * newline. All of the other formats should have it.
1300 fwrite(sb
->buf
, sizeof(char), sb
->len
, stdout
);
1304 newline_terminated
= (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n');
1307 * Show the commit message
1309 graph_show_strbuf(graph
, sb
);
1312 * If there is more output needed for this commit, show it now
1314 if (!graph_is_commit_finished(graph
)) {
1316 * If sb doesn't have a terminating newline, print one now,
1317 * so we can start the remainder of the graph output on a
1320 if (!newline_terminated
)
1323 graph_show_remainder(graph
);
1326 * If sb ends with a newline, our output should too.
1328 if (newline_terminated
)