X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/110e948ed1b5c44de940b47d9244e02358228537..6c1864915391b8c448516ec4147e0782db69f0aa:/tig.c

diff --git a/tig.c b/tig.c
index 766b973..e707d68 100644
--- a/tig.c
+++ b/tig.c
@@ -60,6 +60,15 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 #define SIZEOF_STR	1024	/* Default string size. */
 #define SIZEOF_REF	256	/* Size of symbolic or SHA1 ID. */
 #define SIZEOF_REV	41	/* Holds a SHA-1 and an ending NUL */
+
+/* Revision graph */
+
+#define REVGRAPH_INIT	'I'
+#define REVGRAPH_MERGE	'M'
+#define REVGRAPH_BRANCH	'+'
+#define REVGRAPH_COMMIT	'*'
+#define REVGRAPH_LINE	'|'
+
 #define SIZEOF_REVGRAPH	19	/* Size of revision ancestry graphics. */
 
 /* Size of rev graph with no  "padding" columns */
@@ -2786,17 +2795,17 @@ struct rev_stack {
 };
 
 /* The current stack of revisions on the graph. */
-static struct rev_stack graph_stacks[2];
-static unsigned int graph_stack_no;
+static struct rev_stack graph_stacks[3];
+static size_t graph_stack_no;
 
 /* Parents of the commit being visualized. */
-static struct rev_stack graph_parents;
+static struct rev_stack graph_parents[2];
+
+static size_t graph_last_rev;
 
 static void
 push_rev_stack(struct rev_stack *stack, char *parent)
 {
-	fprintf(stderr, " (%s)", parent);
-
 	/* Combine duplicate parents lines. */
 	if (stack->size > 0 &&
 	    !strncmp(stack->rev[stack->size - 1], parent, SIZEOF_REV))
@@ -2807,55 +2816,31 @@ push_rev_stack(struct rev_stack *stack, char *parent)
 	}
 }
 
-void
-update_rev_graph(struct commit *commit)
+static void
+draw_rev_graph(struct commit *commit, size_t stackpos,
+	       struct rev_stack *stack, struct rev_stack *parents,
+	       struct rev_stack *prev_parents)
 {
-	struct rev_stack *stack = &graph_stacks[graph_stack_no++ & 1];
-	struct rev_stack *graph = &graph_stacks[graph_stack_no & 1];
-	static chtype last_symbol;
 	chtype symbol, separator, line;
-	size_t stackpos = 0;
 	size_t i;
 
-	// FIXME: Initial commit ... assert(rev_graph_commit == commit);
-	fprintf(stderr, "\n%p <%s> ", graph, commit->id);
-
-	/* First traverse all lines of revisions up to the active one. */
-	for (stackpos = 0; stackpos < stack->size; stackpos++) {
-		if (!strcmp(stack->rev[stackpos], commit->id)) {
-			break;
-		}
-
-		push_rev_stack(graph, stack->rev[stackpos]);
-	}
-
-	assert(commit->graph_size < ARRAY_SIZE(commit->graph));
-
-	for (i = 0; i < graph_parents.size; i++)
-		push_rev_stack(graph, graph_parents.rev[i]);
-
 	/* Place the symbol for this commit. */
-	if (graph_parents.size == 0)
-		symbol = 'I';
-	else if (graph_parents.size > 1)
-		symbol = 'M';
+	if (parents->size == 0)
+		symbol = REVGRAPH_INIT;
+	else if (parents->size > 1)
+		symbol = REVGRAPH_MERGE;
 	else if (stackpos >= stack->size)
-		symbol = '+';
+		symbol = REVGRAPH_BRANCH;
 	else
-		symbol = '*';
-
-	i = stackpos + 1;
-
-	/* FIXME: Moving branches left and right when collapsing a branch. */
-	while (i < stack->size)
-		push_rev_stack(graph, stack->rev[i++]);
+		symbol = REVGRAPH_COMMIT;
 
 	separator = ' ';
-	line = ACS_VLINE;
+	line = REVGRAPH_LINE;
 
 	for (i = 0; i < stackpos; i++) {
 		commit->graph[commit->graph_size++] = line;
-		if (last_symbol == 'M') {
+		if (prev_parents->size > 1 &&
+		    i == graph_last_rev) {
 			separator = '`';
 			line = '.';
 		}
@@ -2865,22 +2850,51 @@ update_rev_graph(struct commit *commit)
 	commit->graph[commit->graph_size++] = symbol;
 
 	separator = ' ';
-	line = ACS_VLINE;
-	if (last_symbol == 'M') {
-		line = ' ';
-	}
+	line = REVGRAPH_LINE;
+	i++;
 
-	for (i += 1; i < stack->size; i++) {
+	for (; i < stack->size; i++) {
 		commit->graph[commit->graph_size++] = separator;
 		commit->graph[commit->graph_size++] = line;
-		if (last_symbol == 'M') {
-			separator = '`';
-			line = '.';
+		if (prev_parents->size > 1) {
+			if (i < graph_last_rev + prev_parents->size) {
+				separator = '`';
+				line = '.';
+			}
 		}
 	}
+}
+
+void
+update_rev_graph(struct commit *commit)
+{
+	struct rev_stack *parents = &graph_parents[graph_stack_no & 1];
+	struct rev_stack *stack = &graph_stacks[graph_stack_no++ & 1];
+	struct rev_stack *prev_parents = &graph_parents[graph_stack_no & 1];
+	struct rev_stack *graph = &graph_stacks[graph_stack_no & 1];
+	size_t stackpos = 0;
+	size_t i;
+
+	/* First traverse all lines of revisions up to the active one. */
+	for (stackpos = 0; stackpos < stack->size; stackpos++) {
+		if (!strcmp(stack->rev[stackpos], commit->id))
+			break;
+
+		push_rev_stack(graph, stack->rev[stackpos]);
+	}
+
+	assert(commit->graph_size < ARRAY_SIZE(commit->graph));
+
+	for (i = 0; i < parents->size; i++)
+		push_rev_stack(graph, parents->rev[i]);
+
+	/* FIXME: Moving branches left and right when collapsing a branch. */
+	for (i = stackpos + 1; i < stack->size; i++)
+		push_rev_stack(graph, stack->rev[i]);
 
-	last_symbol = symbol;
-	stack->size = graph_parents.size = 0;
+	draw_rev_graph(commit, stackpos, stack, parents, prev_parents);
+	graph_last_rev = stackpos;
+	stack->size = prev_parents->size = 0;
 }
 
 /* Reads git log --pretty=raw output and parses it into the commit struct. */
@@ -2902,13 +2916,12 @@ main_read(struct view *view, char *line)
 		view->line[view->lines++].data = commit;
 		string_copy(commit->id, line);
 		commit->refs = get_refs(commit->id);
-		fprintf(stderr, "\n%p [%s]", &graph_stacks[graph_stack_no], commit->id);
 		break;
 
 	case LINE_PARENT:
 		if (commit) {
 			line += STRING_SIZE("parent ");
-			push_rev_stack(&graph_parents, line);
+			push_rev_stack(&graph_parents[graph_stack_no & 1], line);
 		}
 		break;