graph API: use a new color when starting a brand new column
Use a new color for commits that don't have any previously printed children. The following command demonstrates the changes: git log --graph --pretty=tformat:'%h %s%n' -7 481c7a6 18b0793 Now the two independent lines of development are displayed with different colors, instead of both using the same color. Signed-off-by: Adam Simpkins <simpkins@facebook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adam Simpkins committed
Aug 18, 2009 at 14:41 UTC
91e50b2c0a3bfa818454590fcc6a1ef70c3c58d0
1 file changed
+11
-3
graph.c
+11
-3
@@ -225,7 +225,12 @@ struct git_graph *graph_init(struct rev_info *opt)
225
graph->num_columns = 0;
226
graph->num_new_columns = 0;
227
graph->mapping_size = 0;
228
- graph->default_column_color = 0;
228
+ /*
229
+ * Start the column color at the maximum value, since we'll
230
+ * always increment it for the first commit we output.
231
+ * This way we start at 0 for the first commit.
232
+ */
233
+ graph->default_column_color = COLUMN_COLORS_MAX - 1;
234
235
/*
236
* Allocate a reasonably large default number of columns
@@ -499,11 +504,14 @@ static void graph_update_columns(struct git_graph *graph)
504
parent;
505
parent = next_interesting_parent(graph, parent)) {
506
/*
502
- * If this is a merge increment the current
507
+ * If this is a merge, or the start of a new
508
+ * childless column, increment the current
509
* color.
510
*/
505
- if (graph->num_parents > 1)
511
+ if (graph->num_parents > 1 ||
512
+ !is_commit_in_columns) {
513
graph_increment_column_color(graph);
514
+ }
515
graph_insert_into_new_columns(graph,
516
parent->item,
517
&mapping_idx);