10 * Output a padding line in the graph.
11 * This is similar to graph_next_line(). However, it is guaranteed to
12 * never print the current commit line. Instead, if the commit line is
13 * next, it will simply output a line of vertical padding, extending the
14 * branch lines downwards, but leaving them otherwise unchanged.
16 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
);
19 * Print a strbuf. If the graph is non-NULL, all lines but the first will be
20 * prefixed with the graph output.
22 * If the strbuf ends with a newline, the output will end after this
23 * newline. A new graph line will not be printed after the final newline.
24 * If the strbuf is empty, no output will be printed.
26 * Since the first line will not include the graph output, the caller is
27 * responsible for printing this line's graph (perhaps via
28 * graph_show_commit() or graph_show_oneline()) before calling
29 * graph_show_strbuf().
31 * Note that unlike some other graph display functions, you must pass the file
32 * handle directly. It is assumed that this is the same file handle as the
33 * file specified by the graph diff options. This is necessary so that
34 * graph_show_strbuf can be called even with a NULL graph.
36 static void graph_show_strbuf(struct git_graph
*graph
,
38 struct strbuf
const *sb
);
42 * - Limit the number of columns, similar to the way gitk does.
43 * If we reach more than a specified number of columns, omit
44 * sections of some columns.
49 * The parent commit of this column.
51 struct commit
*commit
;
53 * The color to (optionally) print this column in. This is an
54 * index into column_colors.
68 static void graph_show_line_prefix(const struct diff_options
*diffopt
)
70 if (!diffopt
|| !diffopt
->line_prefix
)
73 fwrite(diffopt
->line_prefix
,
75 diffopt
->line_prefix_length
,
79 static const char **column_colors
;
80 static unsigned short column_colors_max
;
82 void graph_set_column_colors(const char **colors
, unsigned short colors_max
)
84 column_colors
= colors
;
85 column_colors_max
= colors_max
;
88 static const char *column_get_color_code(unsigned short color
)
90 return column_colors
[color
];
93 static void strbuf_write_column(struct strbuf
*sb
, const struct column
*c
,
96 if (c
->color
< column_colors_max
)
97 strbuf_addstr(sb
, column_get_color_code(c
->color
));
98 strbuf_addch(sb
, col_char
);
99 if (c
->color
< column_colors_max
)
100 strbuf_addstr(sb
, column_get_color_code(column_colors_max
));
105 * The commit currently being processed
107 struct commit
*commit
;
108 /* The rev-info used for the current traversal */
109 struct rev_info
*revs
;
111 * The number of interesting parents that this commit has.
113 * Note that this is not the same as the actual number of parents.
114 * This count excludes parents that won't be printed in the graph
115 * output, as determined by graph_is_interesting().
119 * The width of the graph output for this commit.
120 * All rows for this commit are padded to this width, so that
121 * messages printed after the graph output are aligned.
125 * The next expansion row to print
126 * when state is GRAPH_PRE_COMMIT
130 * The current output state.
131 * This tells us what kind of line graph_next_line() should output.
133 enum graph_state state
;
135 * The output state for the previous line of output.
136 * This is primarily used to determine how the first merge line
137 * should appear, based on the last line of the previous commit.
139 enum graph_state prev_state
;
141 * The index of the column that refers to this commit.
143 * If none of the incoming columns refer to this commit,
144 * this will be equal to num_columns.
148 * The commit_index for the previously displayed commit.
150 * This is used to determine how the first line of a merge
151 * graph output should appear, based on the last line of the
154 int prev_commit_index
;
156 * The maximum number of columns that can be stored in the columns
157 * and new_columns arrays. This is also half the number of entries
158 * that can be stored in the mapping and new_mapping arrays.
162 * The number of columns (also called "branch lines" in some places)
166 * The number of columns in the new_columns array
170 * The number of entries in the mapping array
174 * The column state before we output the current commit.
176 struct column
*columns
;
178 * The new column state after we output the current commit.
179 * Only valid when state is GRAPH_COLLAPSING.
181 struct column
*new_columns
;
183 * An array that tracks the current state of each
184 * character in the output line during state GRAPH_COLLAPSING.
185 * Each entry is -1 if this character is empty, or a non-negative
186 * integer if the character contains a branch line. The value of
187 * the integer indicates the target position for this branch line.
188 * (I.e., this array maps the current column positions to their
189 * desired positions.)
191 * The maximum capacity of this array is always
192 * sizeof(int) * 2 * column_capacity.
196 * A temporary array for computing the next mapping state
197 * while we are outputting a mapping line. This is stored as part
198 * of the git_graph simply so we don't have to allocate a new
199 * temporary array each time we have to output a collapsing line.
203 * The current default column color being used. This is
204 * stored as an index into the array column_colors.
206 unsigned short default_column_color
;
209 static struct strbuf
*diff_output_prefix_callback(struct diff_options
*opt
, void *data
)
211 struct git_graph
*graph
= data
;
212 static struct strbuf msgbuf
= STRBUF_INIT
;
216 strbuf_reset(&msgbuf
);
217 if (opt
->line_prefix
)
218 strbuf_add(&msgbuf
, opt
->line_prefix
,
219 opt
->line_prefix_length
);
221 graph_padding_line(graph
, &msgbuf
);
225 static const struct diff_options
*default_diffopt
;
227 void graph_setup_line_prefix(struct diff_options
*diffopt
)
229 default_diffopt
= diffopt
;
231 /* setup an output prefix callback if necessary */
232 if (diffopt
&& !diffopt
->output_prefix
)
233 diffopt
->output_prefix
= diff_output_prefix_callback
;
237 struct git_graph
*graph_init(struct rev_info
*opt
)
239 struct git_graph
*graph
= xmalloc(sizeof(struct git_graph
));
242 graph_set_column_colors(column_colors_ansi
,
243 column_colors_ansi_max
);
245 graph
->commit
= NULL
;
247 graph
->num_parents
= 0;
248 graph
->expansion_row
= 0;
249 graph
->state
= GRAPH_PADDING
;
250 graph
->prev_state
= GRAPH_PADDING
;
251 graph
->commit_index
= 0;
252 graph
->prev_commit_index
= 0;
253 graph
->num_columns
= 0;
254 graph
->num_new_columns
= 0;
255 graph
->mapping_size
= 0;
257 * Start the column color at the maximum value, since we'll
258 * always increment it for the first commit we output.
259 * This way we start at 0 for the first commit.
261 graph
->default_column_color
= column_colors_max
- 1;
264 * Allocate a reasonably large default number of columns
265 * We'll automatically grow columns later if we need more room.
267 graph
->column_capacity
= 30;
268 ALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
269 ALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
270 ALLOC_ARRAY(graph
->mapping
, 2 * graph
->column_capacity
);
271 ALLOC_ARRAY(graph
->new_mapping
, 2 * graph
->column_capacity
);
274 * The diff output prefix callback, with this we can make
275 * all the diff output to align with the graph lines.
277 opt
->diffopt
.output_prefix
= diff_output_prefix_callback
;
278 opt
->diffopt
.output_prefix_data
= graph
;
283 static void graph_update_state(struct git_graph
*graph
, enum graph_state s
)
285 graph
->prev_state
= graph
->state
;
289 static void graph_ensure_capacity(struct git_graph
*graph
, int num_columns
)
291 if (graph
->column_capacity
>= num_columns
)
295 graph
->column_capacity
*= 2;
296 } while (graph
->column_capacity
< num_columns
);
298 REALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
299 REALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
300 REALLOC_ARRAY(graph
->mapping
, graph
->column_capacity
* 2);
301 REALLOC_ARRAY(graph
->new_mapping
, graph
->column_capacity
* 2);
305 * Returns 1 if the commit will be printed in the graph output,
308 static int graph_is_interesting(struct git_graph
*graph
, struct commit
*commit
)
311 * If revs->boundary is set, commits whose children have
312 * been shown are always interesting, even if they have the
313 * UNINTERESTING or TREESAME flags set.
315 if (graph
->revs
&& graph
->revs
->boundary
) {
316 if (commit
->object
.flags
& CHILD_SHOWN
)
321 * Otherwise, use get_commit_action() to see if this commit is
324 return get_commit_action(graph
->revs
, commit
) == commit_show
;
327 static struct commit_list
*next_interesting_parent(struct git_graph
*graph
,
328 struct commit_list
*orig
)
330 struct commit_list
*list
;
333 * If revs->first_parent_only is set, only the first
334 * parent is interesting. None of the others are.
336 if (graph
->revs
->first_parent_only
)
340 * Return the next interesting commit after orig
342 for (list
= orig
->next
; list
; list
= list
->next
) {
343 if (graph_is_interesting(graph
, list
->item
))
350 static struct commit_list
*first_interesting_parent(struct git_graph
*graph
)
352 struct commit_list
*parents
= graph
->commit
->parents
;
355 * If this commit has no parents, ignore it
361 * If the first parent is interesting, return it
363 if (graph_is_interesting(graph
, parents
->item
))
367 * Otherwise, call next_interesting_parent() to get
368 * the next interesting parent
370 return next_interesting_parent(graph
, parents
);
373 static unsigned short graph_get_current_column_color(const struct git_graph
*graph
)
375 if (!want_color(graph
->revs
->diffopt
.use_color
))
376 return column_colors_max
;
377 return graph
->default_column_color
;
381 * Update the graph's default column color.
383 static void graph_increment_column_color(struct git_graph
*graph
)
385 graph
->default_column_color
= (graph
->default_column_color
+ 1) %
389 static unsigned short graph_find_commit_color(const struct git_graph
*graph
,
390 const struct commit
*commit
)
393 for (i
= 0; i
< graph
->num_columns
; i
++) {
394 if (graph
->columns
[i
].commit
== commit
)
395 return graph
->columns
[i
].color
;
397 return graph_get_current_column_color(graph
);
400 static void graph_insert_into_new_columns(struct git_graph
*graph
,
401 struct commit
*commit
,
407 * If the commit is already in the new_columns list, we don't need to
408 * add it. Just update the mapping correctly.
410 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
411 if (graph
->new_columns
[i
].commit
== commit
) {
412 graph
->mapping
[*mapping_index
] = i
;
419 * This commit isn't already in new_columns. Add it.
421 graph
->new_columns
[graph
->num_new_columns
].commit
= commit
;
422 graph
->new_columns
[graph
->num_new_columns
].color
= graph_find_commit_color(graph
, commit
);
423 graph
->mapping
[*mapping_index
] = graph
->num_new_columns
;
425 graph
->num_new_columns
++;
428 static void graph_update_width(struct git_graph
*graph
,
429 int is_commit_in_existing_columns
)
432 * Compute the width needed to display the graph for this commit.
433 * This is the maximum width needed for any row. All other rows
434 * will be padded to this width.
436 * Compute the number of columns in the widest row:
437 * Count each existing column (graph->num_columns), and each new
438 * column added by this commit.
440 int max_cols
= graph
->num_columns
+ graph
->num_parents
;
443 * Even if the current commit has no parents to be printed, it
444 * still takes up a column for itself.
446 if (graph
->num_parents
< 1)
450 * We added a column for the current commit as part of
451 * graph->num_parents. If the current commit was already in
452 * graph->columns, then we have double counted it.
454 if (is_commit_in_existing_columns
)
458 * Each column takes up 2 spaces
460 graph
->width
= max_cols
* 2;
463 static void graph_update_columns(struct git_graph
*graph
)
465 struct commit_list
*parent
;
468 int i
, seen_this
, is_commit_in_columns
;
471 * Swap graph->columns with graph->new_columns
472 * graph->columns contains the state for the previous commit,
473 * and new_columns now contains the state for our commit.
475 * We'll re-use the old columns array as storage to compute the new
476 * columns list for the commit after this one.
478 SWAP(graph
->columns
, graph
->new_columns
);
479 graph
->num_columns
= graph
->num_new_columns
;
480 graph
->num_new_columns
= 0;
483 * Now update new_columns and mapping with the information for the
484 * commit after this one.
486 * First, make sure we have enough room. At most, there will
487 * be graph->num_columns + graph->num_parents columns for the next
490 max_new_columns
= graph
->num_columns
+ graph
->num_parents
;
491 graph_ensure_capacity(graph
, max_new_columns
);
494 * Clear out graph->mapping
496 graph
->mapping_size
= 2 * max_new_columns
;
497 for (i
= 0; i
< graph
->mapping_size
; i
++)
498 graph
->mapping
[i
] = -1;
501 * Populate graph->new_columns and graph->mapping
503 * Some of the parents of this commit may already be in
504 * graph->columns. If so, graph->new_columns should only contain a
505 * single entry for each such commit. graph->mapping should
506 * contain information about where each current branch line is
507 * supposed to end up after the collapsing is performed.
511 is_commit_in_columns
= 1;
512 for (i
= 0; i
<= graph
->num_columns
; i
++) {
513 struct commit
*col_commit
;
514 if (i
== graph
->num_columns
) {
517 is_commit_in_columns
= 0;
518 col_commit
= graph
->commit
;
520 col_commit
= graph
->columns
[i
].commit
;
523 if (col_commit
== graph
->commit
) {
524 int old_mapping_idx
= mapping_idx
;
526 graph
->commit_index
= i
;
527 for (parent
= first_interesting_parent(graph
);
529 parent
= next_interesting_parent(graph
, parent
)) {
531 * If this is a merge, or the start of a new
532 * childless column, increment the current
535 if (graph
->num_parents
> 1 ||
536 !is_commit_in_columns
) {
537 graph_increment_column_color(graph
);
539 graph_insert_into_new_columns(graph
,
544 * We always need to increment mapping_idx by at
545 * least 2, even if it has no interesting parents.
546 * The current commit always takes up at least 2
549 if (mapping_idx
== old_mapping_idx
)
552 graph_insert_into_new_columns(graph
, col_commit
,
558 * Shrink mapping_size to be the minimum necessary
560 while (graph
->mapping_size
> 1 &&
561 graph
->mapping
[graph
->mapping_size
- 1] < 0)
562 graph
->mapping_size
--;
565 * Compute graph->width for this commit
567 graph_update_width(graph
, is_commit_in_columns
);
570 void graph_update(struct git_graph
*graph
, struct commit
*commit
)
572 struct commit_list
*parent
;
577 graph
->commit
= commit
;
580 * Count how many interesting parents this commit has
582 graph
->num_parents
= 0;
583 for (parent
= first_interesting_parent(graph
);
585 parent
= next_interesting_parent(graph
, parent
))
587 graph
->num_parents
++;
591 * Store the old commit_index in prev_commit_index.
592 * graph_update_columns() will update graph->commit_index for this
595 graph
->prev_commit_index
= graph
->commit_index
;
598 * Call graph_update_columns() to update
599 * columns, new_columns, and mapping.
601 graph_update_columns(graph
);
603 graph
->expansion_row
= 0;
606 * Update graph->state.
607 * Note that we don't call graph_update_state() here, since
608 * we don't want to update graph->prev_state. No line for
609 * graph->state was ever printed.
611 * If the previous commit didn't get to the GRAPH_PADDING state,
612 * it never finished its output. Goto GRAPH_SKIP, to print out
613 * a line to indicate that portion of the graph is missing.
615 * If there are 3 or more parents, we may need to print extra rows
616 * before the commit, to expand the branch lines around it and make
617 * room for it. We need to do this only if there is a branch row
618 * (or more) to the right of this commit.
620 * If there are less than 3 parents, we can immediately print the
623 if (graph
->state
!= GRAPH_PADDING
)
624 graph
->state
= GRAPH_SKIP
;
625 else if (graph
->num_parents
>= 3 &&
626 graph
->commit_index
< (graph
->num_columns
- 1))
627 graph
->state
= GRAPH_PRE_COMMIT
;
629 graph
->state
= GRAPH_COMMIT
;
632 static int graph_is_mapping_correct(struct git_graph
*graph
)
637 * The mapping is up to date if each entry is at its target,
638 * or is 1 greater than its target.
639 * (If it is 1 greater than the target, '/' will be printed, so it
640 * will look correct on the next row.)
642 for (i
= 0; i
< graph
->mapping_size
; i
++) {
643 int target
= graph
->mapping
[i
];
646 if (target
== (i
/ 2))
654 static void graph_pad_horizontally(struct git_graph
*graph
, struct strbuf
*sb
,
658 * Add additional spaces to the end of the strbuf, so that all
659 * lines for a particular commit have the same width.
661 * This way, fields printed to the right of the graph will remain
662 * aligned for the entire commit.
665 if (chars_written
>= graph
->width
)
668 extra
= graph
->width
- chars_written
;
669 strbuf_addf(sb
, "%*s", (int) extra
, "");
672 static void graph_output_padding_line(struct git_graph
*graph
,
678 * We could conceivable be called with a NULL commit
679 * if our caller has a bug, and invokes graph_next_line()
680 * immediately after graph_init(), without first calling
681 * graph_update(). Return without outputting anything in this
688 * Output a padding row, that leaves all branch lines unchanged
690 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
691 strbuf_write_column(sb
, &graph
->new_columns
[i
], '|');
692 strbuf_addch(sb
, ' ');
695 graph_pad_horizontally(graph
, sb
, graph
->num_new_columns
* 2);
699 int graph_width(struct git_graph
*graph
)
705 static void graph_output_skip_line(struct git_graph
*graph
, struct strbuf
*sb
)
708 * Output an ellipsis to indicate that a portion
709 * of the graph is missing.
711 strbuf_addstr(sb
, "...");
712 graph_pad_horizontally(graph
, sb
, 3);
714 if (graph
->num_parents
>= 3 &&
715 graph
->commit_index
< (graph
->num_columns
- 1))
716 graph_update_state(graph
, GRAPH_PRE_COMMIT
);
718 graph_update_state(graph
, GRAPH_COMMIT
);
721 static void graph_output_pre_commit_line(struct git_graph
*graph
,
724 int num_expansion_rows
;
729 * This function formats a row that increases the space around a commit
730 * with multiple parents, to make room for it. It should only be
731 * called when there are 3 or more parents.
733 * We need 2 extra rows for every parent over 2.
735 assert(graph
->num_parents
>= 3);
736 num_expansion_rows
= (graph
->num_parents
- 2) * 2;
739 * graph->expansion_row tracks the current expansion row we are on.
740 * It should be in the range [0, num_expansion_rows - 1]
742 assert(0 <= graph
->expansion_row
&&
743 graph
->expansion_row
< num_expansion_rows
);
750 for (i
= 0; i
< graph
->num_columns
; i
++) {
751 struct column
*col
= &graph
->columns
[i
];
752 if (col
->commit
== graph
->commit
) {
754 strbuf_write_column(sb
, col
, '|');
755 strbuf_addf(sb
, "%*s", graph
->expansion_row
, "");
756 chars_written
+= 1 + 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 strbuf_write_column(sb
, col
, '\\');
771 strbuf_write_column(sb
, col
, '|');
773 } else if (seen_this
&& (graph
->expansion_row
> 0)) {
774 strbuf_write_column(sb
, col
, '\\');
777 strbuf_write_column(sb
, col
, '|');
780 strbuf_addch(sb
, ' ');
784 graph_pad_horizontally(graph
, sb
, chars_written
);
787 * Increment graph->expansion_row,
788 * and move to state GRAPH_COMMIT if necessary
790 graph
->expansion_row
++;
791 if (graph
->expansion_row
>= num_expansion_rows
)
792 graph_update_state(graph
, GRAPH_COMMIT
);
795 static void graph_output_commit_char(struct git_graph
*graph
, struct strbuf
*sb
)
798 * For boundary commits, print 'o'
799 * (We should only see boundary commits when revs->boundary is set.)
801 if (graph
->commit
->object
.flags
& BOUNDARY
) {
802 assert(graph
->revs
->boundary
);
803 strbuf_addch(sb
, 'o');
808 * get_revision_mark() handles all other cases without assert()
810 strbuf_addstr(sb
, get_revision_mark(graph
->revs
, graph
->commit
));
814 * Draw an octopus merge and return the number of characters written.
816 static int graph_draw_octopus_merge(struct git_graph
*graph
,
820 * Here dashless_commits represents the number of parents
821 * which don't need to have dashes (because their edges fit
822 * neatly under the commit).
824 const int dashless_commits
= 2;
827 ((graph
->num_parents
- dashless_commits
) * 2) - 1;
828 for (i
= 0; i
< num_dashes
; i
++) {
829 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
830 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '-');
832 col_num
= (i
/ 2) + dashless_commits
+ graph
->commit_index
;
833 strbuf_write_column(sb
, &graph
->new_columns
[col_num
], '.');
834 return num_dashes
+ 1;
837 static void graph_output_commit_line(struct git_graph
*graph
, struct strbuf
*sb
)
840 int i
, chars_written
;
843 * Output the row containing this commit
844 * Iterate up to and including graph->num_columns,
845 * since the current commit may not be in any of the existing
846 * columns. (This happens when the current commit doesn't have any
847 * children that we have already processed.)
851 for (i
= 0; i
<= graph
->num_columns
; i
++) {
852 struct column
*col
= &graph
->columns
[i
];
853 struct commit
*col_commit
;
854 if (i
== graph
->num_columns
) {
857 col_commit
= graph
->commit
;
859 col_commit
= graph
->columns
[i
].commit
;
862 if (col_commit
== graph
->commit
) {
864 graph_output_commit_char(graph
, sb
);
867 if (graph
->num_parents
> 2)
868 chars_written
+= graph_draw_octopus_merge(graph
,
870 } else if (seen_this
&& (graph
->num_parents
> 2)) {
871 strbuf_write_column(sb
, col
, '\\');
873 } else if (seen_this
&& (graph
->num_parents
== 2)) {
875 * This is a 2-way merge commit.
876 * There is no GRAPH_PRE_COMMIT stage for 2-way
877 * merges, so this is the first line of output
878 * for this commit. Check to see what the previous
879 * line of output was.
881 * If it was GRAPH_POST_MERGE, the branch line
882 * coming into this commit may have been '\',
883 * and not '|' or '/'. If so, output the branch
884 * line as '\' on this line, instead of '|'. This
885 * makes the output look nicer.
887 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
888 graph
->prev_commit_index
< i
)
889 strbuf_write_column(sb
, col
, '\\');
891 strbuf_write_column(sb
, col
, '|');
894 strbuf_write_column(sb
, col
, '|');
897 strbuf_addch(sb
, ' ');
901 graph_pad_horizontally(graph
, sb
, chars_written
);
904 * Update graph->state
906 if (graph
->num_parents
> 1)
907 graph_update_state(graph
, GRAPH_POST_MERGE
);
908 else if (graph_is_mapping_correct(graph
))
909 graph_update_state(graph
, GRAPH_PADDING
);
911 graph_update_state(graph
, GRAPH_COLLAPSING
);
914 static struct column
*find_new_column_by_commit(struct git_graph
*graph
,
915 struct commit
*commit
)
918 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
919 if (graph
->new_columns
[i
].commit
== commit
)
920 return &graph
->new_columns
[i
];
925 static void graph_output_post_merge_line(struct git_graph
*graph
, struct strbuf
*sb
)
928 int i
, j
, chars_written
;
931 * Output the post-merge row
934 for (i
= 0; i
<= graph
->num_columns
; i
++) {
935 struct column
*col
= &graph
->columns
[i
];
936 struct commit
*col_commit
;
937 if (i
== graph
->num_columns
) {
940 col_commit
= graph
->commit
;
942 col_commit
= col
->commit
;
945 if (col_commit
== graph
->commit
) {
947 * Since the current commit is a merge find
948 * the columns for the parent commits in
949 * new_columns and use those to format the
952 struct commit_list
*parents
= NULL
;
953 struct column
*par_column
;
955 parents
= first_interesting_parent(graph
);
957 par_column
= find_new_column_by_commit(graph
, parents
->item
);
960 strbuf_write_column(sb
, par_column
, '|');
962 for (j
= 0; j
< graph
->num_parents
- 1; j
++) {
963 parents
= next_interesting_parent(graph
, parents
);
965 par_column
= find_new_column_by_commit(graph
, parents
->item
);
967 strbuf_write_column(sb
, par_column
, '\\');
968 strbuf_addch(sb
, ' ');
970 chars_written
+= j
* 2;
971 } else if (seen_this
) {
972 strbuf_write_column(sb
, col
, '\\');
973 strbuf_addch(sb
, ' ');
976 strbuf_write_column(sb
, col
, '|');
977 strbuf_addch(sb
, ' ');
982 graph_pad_horizontally(graph
, sb
, chars_written
);
985 * Update graph->state
987 if (graph_is_mapping_correct(graph
))
988 graph_update_state(graph
, GRAPH_PADDING
);
990 graph_update_state(graph
, GRAPH_COLLAPSING
);
993 static void graph_output_collapsing_line(struct git_graph
*graph
, struct strbuf
*sb
)
996 short used_horizontal
= 0;
997 int horizontal_edge
= -1;
998 int horizontal_edge_target
= -1;
1001 * Clear out the new_mapping array
1003 for (i
= 0; i
< graph
->mapping_size
; i
++)
1004 graph
->new_mapping
[i
] = -1;
1006 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1007 int target
= graph
->mapping
[i
];
1012 * Since update_columns() always inserts the leftmost
1013 * column first, each branch's target location should
1014 * always be either its current location or to the left of
1015 * its current location.
1017 * We never have to move branches to the right. This makes
1018 * the graph much more legible, since whenever branches
1019 * cross, only one is moving directions.
1021 assert(target
* 2 <= i
);
1023 if (target
* 2 == i
) {
1025 * This column is already in the
1028 assert(graph
->new_mapping
[i
] == -1);
1029 graph
->new_mapping
[i
] = target
;
1030 } else if (graph
->new_mapping
[i
- 1] < 0) {
1032 * Nothing is to the left.
1033 * Move to the left by one
1035 graph
->new_mapping
[i
- 1] = target
;
1037 * If there isn't already an edge moving horizontally
1040 if (horizontal_edge
== -1) {
1042 horizontal_edge
= i
;
1043 horizontal_edge_target
= target
;
1045 * The variable target is the index of the graph
1046 * column, and therefore target*2+3 is the
1047 * actual screen column of the first horizontal
1050 for (j
= (target
* 2)+3; j
< (i
- 2); j
+= 2)
1051 graph
->new_mapping
[j
] = target
;
1053 } else if (graph
->new_mapping
[i
- 1] == target
) {
1055 * There is a branch line to our left
1056 * already, and it is our target. We
1057 * combine with this line, since we share
1058 * the same parent commit.
1060 * We don't have to add anything to the
1061 * output or new_mapping, since the
1062 * existing branch line has already taken
1067 * There is a branch line to our left,
1068 * but it isn't our target. We need to
1071 * The space just to the left of this
1072 * branch should always be empty.
1074 * The branch to the left of that space
1075 * should be our eventual target.
1077 assert(graph
->new_mapping
[i
- 1] > target
);
1078 assert(graph
->new_mapping
[i
- 2] < 0);
1079 assert(graph
->new_mapping
[i
- 3] == target
);
1080 graph
->new_mapping
[i
- 2] = target
;
1082 * Mark this branch as the horizontal edge to
1083 * prevent any other edges from moving
1086 if (horizontal_edge
== -1)
1087 horizontal_edge
= i
;
1092 * The new mapping may be 1 smaller than the old mapping
1094 if (graph
->new_mapping
[graph
->mapping_size
- 1] < 0)
1095 graph
->mapping_size
--;
1098 * Output out a line based on the new mapping info
1100 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1101 int target
= graph
->new_mapping
[i
];
1103 strbuf_addch(sb
, ' ');
1104 else if (target
* 2 == i
)
1105 strbuf_write_column(sb
, &graph
->new_columns
[target
], '|');
1106 else if (target
== horizontal_edge_target
&&
1107 i
!= horizontal_edge
- 1) {
1109 * Set the mappings for all but the
1110 * first segment to -1 so that they
1111 * won't continue into the next line.
1113 if (i
!= (target
* 2)+3)
1114 graph
->new_mapping
[i
] = -1;
1115 used_horizontal
= 1;
1116 strbuf_write_column(sb
, &graph
->new_columns
[target
], '_');
1118 if (used_horizontal
&& i
< horizontal_edge
)
1119 graph
->new_mapping
[i
] = -1;
1120 strbuf_write_column(sb
, &graph
->new_columns
[target
], '/');
1125 graph_pad_horizontally(graph
, sb
, graph
->mapping_size
);
1128 * Swap mapping and new_mapping
1130 SWAP(graph
->mapping
, graph
->new_mapping
);
1133 * If graph->mapping indicates that all of the branch lines
1134 * are already in the correct positions, we are done.
1135 * Otherwise, we need to collapse some branch lines together.
1137 if (graph_is_mapping_correct(graph
))
1138 graph_update_state(graph
, GRAPH_PADDING
);
1141 int graph_next_line(struct git_graph
*graph
, struct strbuf
*sb
)
1143 switch (graph
->state
) {
1145 graph_output_padding_line(graph
, sb
);
1148 graph_output_skip_line(graph
, sb
);
1150 case GRAPH_PRE_COMMIT
:
1151 graph_output_pre_commit_line(graph
, sb
);
1154 graph_output_commit_line(graph
, sb
);
1156 case GRAPH_POST_MERGE
:
1157 graph_output_post_merge_line(graph
, sb
);
1159 case GRAPH_COLLAPSING
:
1160 graph_output_collapsing_line(graph
, sb
);
1168 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
)
1171 int chars_written
= 0;
1173 if (graph
->state
!= GRAPH_COMMIT
) {
1174 graph_next_line(graph
, sb
);
1179 * Output the row containing this commit
1180 * Iterate up to and including graph->num_columns,
1181 * since the current commit may not be in any of the existing
1182 * columns. (This happens when the current commit doesn't have any
1183 * children that we have already processed.)
1185 for (i
= 0; i
< graph
->num_columns
; i
++) {
1186 struct column
*col
= &graph
->columns
[i
];
1188 strbuf_write_column(sb
, col
, '|');
1191 if (col
->commit
== graph
->commit
&& graph
->num_parents
> 2) {
1192 int len
= (graph
->num_parents
- 2) * 2;
1193 strbuf_addchars(sb
, ' ', len
);
1194 chars_written
+= len
;
1196 strbuf_addch(sb
, ' ');
1201 graph_pad_horizontally(graph
, sb
, chars_written
);
1204 * Update graph->prev_state since we have output a padding line
1206 graph
->prev_state
= GRAPH_PADDING
;
1209 int graph_is_commit_finished(struct git_graph
const *graph
)
1211 return (graph
->state
== GRAPH_PADDING
);
1214 void graph_show_commit(struct git_graph
*graph
)
1216 struct strbuf msgbuf
= STRBUF_INIT
;
1217 int shown_commit_line
= 0;
1219 graph_show_line_prefix(default_diffopt
);
1225 * When showing a diff of a merge against each of its parents, we
1226 * are called once for each parent without graph_update having been
1227 * called. In this case, simply output a single padding line.
1229 if (graph_is_commit_finished(graph
)) {
1230 graph_show_padding(graph
);
1231 shown_commit_line
= 1;
1234 while (!shown_commit_line
&& !graph_is_commit_finished(graph
)) {
1235 shown_commit_line
= graph_next_line(graph
, &msgbuf
);
1236 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
,
1237 graph
->revs
->diffopt
.file
);
1238 if (!shown_commit_line
) {
1239 putc('\n', graph
->revs
->diffopt
.file
);
1240 graph_show_line_prefix(&graph
->revs
->diffopt
);
1242 strbuf_setlen(&msgbuf
, 0);
1245 strbuf_release(&msgbuf
);
1248 void graph_show_oneline(struct git_graph
*graph
)
1250 struct strbuf msgbuf
= STRBUF_INIT
;
1252 graph_show_line_prefix(default_diffopt
);
1257 graph_next_line(graph
, &msgbuf
);
1258 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, graph
->revs
->diffopt
.file
);
1259 strbuf_release(&msgbuf
);
1262 void graph_show_padding(struct git_graph
*graph
)
1264 struct strbuf msgbuf
= STRBUF_INIT
;
1266 graph_show_line_prefix(default_diffopt
);
1271 graph_padding_line(graph
, &msgbuf
);
1272 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, graph
->revs
->diffopt
.file
);
1273 strbuf_release(&msgbuf
);
1276 int graph_show_remainder(struct git_graph
*graph
)
1278 struct strbuf msgbuf
= STRBUF_INIT
;
1281 graph_show_line_prefix(default_diffopt
);
1286 if (graph_is_commit_finished(graph
))
1290 graph_next_line(graph
, &msgbuf
);
1291 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
,
1292 graph
->revs
->diffopt
.file
);
1293 strbuf_setlen(&msgbuf
, 0);
1296 if (!graph_is_commit_finished(graph
)) {
1297 putc('\n', graph
->revs
->diffopt
.file
);
1298 graph_show_line_prefix(&graph
->revs
->diffopt
);
1303 strbuf_release(&msgbuf
);
1308 static void graph_show_strbuf(struct git_graph
*graph
,
1310 struct strbuf
const *sb
)
1315 * Print the strbuf line by line,
1316 * and display the graph info before each line but the first.
1321 char *next_p
= strchr(p
, '\n');
1326 len
= (sb
->buf
+ sb
->len
) - p
;
1328 fwrite(p
, sizeof(char), len
, file
);
1329 if (next_p
&& *next_p
!= '\0')
1330 graph_show_oneline(graph
);
1335 void graph_show_commit_msg(struct git_graph
*graph
,
1337 struct strbuf
const *sb
)
1339 int newline_terminated
;
1342 * Show the commit message
1344 graph_show_strbuf(graph
, file
, sb
);
1349 newline_terminated
= (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n');
1352 * If there is more output needed for this commit, show it now
1354 if (!graph_is_commit_finished(graph
)) {
1356 * If sb doesn't have a terminating newline, print one now,
1357 * so we can start the remainder of the graph output on a
1360 if (!newline_terminated
)
1363 graph_show_remainder(graph
);
1366 * If sb ends with a newline, our output should too.
1368 if (newline_terminated
)