X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/ebbaf4fe5b6a8a0ef52120587495594e6dcf4752..88757ebdbd32ba72232e22d4afe1fe882f719e3d:/tig.c diff --git a/tig.c b/tig.c index 0a86490..4e0900a 100644 --- a/tig.c +++ b/tig.c @@ -59,8 +59,21 @@ 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 */ +#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) @@ -109,7 +122,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, struct ref { char *name; /* Ref name; tag or head names are shortened. */ - char id[41]; /* Commit SHA1 ID */ + char id[SIZEOF_REV]; /* Commit SHA1 ID */ unsigned int tag:1; /* Is it a tag? */ unsigned int next:1; /* For ref lists: are there more refs? */ }; @@ -2447,7 +2460,7 @@ static struct view_ops pager_ops = { * Tree backend */ -/* Parse output from git ls-tree: +/* Parse output from git-ls-tree(1): * * 100644 blob fb0e31ea6cc679b7379631188190e975f5789c26 Makefile * 100644 blob 5304ca4260aaddaee6498f9630e7d471b8591ea6 README @@ -2558,7 +2571,6 @@ static bool tree_enter(struct view *view, struct line *line) { enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT; - char *data = line->data; enum request request; switch (line->type) { @@ -2577,6 +2589,7 @@ tree_enter(struct view *view, struct line *line) } else { size_t pathlen = strlen(opt_path); size_t origlen = pathlen; + char *data = line->data; char *basename = data + SIZEOF_TREE_ATTR; if (!string_format_from(opt_path, &pathlen, "%s/", basename)) { @@ -2659,7 +2672,7 @@ static struct view_ops blob_ops = { */ struct commit { - char id[41]; /* SHA1 ID. */ + char id[SIZEOF_REV]; /* SHA1 ID. */ char title[75]; /* First line of the commit message. */ char author[75]; /* Author of the commit. */ struct tm time; /* Date from the author ident. */ @@ -2775,6 +2788,125 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select return TRUE; } + +struct rev_stack { + char rev[SIZEOF_REVITEMS][SIZEOF_REV]; + size_t size; + struct commit *commit; + size_t pos; +}; + +/* 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 inline void +append_to_rev_graph(struct rev_stack *stack, chtype symbol) +{ + stack->commit->graph[stack->commit->graph_size++] = symbol; +} + +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 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 (stack->pos >= stack->size) + symbol = REVGRAPH_BRANCH; + else + symbol = REVGRAPH_COMMIT; + + separator = ' '; + line = REVGRAPH_LINE; + + for (i = 0; i < stack->pos; i++) { + append_to_rev_graph(stack, line); + if (prev_parents->size > 1 && + i == graph_last_rev) { + separator = '`'; + line = '.'; + } + append_to_rev_graph(stack, separator); + } + + append_to_rev_graph(stack, symbol); + + separator = ' '; + line = REVGRAPH_LINE; + i++; + + for (; i < stack->size; i++) { + append_to_rev_graph(stack, separator); + append_to_rev_graph(stack, 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 i; + + stack->commit = commit; + + /* First traverse all lines of revisions up to the active one. */ + for (stack->pos = 0; stack->pos < stack->size; stack->pos++) { + if (!strcmp(stack->rev[stack->pos], commit->id)) + break; + + push_rev_stack(graph, stack->rev[stack->pos]); + } + + 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 = stack->pos + 1; i < stack->size; i++) + push_rev_stack(graph, stack->rev[i]); + + draw_rev_graph(stack, parents, prev_parents); + + graph_last_rev = stack->pos; + memset(stack, 0, sizeof(*stack)); + memset(prev_parents, 0, sizeof(*stack)); +} + /* Reads git log --pretty=raw output and parses it into the commit struct. */ static bool main_read(struct view *view, char *line) @@ -2794,7 +2926,13 @@ 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: @@ -2805,6 +2943,8 @@ main_read(struct view *view, char *line) if (!commit) break; + update_rev_graph(commit); + if (end) { char *email = end + 1;