struct rev_stack {
+ struct rev_stack *prev, *next, *parents;
char rev[SIZEOF_REVITEMS][SIZEOF_REV];
size_t size;
+ struct commit *commit;
+ size_t pos;
};
+/* Parents of the commit being visualized. */
+static struct rev_stack graph_parents[3];
+
/* The current stack of revisions on the graph. */
-static struct rev_stack graph_stacks[3];
-static size_t graph_stack_no;
+static struct rev_stack graph_stacks[3] = {
+ { &graph_stacks[2], &graph_stacks[1], &graph_parents[0] },
+ { &graph_stacks[0], &graph_stacks[2], &graph_parents[1] },
+ { &graph_stacks[1], &graph_stacks[0], &graph_parents[2] },
+};
-/* Parents of the commit being visualized. */
-static struct rev_stack graph_parents[2];
+static inline bool
+graph_parent_is_merge(struct rev_stack *graph)
+{
+ return graph->parents->size > 1;
+}
-static size_t graph_last_rev;
+static inline void
+append_to_rev_graph(struct rev_stack *stack, chtype symbol)
+{
+ if (stack->commit->graph_size < ARRAY_SIZE(stack->commit->graph) - 1)
+ stack->commit->graph[stack->commit->graph_size++] = symbol;
+}
static void
-push_rev_stack(struct rev_stack *stack, char *parent)
+done_rev_graph(struct rev_stack *graph)
{
- fprintf(stderr, " (%s)", parent);
+ if (graph_parent_is_merge(graph) &&
+ graph->pos < graph->size - 1 &&
+ graph->next->size == graph->size + graph->parents->size - 1) {
+ size_t i = graph->pos + graph->parents->size - 1;
+
+ graph->commit->graph_size = i * 2;
+ while (i < graph->next->size - 1) {
+ append_to_rev_graph(graph, ' ');
+ append_to_rev_graph(graph, '\\');
+ i++;
+ }
+ }
+ graph->size = graph->pos = 0;
+ graph->commit = NULL;
+ memset(graph->parents, 0, sizeof(*graph->parents));
+}
+
+static void
+push_rev_stack(struct rev_stack *stack, char *parent)
+{
/* Combine duplicate parents lines. */
if (stack->size > 0 &&
!strncmp(stack->rev[stack->size - 1], parent, SIZEOF_REV))
}
static void
-draw_rev_graph(struct commit *commit, size_t stackpos,
- struct rev_stack *stack, struct rev_stack *parents,
- struct rev_stack *prev_parents)
+draw_rev_graph(struct rev_stack *graph)
{
chtype symbol, separator, line;
size_t i;
/* Place the symbol for this commit. */
- if (parents->size == 0)
+ if (graph->parents->size == 0)
symbol = REVGRAPH_INIT;
- else if (parents->size > 1)
+ else if (graph->parents->size > 1)
symbol = REVGRAPH_MERGE;
- else if (stackpos >= stack->size)
+ else if (graph->pos >= graph->size)
symbol = REVGRAPH_BRANCH;
else
symbol = REVGRAPH_COMMIT;
separator = ' ';
line = REVGRAPH_LINE;
- for (i = 0; i < stackpos; i++) {
- commit->graph[commit->graph_size++] = line;
- if (prev_parents->size > 1 &&
- i == graph_last_rev) {
+ for (i = 0; i < graph->pos; i++) {
+ append_to_rev_graph(graph, line);
+ if (graph_parent_is_merge(graph->prev) &&
+ graph->prev->pos == i) {
separator = '`';
line = '.';
}
- commit->graph[commit->graph_size++] = separator;
+ append_to_rev_graph(graph, separator);
}
- commit->graph[commit->graph_size++] = symbol;
+ append_to_rev_graph(graph, symbol);
- separator = ' ';
- line = REVGRAPH_LINE;
+ if (graph->prev->size > graph->size) {
+ separator = '\'';
+ line = ' ';
+ } else {
+ separator = ' ';
+ line = REVGRAPH_LINE;
+ }
i++;
- for (; i < stack->size; i++) {
- commit->graph[commit->graph_size++] = separator;
- commit->graph[commit->graph_size++] = line;
- if (prev_parents->size > 1) {
- if (i < graph_last_rev + prev_parents->size) {
+ for (; i < graph->size; i++) {
+ append_to_rev_graph(graph, separator);
+ append_to_rev_graph(graph, line);
+ if (graph_parent_is_merge(graph->prev)) {
+ if (i < graph->prev->pos + graph->parents->size) {
separator = '`';
line = '.';
}
}
+ if (graph->prev->size > graph->size) {
+ separator = '/';
+ line = ' ';
+ }
+ }
+
+ if (graph->prev->size > graph->size) {
+ append_to_rev_graph(graph, separator);
+ if (line != ' ')
+ append_to_rev_graph(graph, line);
}
}
void
-update_rev_graph(struct commit *commit)
+update_rev_graph(struct rev_stack *graph)
{
- 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;
- 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))
+ for (graph->pos = 0; graph->pos < graph->size; graph->pos++) {
+ if (!strcmp(graph->rev[graph->pos], graph->commit->id))
break;
- push_rev_stack(graph, stack->rev[stackpos]);
+ push_rev_stack(graph->next, graph->rev[graph->pos]);
}
- assert(commit->graph_size < ARRAY_SIZE(commit->graph));
-
- for (i = 0; i < parents->size; i++)
- push_rev_stack(graph, parents->rev[i]);
+ for (i = 0; i < graph->parents->size; i++)
+ push_rev_stack(graph->next, 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]);
+ for (i = graph->pos + 1; i < graph->size; i++)
+ push_rev_stack(graph->next, graph->rev[i]);
- draw_rev_graph(commit, stackpos, stack, parents, prev_parents);
- graph_last_rev = stackpos;
- stack->size = prev_parents->size = 0;
+ draw_rev_graph(graph);
+ done_rev_graph(graph->prev);
}
/* Reads git log --pretty=raw output and parses it into the commit struct. */
static bool
main_read(struct view *view, char *line)
{
+ static struct rev_stack *graph = graph_stacks;
enum line_type type = get_line_type(line);
struct commit *commit = view->lines
? view->line[view->lines - 1].data : NULL;
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 & 1], commit->id);
+ graph->commit = commit;
break;
case LINE_PARENT:
if (commit) {
line += STRING_SIZE("parent ");
- push_rev_stack(&graph_parents[graph_stack_no & 1], line);
+ push_rev_stack(graph->parents, line);
}
break;
if (!commit)
break;
- update_rev_graph(commit);
+ update_rev_graph(graph);
+ graph = graph->next;
if (end) {
char *email = end + 1;
~mdw / tig / blobdiff