7 #include "argv-array.h"
12 * Output a padding line in the graph.
13 * This is similar to graph_next_line(). However, it is guaranteed to
14 * never print the current commit line. Instead, if the commit line is
15 * next, it will simply output a line of vertical padding, extending the
16 * branch lines downwards, but leaving them otherwise unchanged.
18 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
);
21 * Print a strbuf. If the graph is non-NULL, all lines but the first will be
22 * prefixed with the graph output.
24 * If the strbuf ends with a newline, the output will end after this
25 * newline. A new graph line will not be printed after the final newline.
26 * If the strbuf is empty, no output will be printed.
28 * Since the first line will not include the graph output, the caller is
29 * responsible for printing this line's graph (perhaps via
30 * graph_show_commit() or graph_show_oneline()) before calling
31 * graph_show_strbuf().
33 * Note that unlike some other graph display functions, you must pass the file
34 * handle directly. It is assumed that this is the same file handle as the
35 * file specified by the graph diff options. This is necessary so that
36 * graph_show_strbuf can be called even with a NULL graph.
38 static void graph_show_strbuf(struct git_graph
*graph
,
40 struct strbuf
const *sb
);
44 * - Limit the number of columns, similar to the way gitk does.
45 * If we reach more than a specified number of columns, omit
46 * sections of some columns.
51 * The parent commit of this column.
53 struct commit
*commit
;
55 * The color to (optionally) print this column in. This is an
56 * index into column_colors.
70 static void graph_show_line_prefix(const struct diff_options
*diffopt
)
72 if (!diffopt
|| !diffopt
->line_prefix
)
75 fwrite(diffopt
->line_prefix
,
77 diffopt
->line_prefix_length
,
81 static const char **column_colors
;
82 static unsigned short column_colors_max
;
84 static void parse_graph_colors_config(struct argv_array
*colors
, const char *string
)
86 const char *end
, *start
;
89 end
= string
+ strlen(string
);
91 const char *comma
= strchrnul(start
, ',');
92 char color
[COLOR_MAXLEN
];
94 if (!color_parse_mem(start
, comma
- start
, color
))
95 argv_array_push(colors
, color
);
97 warning(_("ignore invalid color '%.*s' in log.graphColors"),
98 (int)(comma
- start
), start
);
101 argv_array_push(colors
, GIT_COLOR_RESET
);
104 void graph_set_column_colors(const char **colors
, unsigned short colors_max
)
106 column_colors
= colors
;
107 column_colors_max
= colors_max
;
110 static const char *column_get_color_code(unsigned short color
)
112 return column_colors
[color
];
115 static void strbuf_write_column(struct strbuf
*sb
, const struct column
*c
,
118 if (c
->color
< column_colors_max
)
119 strbuf_addstr(sb
, column_get_color_code(c
->color
));
120 strbuf_addch(sb
, col_char
);
121 if (c
->color
< column_colors_max
)
122 strbuf_addstr(sb
, column_get_color_code(column_colors_max
));
127 * The commit currently being processed
129 struct commit
*commit
;
130 /* The rev-info used for the current traversal */
131 struct rev_info
*revs
;
133 * The number of interesting parents that this commit has.
135 * Note that this is not the same as the actual number of parents.
136 * This count excludes parents that won't be printed in the graph
137 * output, as determined by graph_is_interesting().
141 * The width of the graph output for this commit.
142 * All rows for this commit are padded to this width, so that
143 * messages printed after the graph output are aligned.
147 * The next expansion row to print
148 * when state is GRAPH_PRE_COMMIT
152 * The current output state.
153 * This tells us what kind of line graph_next_line() should output.
155 enum graph_state state
;
157 * The output state for the previous line of output.
158 * This is primarily used to determine how the first merge line
159 * should appear, based on the last line of the previous commit.
161 enum graph_state prev_state
;
163 * The index of the column that refers to this commit.
165 * If none of the incoming columns refer to this commit,
166 * this will be equal to num_columns.
170 * The commit_index for the previously displayed commit.
172 * This is used to determine how the first line of a merge
173 * graph output should appear, based on the last line of the
176 int prev_commit_index
;
178 * The maximum number of columns that can be stored in the columns
179 * and new_columns arrays. This is also half the number of entries
180 * that can be stored in the mapping and new_mapping arrays.
184 * The number of columns (also called "branch lines" in some places)
188 * The number of columns in the new_columns array
192 * The number of entries in the mapping array
196 * The column state before we output the current commit.
198 struct column
*columns
;
200 * The new column state after we output the current commit.
201 * Only valid when state is GRAPH_COLLAPSING.
203 struct column
*new_columns
;
205 * An array that tracks the current state of each
206 * character in the output line during state GRAPH_COLLAPSING.
207 * Each entry is -1 if this character is empty, or a non-negative
208 * integer if the character contains a branch line. The value of
209 * the integer indicates the target position for this branch line.
210 * (I.e., this array maps the current column positions to their
211 * desired positions.)
213 * The maximum capacity of this array is always
214 * sizeof(int) * 2 * column_capacity.
218 * A temporary array for computing the next mapping state
219 * while we are outputting a mapping line. This is stored as part
220 * of the git_graph simply so we don't have to allocate a new
221 * temporary array each time we have to output a collapsing line.
225 * The current default column color being used. This is
226 * stored as an index into the array column_colors.
228 unsigned short default_column_color
;
231 static struct strbuf
*diff_output_prefix_callback(struct diff_options
*opt
, void *data
)
233 struct git_graph
*graph
= data
;
234 static struct strbuf msgbuf
= STRBUF_INIT
;
238 strbuf_reset(&msgbuf
);
239 if (opt
->line_prefix
)
240 strbuf_add(&msgbuf
, opt
->line_prefix
,
241 opt
->line_prefix_length
);
243 graph_padding_line(graph
, &msgbuf
);
247 static const struct diff_options
*default_diffopt
;
249 void graph_setup_line_prefix(struct diff_options
*diffopt
)
251 default_diffopt
= diffopt
;
253 /* setup an output prefix callback if necessary */
254 if (diffopt
&& !diffopt
->output_prefix
)
255 diffopt
->output_prefix
= diff_output_prefix_callback
;
259 struct git_graph
*graph_init(struct rev_info
*opt
)
261 struct git_graph
*graph
= xmalloc(sizeof(struct git_graph
));
263 if (!column_colors
) {
265 if (git_config_get_string("log.graphcolors", &string
)) {
266 /* not configured -- use default */
267 graph_set_column_colors(column_colors_ansi
,
268 column_colors_ansi_max
);
270 static struct argv_array custom_colors
= ARGV_ARRAY_INIT
;
271 argv_array_clear(&custom_colors
);
272 parse_graph_colors_config(&custom_colors
, string
);
274 /* graph_set_column_colors takes a max-index, not a count */
275 graph_set_column_colors(custom_colors
.argv
,
276 custom_colors
.argc
- 1);
280 graph
->commit
= NULL
;
282 graph
->num_parents
= 0;
283 graph
->expansion_row
= 0;
284 graph
->state
= GRAPH_PADDING
;
285 graph
->prev_state
= GRAPH_PADDING
;
286 graph
->commit_index
= 0;
287 graph
->prev_commit_index
= 0;
288 graph
->num_columns
= 0;
289 graph
->num_new_columns
= 0;
290 graph
->mapping_size
= 0;
292 * Start the column color at the maximum value, since we'll
293 * always increment it for the first commit we output.
294 * This way we start at 0 for the first commit.
296 graph
->default_column_color
= column_colors_max
- 1;
299 * Allocate a reasonably large default number of columns
300 * We'll automatically grow columns later if we need more room.
302 graph
->column_capacity
= 30;
303 ALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
304 ALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
305 ALLOC_ARRAY(graph
->mapping
, 2 * graph
->column_capacity
);
306 ALLOC_ARRAY(graph
->new_mapping
, 2 * graph
->column_capacity
);
309 * The diff output prefix callback, with this we can make
310 * all the diff output to align with the graph lines.
312 opt
->diffopt
.output_prefix
= diff_output_prefix_callback
;
313 opt
->diffopt
.output_prefix_data
= graph
;
318 static void graph_update_state(struct git_graph
*graph
, enum graph_state s
)
320 graph
->prev_state
= graph
->state
;
324 static void graph_ensure_capacity(struct git_graph
*graph
, int num_columns
)
326 if (graph
->column_capacity
>= num_columns
)
330 graph
->column_capacity
*= 2;
331 } while (graph
->column_capacity
< num_columns
);
333 REALLOC_ARRAY(graph
->columns
, graph
->column_capacity
);
334 REALLOC_ARRAY(graph
->new_columns
, graph
->column_capacity
);
335 REALLOC_ARRAY(graph
->mapping
, graph
->column_capacity
* 2);
336 REALLOC_ARRAY(graph
->new_mapping
, graph
->column_capacity
* 2);
340 * Returns 1 if the commit will be printed in the graph output,
343 static int graph_is_interesting(struct git_graph
*graph
, struct commit
*commit
)
346 * If revs->boundary is set, commits whose children have
347 * been shown are always interesting, even if they have the
348 * UNINTERESTING or TREESAME flags set.
350 if (graph
->revs
&& graph
->revs
->boundary
) {
351 if (commit
->object
.flags
& CHILD_SHOWN
)
356 * Otherwise, use get_commit_action() to see if this commit is
359 return get_commit_action(graph
->revs
, commit
) == commit_show
;
362 static struct commit_list
*next_interesting_parent(struct git_graph
*graph
,
363 struct commit_list
*orig
)
365 struct commit_list
*list
;
368 * If revs->first_parent_only is set, only the first
369 * parent is interesting. None of the others are.
371 if (graph
->revs
->first_parent_only
)
375 * Return the next interesting commit after orig
377 for (list
= orig
->next
; list
; list
= list
->next
) {
378 if (graph_is_interesting(graph
, list
->item
))
385 static struct commit_list
*first_interesting_parent(struct git_graph
*graph
)
387 struct commit_list
*parents
= graph
->commit
->parents
;
390 * If this commit has no parents, ignore it
396 * If the first parent is interesting, return it
398 if (graph_is_interesting(graph
, parents
->item
))
402 * Otherwise, call next_interesting_parent() to get
403 * the next interesting parent
405 return next_interesting_parent(graph
, parents
);
408 static unsigned short graph_get_current_column_color(const struct git_graph
*graph
)
410 if (!want_color(graph
->revs
->diffopt
.use_color
))
411 return column_colors_max
;
412 return graph
->default_column_color
;
416 * Update the graph's default column color.
418 static void graph_increment_column_color(struct git_graph
*graph
)
420 graph
->default_column_color
= (graph
->default_column_color
+ 1) %
424 static unsigned short graph_find_commit_color(const struct git_graph
*graph
,
425 const struct commit
*commit
)
428 for (i
= 0; i
< graph
->num_columns
; i
++) {
429 if (graph
->columns
[i
].commit
== commit
)
430 return graph
->columns
[i
].color
;
432 return graph_get_current_column_color(graph
);
435 static void graph_insert_into_new_columns(struct git_graph
*graph
,
436 struct commit
*commit
,
442 * If the commit is already in the new_columns list, we don't need to
443 * add it. Just update the mapping correctly.
445 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
446 if (graph
->new_columns
[i
].commit
== commit
) {
447 graph
->mapping
[*mapping_index
] = i
;
454 * This commit isn't already in new_columns. Add it.
456 graph
->new_columns
[graph
->num_new_columns
].commit
= commit
;
457 graph
->new_columns
[graph
->num_new_columns
].color
= graph_find_commit_color(graph
, commit
);
458 graph
->mapping
[*mapping_index
] = graph
->num_new_columns
;
460 graph
->num_new_columns
++;
463 static void graph_update_width(struct git_graph
*graph
,
464 int is_commit_in_existing_columns
)
467 * Compute the width needed to display the graph for this commit.
468 * This is the maximum width needed for any row. All other rows
469 * will be padded to this width.
471 * Compute the number of columns in the widest row:
472 * Count each existing column (graph->num_columns), and each new
473 * column added by this commit.
475 int max_cols
= graph
->num_columns
+ graph
->num_parents
;
478 * Even if the current commit has no parents to be printed, it
479 * still takes up a column for itself.
481 if (graph
->num_parents
< 1)
485 * We added a column for the current commit as part of
486 * graph->num_parents. If the current commit was already in
487 * graph->columns, then we have double counted it.
489 if (is_commit_in_existing_columns
)
493 * Each column takes up 2 spaces
495 graph
->width
= max_cols
* 2;
498 static void graph_update_columns(struct git_graph
*graph
)
500 struct commit_list
*parent
;
503 int i
, seen_this
, is_commit_in_columns
;
506 * Swap graph->columns with graph->new_columns
507 * graph->columns contains the state for the previous commit,
508 * and new_columns now contains the state for our commit.
510 * We'll re-use the old columns array as storage to compute the new
511 * columns list for the commit after this one.
513 SWAP(graph
->columns
, graph
->new_columns
);
514 graph
->num_columns
= graph
->num_new_columns
;
515 graph
->num_new_columns
= 0;
518 * Now update new_columns and mapping with the information for the
519 * commit after this one.
521 * First, make sure we have enough room. At most, there will
522 * be graph->num_columns + graph->num_parents columns for the next
525 max_new_columns
= graph
->num_columns
+ graph
->num_parents
;
526 graph_ensure_capacity(graph
, max_new_columns
);
529 * Clear out graph->mapping
531 graph
->mapping_size
= 2 * max_new_columns
;
532 for (i
= 0; i
< graph
->mapping_size
; i
++)
533 graph
->mapping
[i
] = -1;
536 * Populate graph->new_columns and graph->mapping
538 * Some of the parents of this commit may already be in
539 * graph->columns. If so, graph->new_columns should only contain a
540 * single entry for each such commit. graph->mapping should
541 * contain information about where each current branch line is
542 * supposed to end up after the collapsing is performed.
546 is_commit_in_columns
= 1;
547 for (i
= 0; i
<= graph
->num_columns
; i
++) {
548 struct commit
*col_commit
;
549 if (i
== graph
->num_columns
) {
552 is_commit_in_columns
= 0;
553 col_commit
= graph
->commit
;
555 col_commit
= graph
->columns
[i
].commit
;
558 if (col_commit
== graph
->commit
) {
559 int old_mapping_idx
= mapping_idx
;
561 graph
->commit_index
= i
;
562 for (parent
= first_interesting_parent(graph
);
564 parent
= next_interesting_parent(graph
, parent
)) {
566 * If this is a merge, or the start of a new
567 * childless column, increment the current
570 if (graph
->num_parents
> 1 ||
571 !is_commit_in_columns
) {
572 graph_increment_column_color(graph
);
574 graph_insert_into_new_columns(graph
,
579 * We always need to increment mapping_idx by at
580 * least 2, even if it has no interesting parents.
581 * The current commit always takes up at least 2
584 if (mapping_idx
== old_mapping_idx
)
587 graph_insert_into_new_columns(graph
, col_commit
,
593 * Shrink mapping_size to be the minimum necessary
595 while (graph
->mapping_size
> 1 &&
596 graph
->mapping
[graph
->mapping_size
- 1] < 0)
597 graph
->mapping_size
--;
600 * Compute graph->width for this commit
602 graph_update_width(graph
, is_commit_in_columns
);
605 void graph_update(struct git_graph
*graph
, struct commit
*commit
)
607 struct commit_list
*parent
;
612 graph
->commit
= commit
;
615 * Count how many interesting parents this commit has
617 graph
->num_parents
= 0;
618 for (parent
= first_interesting_parent(graph
);
620 parent
= next_interesting_parent(graph
, parent
))
622 graph
->num_parents
++;
626 * Store the old commit_index in prev_commit_index.
627 * graph_update_columns() will update graph->commit_index for this
630 graph
->prev_commit_index
= graph
->commit_index
;
633 * Call graph_update_columns() to update
634 * columns, new_columns, and mapping.
636 graph_update_columns(graph
);
638 graph
->expansion_row
= 0;
641 * Update graph->state.
642 * Note that we don't call graph_update_state() here, since
643 * we don't want to update graph->prev_state. No line for
644 * graph->state was ever printed.
646 * If the previous commit didn't get to the GRAPH_PADDING state,
647 * it never finished its output. Goto GRAPH_SKIP, to print out
648 * a line to indicate that portion of the graph is missing.
650 * If there are 3 or more parents, we may need to print extra rows
651 * before the commit, to expand the branch lines around it and make
652 * room for it. We need to do this only if there is a branch row
653 * (or more) to the right of this commit.
655 * If there are less than 3 parents, we can immediately print the
658 if (graph
->state
!= GRAPH_PADDING
)
659 graph
->state
= GRAPH_SKIP
;
660 else if (graph
->num_parents
>= 3 &&
661 graph
->commit_index
< (graph
->num_columns
- 1))
662 graph
->state
= GRAPH_PRE_COMMIT
;
664 graph
->state
= GRAPH_COMMIT
;
667 static int graph_is_mapping_correct(struct git_graph
*graph
)
672 * The mapping is up to date if each entry is at its target,
673 * or is 1 greater than its target.
674 * (If it is 1 greater than the target, '/' will be printed, so it
675 * will look correct on the next row.)
677 for (i
= 0; i
< graph
->mapping_size
; i
++) {
678 int target
= graph
->mapping
[i
];
681 if (target
== (i
/ 2))
689 static void graph_pad_horizontally(struct git_graph
*graph
, struct strbuf
*sb
,
693 * Add additional spaces to the end of the strbuf, so that all
694 * lines for a particular commit have the same width.
696 * This way, fields printed to the right of the graph will remain
697 * aligned for the entire commit.
699 if (chars_written
< graph
->width
)
700 strbuf_addchars(sb
, ' ', graph
->width
- chars_written
);
703 static void graph_output_padding_line(struct git_graph
*graph
,
709 * We could conceivable be called with a NULL commit
710 * if our caller has a bug, and invokes graph_next_line()
711 * immediately after graph_init(), without first calling
712 * graph_update(). Return without outputting anything in this
719 * Output a padding row, that leaves all branch lines unchanged
721 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
722 strbuf_write_column(sb
, &graph
->new_columns
[i
], '|');
723 strbuf_addch(sb
, ' ');
726 graph_pad_horizontally(graph
, sb
, graph
->num_new_columns
* 2);
730 int graph_width(struct git_graph
*graph
)
736 static void graph_output_skip_line(struct git_graph
*graph
, struct strbuf
*sb
)
739 * Output an ellipsis to indicate that a portion
740 * of the graph is missing.
742 strbuf_addstr(sb
, "...");
743 graph_pad_horizontally(graph
, sb
, 3);
745 if (graph
->num_parents
>= 3 &&
746 graph
->commit_index
< (graph
->num_columns
- 1))
747 graph_update_state(graph
, GRAPH_PRE_COMMIT
);
749 graph_update_state(graph
, GRAPH_COMMIT
);
752 static void graph_output_pre_commit_line(struct git_graph
*graph
,
755 int num_expansion_rows
;
760 * This function formats a row that increases the space around a commit
761 * with multiple parents, to make room for it. It should only be
762 * called when there are 3 or more parents.
764 * We need 2 extra rows for every parent over 2.
766 assert(graph
->num_parents
>= 3);
767 num_expansion_rows
= (graph
->num_parents
- 2) * 2;
770 * graph->expansion_row tracks the current expansion row we are on.
771 * It should be in the range [0, num_expansion_rows - 1]
773 assert(0 <= graph
->expansion_row
&&
774 graph
->expansion_row
< num_expansion_rows
);
781 for (i
= 0; i
< graph
->num_columns
; i
++) {
782 struct column
*col
= &graph
->columns
[i
];
783 if (col
->commit
== graph
->commit
) {
785 strbuf_write_column(sb
, col
, '|');
786 strbuf_addchars(sb
, ' ', graph
->expansion_row
);
787 chars_written
+= 1 + graph
->expansion_row
;
788 } else if (seen_this
&& (graph
->expansion_row
== 0)) {
790 * This is the first line of the pre-commit output.
791 * If the previous commit was a merge commit and
792 * ended in the GRAPH_POST_MERGE state, all branch
793 * lines after graph->prev_commit_index were
794 * printed as "\" on the previous line. Continue
795 * to print them as "\" on this line. Otherwise,
796 * print the branch lines as "|".
798 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
799 graph
->prev_commit_index
< i
)
800 strbuf_write_column(sb
, col
, '\\');
802 strbuf_write_column(sb
, col
, '|');
804 } else if (seen_this
&& (graph
->expansion_row
> 0)) {
805 strbuf_write_column(sb
, col
, '\\');
808 strbuf_write_column(sb
, col
, '|');
811 strbuf_addch(sb
, ' ');
815 graph_pad_horizontally(graph
, sb
, chars_written
);
818 * Increment graph->expansion_row,
819 * and move to state GRAPH_COMMIT if necessary
821 graph
->expansion_row
++;
822 if (graph
->expansion_row
>= num_expansion_rows
)
823 graph_update_state(graph
, GRAPH_COMMIT
);
826 static void graph_output_commit_char(struct git_graph
*graph
, struct strbuf
*sb
)
829 * For boundary commits, print 'o'
830 * (We should only see boundary commits when revs->boundary is set.)
832 if (graph
->commit
->object
.flags
& BOUNDARY
) {
833 assert(graph
->revs
->boundary
);
834 strbuf_addch(sb
, 'o');
839 * get_revision_mark() handles all other cases without assert()
841 strbuf_addstr(sb
, get_revision_mark(graph
->revs
, graph
->commit
));
845 * Draw the horizontal dashes of an octopus merge and return the number of
846 * characters written.
848 static int graph_draw_octopus_merge(struct git_graph
*graph
,
852 * Here dashless_parents represents the number of parents which don't
853 * need to have dashes (the edges labeled "0" and "1"). And
854 * dashful_parents are the remaining ones.
862 const int dashless_parents
= 2;
863 int dashful_parents
= graph
->num_parents
- dashless_parents
;
866 * Usually, we add one new column for each parent (like the diagram
867 * above) but sometimes the first parent goes into an existing column,
875 * In which case the number of parents will be one greater than the
876 * number of added columns.
878 int added_cols
= (graph
->num_new_columns
- graph
->num_columns
);
879 int parent_in_old_cols
= graph
->num_parents
- added_cols
;
882 * In both cases, commit_index corresponds to the edge labeled "0".
884 int first_col
= graph
->commit_index
+ dashless_parents
885 - parent_in_old_cols
;
888 for (i
= 0; i
< dashful_parents
; i
++) {
889 strbuf_write_column(sb
, &graph
->new_columns
[i
+first_col
], '-');
890 strbuf_write_column(sb
, &graph
->new_columns
[i
+first_col
],
891 i
== dashful_parents
-1 ? '.' : '-');
893 return 2 * dashful_parents
;
896 static void graph_output_commit_line(struct git_graph
*graph
, struct strbuf
*sb
)
899 int i
, chars_written
;
902 * Output the row containing this commit
903 * Iterate up to and including graph->num_columns,
904 * since the current commit may not be in any of the existing
905 * columns. (This happens when the current commit doesn't have any
906 * children that we have already processed.)
910 for (i
= 0; i
<= graph
->num_columns
; i
++) {
911 struct column
*col
= &graph
->columns
[i
];
912 struct commit
*col_commit
;
913 if (i
== graph
->num_columns
) {
916 col_commit
= graph
->commit
;
918 col_commit
= graph
->columns
[i
].commit
;
921 if (col_commit
== graph
->commit
) {
923 graph_output_commit_char(graph
, sb
);
926 if (graph
->num_parents
> 2)
927 chars_written
+= graph_draw_octopus_merge(graph
,
929 } else if (seen_this
&& (graph
->num_parents
> 2)) {
930 strbuf_write_column(sb
, col
, '\\');
932 } else if (seen_this
&& (graph
->num_parents
== 2)) {
934 * This is a 2-way merge commit.
935 * There is no GRAPH_PRE_COMMIT stage for 2-way
936 * merges, so this is the first line of output
937 * for this commit. Check to see what the previous
938 * line of output was.
940 * If it was GRAPH_POST_MERGE, the branch line
941 * coming into this commit may have been '\',
942 * and not '|' or '/'. If so, output the branch
943 * line as '\' on this line, instead of '|'. This
944 * makes the output look nicer.
946 if (graph
->prev_state
== GRAPH_POST_MERGE
&&
947 graph
->prev_commit_index
< i
)
948 strbuf_write_column(sb
, col
, '\\');
950 strbuf_write_column(sb
, col
, '|');
953 strbuf_write_column(sb
, col
, '|');
956 strbuf_addch(sb
, ' ');
960 graph_pad_horizontally(graph
, sb
, chars_written
);
963 * Update graph->state
965 if (graph
->num_parents
> 1)
966 graph_update_state(graph
, GRAPH_POST_MERGE
);
967 else if (graph_is_mapping_correct(graph
))
968 graph_update_state(graph
, GRAPH_PADDING
);
970 graph_update_state(graph
, GRAPH_COLLAPSING
);
973 static struct column
*find_new_column_by_commit(struct git_graph
*graph
,
974 struct commit
*commit
)
977 for (i
= 0; i
< graph
->num_new_columns
; i
++) {
978 if (graph
->new_columns
[i
].commit
== commit
)
979 return &graph
->new_columns
[i
];
984 static void graph_output_post_merge_line(struct git_graph
*graph
, struct strbuf
*sb
)
987 int i
, j
, chars_written
;
990 * Output the post-merge row
993 for (i
= 0; i
<= graph
->num_columns
; i
++) {
994 struct column
*col
= &graph
->columns
[i
];
995 struct commit
*col_commit
;
996 if (i
== graph
->num_columns
) {
999 col_commit
= graph
->commit
;
1001 col_commit
= col
->commit
;
1004 if (col_commit
== graph
->commit
) {
1006 * Since the current commit is a merge find
1007 * the columns for the parent commits in
1008 * new_columns and use those to format the
1011 struct commit_list
*parents
= NULL
;
1012 struct column
*par_column
;
1014 parents
= first_interesting_parent(graph
);
1016 par_column
= find_new_column_by_commit(graph
, parents
->item
);
1019 strbuf_write_column(sb
, par_column
, '|');
1021 for (j
= 0; j
< graph
->num_parents
- 1; j
++) {
1022 parents
= next_interesting_parent(graph
, parents
);
1024 par_column
= find_new_column_by_commit(graph
, parents
->item
);
1026 strbuf_write_column(sb
, par_column
, '\\');
1027 strbuf_addch(sb
, ' ');
1029 chars_written
+= j
* 2;
1030 } else if (seen_this
) {
1031 strbuf_write_column(sb
, col
, '\\');
1032 strbuf_addch(sb
, ' ');
1035 strbuf_write_column(sb
, col
, '|');
1036 strbuf_addch(sb
, ' ');
1041 graph_pad_horizontally(graph
, sb
, chars_written
);
1044 * Update graph->state
1046 if (graph_is_mapping_correct(graph
))
1047 graph_update_state(graph
, GRAPH_PADDING
);
1049 graph_update_state(graph
, GRAPH_COLLAPSING
);
1052 static void graph_output_collapsing_line(struct git_graph
*graph
, struct strbuf
*sb
)
1055 short used_horizontal
= 0;
1056 int horizontal_edge
= -1;
1057 int horizontal_edge_target
= -1;
1060 * Clear out the new_mapping array
1062 for (i
= 0; i
< graph
->mapping_size
; i
++)
1063 graph
->new_mapping
[i
] = -1;
1065 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1066 int target
= graph
->mapping
[i
];
1071 * Since update_columns() always inserts the leftmost
1072 * column first, each branch's target location should
1073 * always be either its current location or to the left of
1074 * its current location.
1076 * We never have to move branches to the right. This makes
1077 * the graph much more legible, since whenever branches
1078 * cross, only one is moving directions.
1080 assert(target
* 2 <= i
);
1082 if (target
* 2 == i
) {
1084 * This column is already in the
1087 assert(graph
->new_mapping
[i
] == -1);
1088 graph
->new_mapping
[i
] = target
;
1089 } else if (graph
->new_mapping
[i
- 1] < 0) {
1091 * Nothing is to the left.
1092 * Move to the left by one
1094 graph
->new_mapping
[i
- 1] = target
;
1096 * If there isn't already an edge moving horizontally
1099 if (horizontal_edge
== -1) {
1101 horizontal_edge
= i
;
1102 horizontal_edge_target
= target
;
1104 * The variable target is the index of the graph
1105 * column, and therefore target*2+3 is the
1106 * actual screen column of the first horizontal
1109 for (j
= (target
* 2)+3; j
< (i
- 2); j
+= 2)
1110 graph
->new_mapping
[j
] = target
;
1112 } else if (graph
->new_mapping
[i
- 1] == target
) {
1114 * There is a branch line to our left
1115 * already, and it is our target. We
1116 * combine with this line, since we share
1117 * the same parent commit.
1119 * We don't have to add anything to the
1120 * output or new_mapping, since the
1121 * existing branch line has already taken
1126 * There is a branch line to our left,
1127 * but it isn't our target. We need to
1130 * The space just to the left of this
1131 * branch should always be empty.
1133 * The branch to the left of that space
1134 * should be our eventual target.
1136 assert(graph
->new_mapping
[i
- 1] > target
);
1137 assert(graph
->new_mapping
[i
- 2] < 0);
1138 assert(graph
->new_mapping
[i
- 3] == target
);
1139 graph
->new_mapping
[i
- 2] = target
;
1141 * Mark this branch as the horizontal edge to
1142 * prevent any other edges from moving
1145 if (horizontal_edge
== -1)
1146 horizontal_edge
= i
;
1151 * The new mapping may be 1 smaller than the old mapping
1153 if (graph
->new_mapping
[graph
->mapping_size
- 1] < 0)
1154 graph
->mapping_size
--;
1157 * Output out a line based on the new mapping info
1159 for (i
= 0; i
< graph
->mapping_size
; i
++) {
1160 int target
= graph
->new_mapping
[i
];
1162 strbuf_addch(sb
, ' ');
1163 else if (target
* 2 == i
)
1164 strbuf_write_column(sb
, &graph
->new_columns
[target
], '|');
1165 else if (target
== horizontal_edge_target
&&
1166 i
!= horizontal_edge
- 1) {
1168 * Set the mappings for all but the
1169 * first segment to -1 so that they
1170 * won't continue into the next line.
1172 if (i
!= (target
* 2)+3)
1173 graph
->new_mapping
[i
] = -1;
1174 used_horizontal
= 1;
1175 strbuf_write_column(sb
, &graph
->new_columns
[target
], '_');
1177 if (used_horizontal
&& i
< horizontal_edge
)
1178 graph
->new_mapping
[i
] = -1;
1179 strbuf_write_column(sb
, &graph
->new_columns
[target
], '/');
1184 graph_pad_horizontally(graph
, sb
, graph
->mapping_size
);
1187 * Swap mapping and new_mapping
1189 SWAP(graph
->mapping
, graph
->new_mapping
);
1192 * If graph->mapping indicates that all of the branch lines
1193 * are already in the correct positions, we are done.
1194 * Otherwise, we need to collapse some branch lines together.
1196 if (graph_is_mapping_correct(graph
))
1197 graph_update_state(graph
, GRAPH_PADDING
);
1200 int graph_next_line(struct git_graph
*graph
, struct strbuf
*sb
)
1202 switch (graph
->state
) {
1204 graph_output_padding_line(graph
, sb
);
1207 graph_output_skip_line(graph
, sb
);
1209 case GRAPH_PRE_COMMIT
:
1210 graph_output_pre_commit_line(graph
, sb
);
1213 graph_output_commit_line(graph
, sb
);
1215 case GRAPH_POST_MERGE
:
1216 graph_output_post_merge_line(graph
, sb
);
1218 case GRAPH_COLLAPSING
:
1219 graph_output_collapsing_line(graph
, sb
);
1227 static void graph_padding_line(struct git_graph
*graph
, struct strbuf
*sb
)
1230 int chars_written
= 0;
1232 if (graph
->state
!= GRAPH_COMMIT
) {
1233 graph_next_line(graph
, sb
);
1238 * Output the row containing this commit
1239 * Iterate up to and including graph->num_columns,
1240 * since the current commit may not be in any of the existing
1241 * columns. (This happens when the current commit doesn't have any
1242 * children that we have already processed.)
1244 for (i
= 0; i
< graph
->num_columns
; i
++) {
1245 struct column
*col
= &graph
->columns
[i
];
1247 strbuf_write_column(sb
, col
, '|');
1250 if (col
->commit
== graph
->commit
&& graph
->num_parents
> 2) {
1251 int len
= (graph
->num_parents
- 2) * 2;
1252 strbuf_addchars(sb
, ' ', len
);
1253 chars_written
+= len
;
1255 strbuf_addch(sb
, ' ');
1260 graph_pad_horizontally(graph
, sb
, chars_written
);
1263 * Update graph->prev_state since we have output a padding line
1265 graph
->prev_state
= GRAPH_PADDING
;
1268 int graph_is_commit_finished(struct git_graph
const *graph
)
1270 return (graph
->state
== GRAPH_PADDING
);
1273 void graph_show_commit(struct git_graph
*graph
)
1275 struct strbuf msgbuf
= STRBUF_INIT
;
1276 int shown_commit_line
= 0;
1278 graph_show_line_prefix(default_diffopt
);
1284 * When showing a diff of a merge against each of its parents, we
1285 * are called once for each parent without graph_update having been
1286 * called. In this case, simply output a single padding line.
1288 if (graph_is_commit_finished(graph
)) {
1289 graph_show_padding(graph
);
1290 shown_commit_line
= 1;
1293 while (!shown_commit_line
&& !graph_is_commit_finished(graph
)) {
1294 shown_commit_line
= graph_next_line(graph
, &msgbuf
);
1295 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
,
1296 graph
->revs
->diffopt
.file
);
1297 if (!shown_commit_line
) {
1298 putc('\n', graph
->revs
->diffopt
.file
);
1299 graph_show_line_prefix(&graph
->revs
->diffopt
);
1301 strbuf_setlen(&msgbuf
, 0);
1304 strbuf_release(&msgbuf
);
1307 void graph_show_oneline(struct git_graph
*graph
)
1309 struct strbuf msgbuf
= STRBUF_INIT
;
1311 graph_show_line_prefix(default_diffopt
);
1316 graph_next_line(graph
, &msgbuf
);
1317 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, graph
->revs
->diffopt
.file
);
1318 strbuf_release(&msgbuf
);
1321 void graph_show_padding(struct git_graph
*graph
)
1323 struct strbuf msgbuf
= STRBUF_INIT
;
1325 graph_show_line_prefix(default_diffopt
);
1330 graph_padding_line(graph
, &msgbuf
);
1331 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
, graph
->revs
->diffopt
.file
);
1332 strbuf_release(&msgbuf
);
1335 int graph_show_remainder(struct git_graph
*graph
)
1337 struct strbuf msgbuf
= STRBUF_INIT
;
1340 graph_show_line_prefix(default_diffopt
);
1345 if (graph_is_commit_finished(graph
))
1349 graph_next_line(graph
, &msgbuf
);
1350 fwrite(msgbuf
.buf
, sizeof(char), msgbuf
.len
,
1351 graph
->revs
->diffopt
.file
);
1352 strbuf_setlen(&msgbuf
, 0);
1355 if (!graph_is_commit_finished(graph
)) {
1356 putc('\n', graph
->revs
->diffopt
.file
);
1357 graph_show_line_prefix(&graph
->revs
->diffopt
);
1362 strbuf_release(&msgbuf
);
1367 static void graph_show_strbuf(struct git_graph
*graph
,
1369 struct strbuf
const *sb
)
1374 * Print the strbuf line by line,
1375 * and display the graph info before each line but the first.
1380 char *next_p
= strchr(p
, '\n');
1385 len
= (sb
->buf
+ sb
->len
) - p
;
1387 fwrite(p
, sizeof(char), len
, file
);
1388 if (next_p
&& *next_p
!= '\0')
1389 graph_show_oneline(graph
);
1394 void graph_show_commit_msg(struct git_graph
*graph
,
1396 struct strbuf
const *sb
)
1398 int newline_terminated
;
1401 * Show the commit message
1403 graph_show_strbuf(graph
, file
, sb
);
1408 newline_terminated
= (sb
->len
&& sb
->buf
[sb
->len
- 1] == '\n');
1411 * If there is more output needed for this commit, show it now
1413 if (!graph_is_commit_finished(graph
)) {
1415 * If sb doesn't have a terminating newline, print one now,
1416 * so we can start the remainder of the graph output on a
1419 if (!newline_terminated
)
1422 graph_show_remainder(graph
);
1425 * If sb ends with a newline, our output should too.
1427 if (newline_terminated
)