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 graph
->columns
= xmalloc(sizeof(struct column
) *
238 graph
->column_capacity
);
239 graph
->new_columns
= xmalloc(sizeof(struct column
) *
240 graph
->column_capacity
);
241 graph
->mapping
= xmalloc(sizeof(int) * 2 * graph
->column_capacity
);
242 graph
->new_mapping
= xmalloc(sizeof(int) * 2 * graph
->column_capacity
);
245 * The diff output prefix callback, with this we can make
246 * all the diff output to align with the graph lines.
248 opt
->diffopt
.output_prefix
= diff_output_prefix_callback
;
249 opt
->diffopt
.output_prefix_data
= graph
;
250 opt
->diffopt
.output_prefix_length
= 0;
255 static void graph_update_state(struct git_graph
*graph
, enum graph_state s
)
257 graph
->prev_state
= graph
->state
;
261 static void graph_ensure_capacity(struct git_graph
*graph
, int num_columns
)
263 if (graph
->column_capacity
>= num_columns
)
267 graph
->column_capacity
*= 2;
268 } while (graph
->column_capacity
< num_columns
);
270 graph
->columns
= xrealloc(graph
->columns
,
271 sizeof(struct column
) *
272 graph
->column_capacity
);
273 graph
->new_columns
= xrealloc(graph
->new_columns
,
274 sizeof(struct column
) *
275 graph
->column_capacity
);
276 graph
->mapping
= xrealloc(graph
->mapping
,
277 sizeof(int) * 2 * graph
->column_capacity
);
278 graph
->new_mapping
= xrealloc(graph
->new_mapping
,
279 sizeof(int) * 2 * graph
->column_capacity
);
283 * Returns 1 if the commit will be printed in the graph output,
286 static int graph_is_interesting(struct git_graph
*graph
, struct commit
*commit
)
289 * If revs->boundary is set, commits whose children have
290 * been shown are always interesting, even if they have the
291 * UNINTERESTING or TREESAME flags set.
293 if (graph
->revs
&& graph
->revs
->boundary
) {
294 if (commit
->object
.flags
& CHILD_SHOWN
)
299 * Otherwise, use get_commit_action() to see if this commit is
302 return get_commit_action(graph
->revs
, commit
) == commit_show
;
305 static struct commit_list
*next_interesting_parent(struct git_graph
*graph
,
306 struct commit_list
*orig
)
308 struct commit_list
*list
;
311 * If revs->first_parent_only is set, only the first
312 * parent is interesting. None of the others are.
314 if (graph
->revs
->first_parent_only
)
318 * Return the next interesting commit after orig
320 for (list
= orig
->next
; list
; list
= list
->next
) {
321 if (graph_is_interesting(graph
, list
->item
))
328 static struct commit_list
*first_interesting_parent(struct git_graph
*graph
)
330 struct commit_list
*parents
= graph
->commit
->parents
;
333 * If this commit has no parents, ignore it
339 * If the first parent is interesting, return it
341 if (graph_is_interesting(graph
, parents
->item
))
345 * Otherwise, call next_interesting_parent() to get
346 * the next interesting parent
348 return next_interesting_parent(graph
, parents
);
351 static unsigned short graph_get_current_column_color(const struct git_graph
*graph
)
353 if (!want_color(graph
->revs
->diffopt
.use_color
))
354 return column_colors_max
;
355 return graph
->default_column_color
;
359 * Update the graph's default column color.
361 static void graph_increment_column_color(struct git_graph
*graph
)
363 graph
->default_column_color
= (graph
->default_column_color
+ 1) %
367 static unsigned short graph_find_commit_color(const struct git_graph
*graph
,
368 const struct commit
*commit
)
371 for (i
= 0; i
< graph
->num_columns
; i
++) {
372 if (graph
->columns
[i
].commit
== commit
)
373 return graph
->columns
[i
].color
;
375 return graph_get_current_column_color(graph
);
378 static void graph_insert_into_new_columns(struct git_graph
*graph
,
379 struct commit
*commit
,
385 * If the commit is already in the new_columns list, we don't need to
386 * add it. Just update the mapping correctly.
388 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
389 if (graph
->new_columns
[i
].commit
== commit
) {
390 graph
->mapping
[*mapping_index
] = i
;
397 * This commit isn't already in new_columns. Add it.
399 graph
->new_columns
[graph
->num_new_columns
].commit
= commit
;
400 graph
->new_columns
[graph
->num_new_columns
].color
= graph_find_commit_color(graph
, commit
);
401 graph
->mapping
[*mapping_index
] = graph
->num_new_columns
;
403 graph
->num_new_columns
++;
406 static void graph_update_width(struct git_graph
*graph
)
409 * Compute the width needed to display the graph for this commit.
410 * This is the maximum width needed for any row. All other rows
411 * will be padded to this width.
413 * Compute the number of columns in the widest row:
414 * Count each existing column (graph->num_columns), and each new
415 * column added by this commit.
417 int max_cols
= graph
->num_columns
+ graph
->num_parents
;
420 * Even if the current commit has no parents to be printed, it
421 * still takes up a column for itself.
423 if (graph
->num_parents
< 1)
427 * We added a column for the current commit as part of
428 * graph->num_parents. If the current commit was already in
429 * graph->columns, then we have double counted it. If it
430 * was not, we have added it in graph_update_columns().
435 * Each column takes up 2 spaces
437 graph
->width
= max_cols
* 2;
440 static void graph_update_columns(struct git_graph
*graph
)
442 struct commit_list
*parent
;
443 struct column
*tmp_columns
;
449 * Swap graph->columns with graph->new_columns
450 * graph->columns contains the state for the previous commit,
451 * and new_columns now contains the state for our commit.
453 * We'll re-use the old columns array as storage to compute the new
454 * columns list for the commit after this one.
456 tmp_columns
= graph
->columns
;
457 graph
->columns
= graph
->new_columns
;
458 graph
->num_columns
= graph
->num_new_columns
;
460 graph
->new_columns
= tmp_columns
;
461 graph
->num_new_columns
= 0;
464 * Now update new_columns and mapping with the information for the
465 * commit after this one.
467 * First, make sure we have enough room. At most, there will
468 * be graph->num_columns + graph->num_parents columns for the next
469 * commit, and we add one to make sure we can add the current commit
470 * on the graph->columns[] if we haven't shown any of its descendants.
472 max_new_columns
= graph
->num_columns
+ graph
->num_parents
+ 1;
473 graph_ensure_capacity(graph
, max_new_columns
);
476 * Clear out graph->mapping
478 graph
->mapping_size
= 2 * max_new_columns
;
479 for (i
= 0; i
< graph
->mapping_size
; i
++)
480 graph
->mapping
[i
] = -1;
483 * This commit will not be in graph->columns[] if we have
484 * emitted no descendant of it so far.
486 for (i
= 0; i
< graph
->num_columns
; i
++)
487 if (graph
->commit
== graph
->columns
[i
].commit
)
489 if (i
== graph
->num_columns
) {
490 /* Append it at the end */
491 graph
->columns
[graph
->num_columns
].commit
= graph
->commit
;
492 if (graph
->num_columns
)
493 graph_increment_column_color(graph
);
494 graph
->columns
[graph
->num_columns
].color
=
495 graph_find_commit_color(graph
, graph
->commit
);
496 graph
->num_columns
++;
500 * Populate graph->new_columns and graph->mapping
502 * Some of the parents of this commit may already be in
503 * graph->columns. If so, graph->new_columns should only contain a
504 * single entry for each such commit. graph->mapping should
505 * contain information about where each current branch line is
506 * supposed to end up after the collapsing is performed.
509 for (i
= 0; i
< graph
->num_columns
; i
++) {
510 struct commit
*col_commit
;
511 col_commit
= graph
->columns
[i
].commit
;
513 if (col_commit
== graph
->commit
) {
514 int old_mapping_idx
= mapping_idx
;
515 graph
->commit_index
= i
;
516 for (parent
= first_interesting_parent(graph
);
518 parent
= next_interesting_parent(graph
, parent
)) {
520 * If this is a merge, increment the current
523 if (graph
->num_parents
> 1)
524 graph_increment_column_color(graph
);
525 graph_insert_into_new_columns(graph
,
530 * We always need to increment mapping_idx by at
531 * least 2, even if it has no interesting parents.
532 * The current commit always takes up at least 2
535 if (mapping_idx
== old_mapping_idx
)
538 graph_insert_into_new_columns(graph
, col_commit
,
544 * Shrink mapping_size to be the minimum necessary
546 while (graph
->mapping_size
> 1 &&
547 graph
->mapping
[graph
->mapping_size
- 1] < 0)
548 graph
->mapping_size
--;
551 * Compute graph->width for this commit
553 graph_update_width(graph
);
556 void graph_update(struct git_graph
*graph
, struct commit
*commit
)
558 struct commit_list
*parent
;
563 graph
->commit
= commit
;
566 * Count how many interesting parents this commit has
568 graph
->num_parents
= 0;
569 for (parent
= first_interesting_parent(graph
);
571 parent
= next_interesting_parent(graph
, parent
))
573 graph
->num_parents
++;
577 * Store the old commit_index in prev_commit_index.
578 * graph_update_columns() will update graph->commit_index for this
581 graph
->prev_commit_index
= graph
->commit_index
;
584 * Call graph_update_columns() to update
585 * columns, new_columns, and mapping.
587 graph_update_columns(graph
);
589 graph
->expansion_row
= 0;
592 * Update graph->state.
593 * Note that we don't call graph_update_state() here, since
594 * we don't want to update graph->prev_state. No line for
595 * graph->state was ever printed.
597 * If the previous commit didn't get to the GRAPH_PADDING state,
598 * it never finished its output. Goto GRAPH_SKIP, to print out
599 * a line to indicate that portion of the graph is missing.
601 * If there are 3 or more parents, we may need to print extra rows
602 * before the commit, to expand the branch lines around it and make
603 * room for it. We need to do this only if there is a branch row
604 * (or more) to the right of this commit.
606 * If there are less than 3 parents, we can immediately print the
609 if (graph
->state
!= GRAPH_PADDING
)
610 graph
->state
= GRAPH_SKIP
;
611 else if (graph
->num_parents
>= 3 &&
612 graph
->commit_index
< (graph
->num_columns
- 1))
613 graph
->state
= GRAPH_PRE_COMMIT
;
615 graph
->state
= GRAPH_COMMIT
;
618 static int graph_is_mapping_correct(struct git_graph
*graph
)
623 * The mapping is up to date if each entry is at its target,
624 * or is 1 greater than its target.
625 * (If it is 1 greater than the target, '/' will be printed, so it
626 * will look correct on the next row.)
628 for (i
= 0; i
< graph
->mapping_size
; i
++) {
629 int target
= graph
->mapping
[i
];
632 if (target
== (i
/ 2))
640 static void graph_pad_horizontally(struct git_graph
*graph
, struct strbuf
*sb
,
644 * Add additional spaces to the end of the strbuf, so that all
645 * lines for a particular commit have the same width.
647 * This way, fields printed to the right of the graph will remain
648 * aligned for the entire commit.
651 if (chars_written
>= graph
->width
)
654 extra
= graph
->width
- chars_written
;
655 strbuf_addf(sb
, "%*s", (int) extra
, "");
658 static void graph_output_padding_line(struct git_graph
*graph
,
664 * We could conceivable be called with a NULL commit
665 * if our caller has a bug, and invokes graph_next_line()
666 * immediately after graph_init(), without first calling
667 * graph_update(). Return without outputting anything in this
674 * Output a padding row, that leaves all branch lines unchanged
676 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
677 strbuf_write_column(sb
, &graph
->new_columns
[i
], '|');
678 strbuf_addch(sb
, ' ');
681 graph_pad_horizontally(graph
, sb
, graph
->num_new_columns
* 2);
684 static void graph_output_skip_line(struct git_graph
*graph
, struct strbuf
*sb
)
687 * Output an ellipsis to indicate that a portion
688 * of the graph is missing.
690 strbuf_addstr(sb
, "...");
691 graph_pad_horizontally(graph
, sb
, 3);
693 if (graph
->num_parents
>= 3 &&
694 graph
->commit_index
< (graph
->num_columns
- 1))
695 graph_update_state(graph
, GRAPH_PRE_COMMIT
);
697 graph_update_state(graph
, GRAPH_COMMIT
);
700 static void graph_output_pre_commit_line(struct git_graph
*graph
,
703 int num_expansion_rows
;
708 * This function formats a row that increases the space around a commit
709 * with multiple parents, to make room for it. It should only be
710 * called when there are 3 or more parents.
712 * We need 2 extra rows for every parent over 2.
714 assert(graph
->num_parents
>= 3);
715 num_expansion_rows
= (graph
->num_parents
- 2) * 2;
718 * graph->expansion_row tracks the current expansion row we are on.
719 * It should be in the range [0, num_expansion_rows - 1]
721 assert(0 <= graph
->expansion_row
&&
722 graph
->expansion_row
< num_expansion_rows
);
729 for (i
= 0; i
< graph
->num_columns
; i
++) {
730 struct column
*col
= &graph
->columns
[i
];
731 if (col
->commit
== graph
->commit
) {
733 strbuf_write_column(sb
, col
, '|');
734 strbuf_addf(sb
, "%*s", graph
->expansion_row
, "");
735 chars_written
+= 1 + graph
->expansion_row
;
736 } else if (seen_this
&& (graph
->expansion_row
== 0)) {
738 * This is the first line of the pre-commit output.
739 * If the previous commit was a merge commit and
740 * ended in the GRAPH_POST_MERGE state, all branch
741 * lines after graph->prev_commit_index were
742 * printed as "\" on the previous line. Continue
743 * to print them as "\" on this line. Otherwise,
744 * print the branch lines as "|".
746 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
747 graph
->prev_commit_index
< i
)
748 strbuf_write_column(sb
, col
, '\\');
750 strbuf_write_column(sb
, col
, '|');
752 } else if (seen_this
&& (graph
->expansion_row
> 0)) {
753 strbuf_write_column(sb
, col
, '\\');
756 strbuf_write_column(sb
, col
, '|');
759 strbuf_addch(sb
, ' ');
763 graph_pad_horizontally(graph
, sb
, chars_written
);
766 * Increment graph->expansion_row,
767 * and move to state GRAPH_COMMIT if necessary
769 graph
->expansion_row
++;
770 if (graph
->expansion_row
>= num_expansion_rows
)
771 graph_update_state(graph
, GRAPH_COMMIT
);
774 static void graph_output_commit_char(struct git_graph
*graph
, struct strbuf
*sb
)
777 * For boundary commits, print 'o'
778 * (We should only see boundary commits when revs->boundary is set.)
780 if (graph
->commit
->object
.flags
& BOUNDARY
) {
781 assert(graph
->revs
->boundary
);
782 strbuf_addch(sb
, 'o');
787 * get_revision_mark() handles all other cases without assert()
789 strbuf_addstr(sb
, get_revision_mark(graph
->revs
, graph
->commit
));
793 * Draw an octopus merge and return the number of characters written.
795 static int graph_draw_octopus_merge(struct git_graph
*graph
,
799 * Here dashless_commits represents the number of parents
800 * which don't need to have dashes (because their edges fit
801 * neatly under the commit).
803 const int dashless_commits
= 2;
806 ((graph
->num_parents
- dashless_commits
) * 2) - 1;
807 for (i
= 0; i
< num_dashes
; i
++) {
808 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
809 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '-');
811 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
812 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '.');
813 return num_dashes
+ 1;
816 static void graph_output_commit_line(struct git_graph
*graph
, struct strbuf
*sb
)
819 int i
, chars_written
;
822 * Output the row containing this commit. When we haven't seen
823 * any descendant of the current commit, we have added it at the
824 * end of graph->columns[], so it is guaranteed we will see the
825 * current commit somewhere in that array.
829 for (i
= 0; i
< graph
->num_columns
; i
++) {
830 struct column
*col
= &graph
->columns
[i
];
831 struct commit
*col_commit
;
832 col_commit
= graph
->columns
[i
].commit
;
834 if (col_commit
== graph
->commit
) {
836 graph_output_commit_char(graph
, sb
);
839 if (graph
->num_parents
> 2)
840 chars_written
+= graph_draw_octopus_merge(graph
,
842 } else if (seen_this
&& (graph
->num_parents
> 2)) {
843 strbuf_write_column(sb
, col
, '\\');
845 } else if (seen_this
&& (graph
->num_parents
== 2)) {
847 * This is a 2-way merge commit.
848 * There is no GRAPH_PRE_COMMIT stage for 2-way
849 * merges, so this is the first line of output
850 * for this commit. Check to see what the previous
851 * line of output was.
853 * If it was GRAPH_POST_MERGE, the branch line
854 * coming into this commit may have been '\',
855 * and not '|' or '/'. If so, output the branch
856 * line as '\' on this line, instead of '|'. This
857 * makes the output look nicer.
859 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
860 graph
->prev_commit_index
< i
)
861 strbuf_write_column(sb
, col
, '\\');
863 strbuf_write_column(sb
, col
, '|');
866 strbuf_write_column(sb
, col
, '|');
869 strbuf_addch(sb
, ' ');
873 graph_pad_horizontally(graph
, sb
, chars_written
);
876 * Update graph->state
878 if (graph
->num_parents
> 1)
879 graph_update_state(graph
, GRAPH_POST_MERGE
);
880 else if (graph_is_mapping_correct(graph
))
881 graph_update_state(graph
, GRAPH_PADDING
);
883 graph_update_state(graph
, GRAPH_COLLAPSING
);
886 static struct column
*find_new_column_by_commit(struct git_graph
*graph
,
887 struct commit
*commit
)
890 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
891 if (graph
->new_columns
[i
].commit
== commit
)
892 return &graph
->new_columns
[i
];
897 static void graph_output_post_merge_line(struct git_graph
*graph
, struct strbuf
*sb
)
900 int i
, j
, chars_written
;
903 * Output the post-merge row
906 for (i
= 0; i
< graph
->num_columns
; i
++) {
907 struct column
*col
= &graph
->columns
[i
];
908 struct commit
*col_commit
;
909 col_commit
= col
->commit
;
911 if (col_commit
== graph
->commit
) {
913 * Since the current commit is a merge find
914 * the columns for the parent commits in
915 * new_columns and use those to format the
918 struct commit_list
*parents
= NULL
;
919 struct column
*par_column
;
921 parents
= first_interesting_parent(graph
);
923 par_column
= find_new_column_by_commit(graph
, parents
->item
);
926 strbuf_write_column(sb
, par_column
, '|');
928 for (j
= 0; j
< graph
->num_parents
- 1; j
++) {
929 parents
= next_interesting_parent(graph
, parents
);
931 par_column
= find_new_column_by_commit(graph
, parents
->item
);
933 strbuf_write_column(sb
, par_column
, '\\');
934 strbuf_addch(sb
, ' ');
936 chars_written
+= j
* 2;
937 } else if (seen_this
) {
938 strbuf_write_column(sb
, col
, '\\');
939 strbuf_addch(sb
, ' ');
942 strbuf_write_column(sb
, col
, '|');
943 strbuf_addch(sb
, ' ');
948 graph_pad_horizontally(graph
, sb
, chars_written
);
951 * Update graph->state
953 if (graph_is_mapping_correct(graph
))
954 graph_update_state(graph
, GRAPH_PADDING
);
956 graph_update_state(graph
, GRAPH_COLLAPSING
);
959 static void graph_output_collapsing_line(struct git_graph
*graph
, struct strbuf
*sb
)
963 short used_horizontal
= 0;
964 int horizontal_edge
= -1;
965 int horizontal_edge_target
= -1;
968 * Clear out the new_mapping array
970 for (i
= 0; i
< graph
->mapping_size
; i
++)
971 graph
->new_mapping
[i
] = -1;
973 for (i
= 0; i
< graph
->mapping_size
; i
++) {
974 int target
= graph
->mapping
[i
];
979 * Since update_columns() always inserts the leftmost
980 * column first, each branch's target location should
981 * always be either its current location or to the left of
982 * its current location.
984 * We never have to move branches to the right. This makes
985 * the graph much more legible, since whenever branches
986 * cross, only one is moving directions.
988 assert(target
* 2 <= i
);
990 if (target
* 2 == i
) {
992 * This column is already in the
995 assert(graph
->new_mapping
[i
] == -1);
996 graph
->new_mapping
[i
] = target
;
997 } else if (graph
->new_mapping
[i
- 1] < 0) {
999 * Nothing is to the left.
1000 * Move to the left by one
1002 graph
->new_mapping
[i
- 1] = target
;
1004 * If there isn't already an edge moving horizontally
1007 if (horizontal_edge
== -1) {
1009 horizontal_edge
= i
;
1010 horizontal_edge_target
= target
;
1012 * The variable target is the index of the graph
1013 * column, and therefore target*2+3 is the
1014 * actual screen column of the first horizontal
1017 for (j
= (target
* 2)+3; j
< (i
- 2); j
+= 2)
1018 graph
->new_mapping
[j
] = target
;
1020 } else if (graph
->new_mapping
[i
- 1] == target
) {
1022 * There is a branch line to our left
1023 * already, and it is our target. We
1024 * combine with this line, since we share
1025 * the same parent commit.
1027 * We don't have to add anything to the
1028 * output or new_mapping, since the
1029 * existing branch line has already taken
1034 * There is a branch line to our left,
1035 * but it isn't our target. We need to
1038 * The space just to the left of this
1039 * branch should always be empty.
1041 * The branch to the left of that space
1042 * should be our eventual target.
1044 assert(graph
->new_mapping
[i
- 1] > target
);
1045 assert(graph
->new_mapping
[i
- 2] < 0);
1046 assert(graph
->new_mapping
[i
- 3] == target
);
1047 graph
->new_mapping
[i
- 2] = target
;
1049 * Mark this branch as the horizontal edge to
1050 * prevent any other edges from moving
1053 if (horizontal_edge
== -1)
1054 horizontal_edge
= i
;
1059 * The new mapping may be 1 smaller than the old mapping
1061 if (graph
->new_mapping
[graph
->mapping_size
- 1] < 0)
1062 graph
->mapping_size
--;
1065 * Output out a line based on the new mapping info
1067 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1068 int target
= graph
->new_mapping
[i
];
1070 strbuf_addch(sb
, ' ');
1071 else if (target
* 2 == i
)
1072 strbuf_write_column(sb
, &graph
->new_columns
[target
], '|');
1073 else if (target
== horizontal_edge_target
&&
1074 i
!= horizontal_edge
- 1) {
1076 * Set the mappings for all but the
1077 * first segment to -1 so that they
1078 * won't continue into the next line.
1080 if (i
!= (target
* 2)+3)
1081 graph
->new_mapping
[i
] = -1;
1082 used_horizontal
= 1;
1083 strbuf_write_column(sb
, &graph
->new_columns
[target
], '_');
1085 if (used_horizontal
&& i
< horizontal_edge
)
1086 graph
->new_mapping
[i
] = -1;
1087 strbuf_write_column(sb
, &graph
->new_columns
[target
], '/');
1092 graph_pad_horizontally(graph
, sb
, graph
->mapping_size
);
1095 * Swap mapping and new_mapping
1097 tmp_mapping
= graph
->mapping
;
1098 graph
->mapping
= graph
->new_mapping
;
1099 graph
->new_mapping
= tmp_mapping
;
1102 * If graph->mapping indicates that all of the branch lines
1103 * are already in the correct positions, we are done.
1104 * Otherwise, we need to collapse some branch lines together.
1106 if (graph_is_mapping_correct(graph
))
1107 graph_update_state(graph
, GRAPH_PADDING
);
1110 int graph_next_line(struct git_graph
*graph
, struct strbuf
*sb
)
1112 switch (graph
->state
) {
1114 graph_output_padding_line(graph
, sb
);
1117 graph_output_skip_line(graph
, sb
);
1119 case GRAPH_PRE_COMMIT
:
1120 graph_output_pre_commit_line(graph
, sb
);
1123 graph_output_commit_line(graph
, sb
);
1125 case GRAPH_POST_MERGE
:
1126 graph_output_post_merge_line(graph
, sb
);
1128 case GRAPH_COLLAPSING
:
1129 graph_output_collapsing_line(graph
, sb
);
1137 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
)
1141 if (graph
->state
!= GRAPH_COMMIT
) {
1142 graph_next_line(graph
, sb
);
1147 * Output the row containing this commit
1148 * Iterate up to and including graph->num_columns,
1149 * since the current commit may not be in any of the existing
1150 * columns. (This happens when the current commit doesn't have any
1151 * children that we have already processed.)
1153 for (i
= 0; i
< graph
->num_columns
; i
++) {
1154 struct column
*col
= &graph
->columns
[i
];
1155 struct commit
*col_commit
= col
->commit
;
1156 if (col_commit
== graph
->commit
) {
1157 strbuf_write_column(sb
, col
, '|');
1159 if (graph
->num_parents
< 3)
1160 strbuf_addch(sb
, ' ');
1162 int num_spaces
= ((graph
->num_parents
- 2) * 2);
1163 for (j
= 0; j
< num_spaces
; j
++)
1164 strbuf_addch(sb
, ' ');
1167 strbuf_write_column(sb
, col
, '|');
1168 strbuf_addch(sb
, ' ');
1172 graph_pad_horizontally(graph
, sb
, graph
->num_columns
);
1175 * Update graph->prev_state since we have output a padding line
1177 graph
->prev_state
= GRAPH_PADDING
;
1180 int graph_is_commit_finished(struct git_graph
const *graph
)
1182 return (graph
->state
== GRAPH_PADDING
);
1185 void graph_show_commit(struct git_graph
*graph
)
1187 struct strbuf msgbuf
= STRBUF_INIT
;
1188 int shown_commit_line
= 0;
1194 * When showing a diff of a merge against each of its parents, we
1195 * are called once for each parent without graph_update having been
1196 * called. In this case, simply output a single padding line.
1198 if (graph_is_commit_finished(graph
)) {
1199 graph_show_padding(graph
);
1200 shown_commit_line
= 1;
1203 while (!shown_commit_line
&& !graph_is_commit_finished(graph
)) {
1204 shown_commit_line
= graph_next_line(graph
, &msgbuf
);
1205 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1206 if (!shown_commit_line
)
1208 strbuf_setlen(&msgbuf
, 0);
1211 strbuf_release(&msgbuf
);
1214 void graph_show_oneline(struct git_graph
*graph
)
1216 struct strbuf msgbuf
= STRBUF_INIT
;
1221 graph_next_line(graph
, &msgbuf
);
1222 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1223 strbuf_release(&msgbuf
);
1226 void graph_show_padding(struct git_graph
*graph
)
1228 struct strbuf msgbuf
= STRBUF_INIT
;
1233 graph_padding_line(graph
, &msgbuf
);
1234 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1235 strbuf_release(&msgbuf
);
1238 int graph_show_remainder(struct git_graph
*graph
)
1240 struct strbuf msgbuf
= STRBUF_INIT
;
1246 if (graph_is_commit_finished(graph
))
1250 graph_next_line(graph
, &msgbuf
);
1251 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, stdout
);
1252 strbuf_setlen(&msgbuf
, 0);
1255 if (!graph_is_commit_finished(graph
))
1260 strbuf_release(&msgbuf
);
1266 static void graph_show_strbuf(struct git_graph
*graph
, struct strbuf
const *sb
)
1271 fwrite(sb
->buf
, sizeof(char), sb
->len
, stdout
);
1276 * Print the strbuf line by line,
1277 * and display the graph info before each line but the first.
1282 char *next_p
= strchr(p
, '\n');
1287 len
= (sb
->buf
+ sb
->len
) - p
;
1289 fwrite(p
, sizeof(char), len
, stdout
);
1290 if (next_p
&& *next_p
!= '\0')
1291 graph_show_oneline(graph
);
1296 void graph_show_commit_msg(struct git_graph
*graph
,
1297 struct strbuf
const *sb
)
1299 int newline_terminated
;
1303 * If there's no graph, just print the message buffer.
1305 * The message buffer for CMIT_FMT_ONELINE and
1306 * CMIT_FMT_USERFORMAT are already missing a terminating
1307 * newline. All of the other formats should have it.
1309 fwrite(sb
->buf
, sizeof(char), sb
->len
, stdout
);
1313 newline_terminated
= (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n');
1316 * Show the commit message
1318 graph_show_strbuf(graph
, sb
);
1321 * If there is more output needed for this commit, show it now
1323 if (!graph_is_commit_finished(graph
)) {
1325 * If sb doesn't have a terminating newline, print one now,
1326 * so we can start the remainder of the graph output on a
1329 if (!newline_terminated
)
1332 graph_show_remainder(graph
);
1335 * If sb ends with a newline, our output should too.
1337 if (newline_terminated
)