#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 */
+#define SIZEOF_REVITEMS (SIZEOF_REVGRAPH - (SIZEOF_REVGRAPH / 2))
+
/* This color name can be used to refer to the default term colors. */
#define COLOR_DEFAULT (-1)
return TRUE;
}
+
+struct rev_stack {
+ char rev[SIZEOF_REVITEMS][SIZEOF_REV];
+ size_t size;
+};
+
+/* The current stack of revisions on the graph. */
+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[2];
+
+static size_t graph_last_rev;
+
+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))
+ return;
+
+ if (stack->size < SIZEOF_REVITEMS) {
+ string_ncopy(stack->rev[stack->size++], 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)
+{
+ chtype symbol, separator, line;
+ size_t i;
+
+ /* Place the symbol for this commit. */
+ if (parents->size == 0)
+ symbol = REVGRAPH_INIT;
+ else if (parents->size > 1)
+ symbol = REVGRAPH_MERGE;
+ else if (stackpos >= stack->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) {
+ separator = '`';
+ line = '.';
+ }
+ commit->graph[commit->graph_size++] = separator;
+ }
+
+ commit->graph[commit->graph_size++] = symbol;
+
+ 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) {
+ 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]);
+
+ 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. */
static bool
main_read(struct view *view, char *line)
view->line[view->lines++].data = commit;
string_copy(commit->id, line);
commit->refs = get_refs(commit->id);
- commit->graph[commit->graph_size++] = ACS_LTEE;
+ break;
+
+ case LINE_PARENT:
+ if (commit) {
+ line += STRING_SIZE("parent ");
+ push_rev_stack(&graph_parents[graph_stack_no & 1], line);
+ }
break;
case LINE_AUTHOR:
if (!commit)
break;
+ update_rev_graph(commit);
+
if (end) {
char *email = end + 1;