X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/3fd9297e0568c9c88190beff3ac380e49942e514..1dcb3bec828736c4a9d290d81b03e10aad1eaac8:/tig.c diff --git a/tig.c b/tig.c index a5255cd..2431f66 100644 --- a/tig.c +++ b/tig.c @@ -59,8 +59,12 @@ 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 */ #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 +113,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? */ }; @@ -565,6 +569,7 @@ LINE(TREE, "tree ", COLOR_BLUE, COLOR_DEFAULT, 0), \ LINE(AUTHOR, "author ", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(COMMITTER, "committer ", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(SIGNOFF, " Signed-off-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \ +LINE(ACKED, " Acked-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \ LINE(DEFAULT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(CURSOR, "", COLOR_WHITE, COLOR_GREEN, A_BOLD), \ LINE(STATUS, "", COLOR_GREEN, COLOR_DEFAULT, 0), \ @@ -1432,9 +1437,9 @@ update_display_cursor(void) /* Scrolling backend */ static void -do_scroll_view(struct view *view, int lines, bool redraw) +do_scroll_view(struct view *view, int lines) { - assert(view_is_displayed(view)); + bool redraw_current_line = FALSE; /* The rendering expects the new offset. */ view->offset += lines; @@ -1442,6 +1447,17 @@ do_scroll_view(struct view *view, int lines, bool redraw) assert(0 <= view->offset && view->offset < view->lines); assert(lines); + /* Move current line into the view. */ + if (view->lineno < view->offset) { + view->lineno = view->offset; + redraw_current_line = TRUE; + } else if (view->lineno >= view->offset + view->height) { + view->lineno = view->offset + view->height - 1; + redraw_current_line = TRUE; + } + + assert(view->offset <= view->lineno && view->lineno < view->lines); + /* Redraw the whole screen if scrolling is pointless. */ if (view->height < ABS(lines)) { redraw_view(view); @@ -1456,23 +1472,11 @@ do_scroll_view(struct view *view, int lines, bool redraw) if (!draw_view_line(view, line)) break; } - } - /* Move current line into the view. */ - if (view->lineno < view->offset) { - view->lineno = view->offset; - draw_view_line(view, 0); - - } else if (view->lineno >= view->offset + view->height) { - view->lineno = view->offset + view->height - 1; - draw_view_line(view, view->lineno - view->offset); + if (redraw_current_line) + draw_view_line(view, view->lineno - view->offset); } - assert(view->offset <= view->lineno && view->lineno < view->lines); - - if (!redraw) - return; - redrawwin(view->win); wrefresh(view->win); report(""); @@ -1484,6 +1488,8 @@ scroll_view(struct view *view, enum request request) { int lines = 1; + assert(view_is_displayed(view)); + switch (request) { case REQ_SCROLL_PAGE_DOWN: lines = view->height; @@ -1515,13 +1521,14 @@ scroll_view(struct view *view, enum request request) die("request %d not handled in switch", request); } - do_scroll_view(view, lines, TRUE); + do_scroll_view(view, lines); } /* Cursor moving */ static void -move_view(struct view *view, enum request request, bool redraw) +move_view(struct view *view, enum request request) { + int scroll_steps = 0; int steps; switch (request) { @@ -1568,34 +1575,40 @@ move_view(struct view *view, enum request request, bool redraw) view->lineno += steps; assert(0 <= view->lineno && view->lineno < view->lines); - /* Repaint the old "current" line if we be scrolling */ - if (ABS(steps) < view->height) - draw_view_line(view, view->lineno - steps - view->offset); - /* Check whether the view needs to be scrolled */ if (view->lineno < view->offset || view->lineno >= view->offset + view->height) { + scroll_steps = steps; if (steps < 0 && -steps > view->offset) { - steps = -view->offset; + scroll_steps = -view->offset; } else if (steps > 0) { if (view->lineno == view->lines - 1 && view->lines > view->height) { - steps = view->lines - view->offset - 1; - if (steps >= view->height) - steps -= view->height - 1; + scroll_steps = view->lines - view->offset - 1; + if (scroll_steps >= view->height) + scroll_steps -= view->height - 1; } } + } - do_scroll_view(view, steps, redraw); + if (!view_is_displayed(view)) { + view->offset += steps; + view->ops->select(view, &view->line[view->lineno]); return; } - /* Draw the current line */ - draw_view_line(view, view->lineno - view->offset); + /* Repaint the old "current" line if we be scrolling */ + if (ABS(steps) < view->height) + draw_view_line(view, view->lineno - steps - view->offset); - if (!redraw) + if (scroll_steps) { + do_scroll_view(view, scroll_steps); return; + } + + /* Draw the current line */ + draw_view_line(view, view->lineno - view->offset); redrawwin(view->win); wrefresh(view->win); @@ -1607,7 +1620,7 @@ move_view(struct view *view, enum request request, bool redraw) * Searching */ -static void search_view(struct view *view, enum request request, const char *search); +static void search_view(struct view *view, enum request request); static bool find_next_line(struct view *view, unsigned long lineno, struct line *line) @@ -1647,7 +1660,7 @@ find_next(struct view *view, enum request request) if (!*opt_search) report("No previous search"); else - search_view(view, request, opt_search); + search_view(view, request); return; } @@ -1682,7 +1695,7 @@ find_next(struct view *view, enum request request) } static void -search_view(struct view *view, enum request request, const char *search) +search_view(struct view *view, enum request request) { int regex_err; @@ -1695,7 +1708,7 @@ search_view(struct view *view, enum request request, const char *search) return; } - regex_err = regcomp(view->regex, search, REG_EXTENDED); + regex_err = regcomp(view->regex, opt_search, REG_EXTENDED); if (regex_err != 0) { char buf[SIZEOF_STR] = "unknown error"; @@ -1704,7 +1717,7 @@ search_view(struct view *view, enum request request, const char *search) return; } - string_copy(view->grep, search); + string_copy(view->grep, opt_search); find_next(view, request); } @@ -2010,7 +2023,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags) /* Scroll the view that was split if the current line is * outside the new limited view. */ - do_scroll_view(prev, lines, TRUE); + do_scroll_view(prev, lines); } if (prev && view != prev) { @@ -2055,7 +2068,7 @@ view_driver(struct view *view, enum request request) case REQ_MOVE_PAGE_DOWN: case REQ_MOVE_FIRST_LINE: case REQ_MOVE_LAST_LINE: - move_view(view, request, TRUE); + move_view(view, request); break; case REQ_SCROLL_LINE_DOWN: @@ -2088,14 +2101,12 @@ view_driver(struct view *view, enum request request) view->parent == VIEW(REQ_VIEW_MAIN)) || (view == VIEW(REQ_VIEW_BLOB) && view->parent == VIEW(REQ_VIEW_TREE))) { - bool redraw = display[1] == view; - view = view->parent; - move_view(view, request, redraw); - if (redraw) + move_view(view, request); + if (view_is_displayed(view)) update_view_title(view); } else { - move_view(view, request, TRUE); + move_view(view, request); break; } /* Fall-through */ @@ -2140,7 +2151,7 @@ view_driver(struct view *view, enum request request) case REQ_SEARCH: case REQ_SEARCH_BACK: - search_view(view, request, opt_search); + search_view(view, request); break; case REQ_FIND_NEXT: @@ -2440,7 +2451,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 @@ -2550,8 +2561,7 @@ tree_read(struct view *view, char *text) static bool tree_enter(struct view *view, struct line *line) { - enum open_flags flags = OPEN_DEFAULT; - char *data = line->data; + enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT; enum request request; switch (line->type) { @@ -2570,6 +2580,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)) { @@ -2585,10 +2596,6 @@ tree_enter(struct view *view, struct line *line) break; case LINE_TREE_FILE: - /* This causes the blob view to become split, and not having it - * in the tree dir case will make the blob view automatically - * disappear when moving to a different directory. */ - flags |= OPEN_SPLIT; request = REQ_VIEW_BLOB; break; @@ -2598,29 +2605,27 @@ tree_enter(struct view *view, struct line *line) open_view(view, request, flags); - if (!VIEW(request)->pipe) - return TRUE; - - /* For tree views insert the path to the parent as the first line. */ - if (request == REQ_VIEW_BLOB) { - /* Mirror what is showed in the title bar. */ - string_ncopy(ref_blob, data + STRING_SIZE("100644 blob "), 40); - string_copy(VIEW(REQ_VIEW_BLOB)->ref, ref_blob); - return TRUE; - } - return TRUE; } static void tree_select(struct view *view, struct line *line) { - if (line->type == LINE_TREE_DIR || line->type == LINE_TREE_FILE) { - char *text = line->data; + char *text = line->data; + + text += STRING_SIZE("100644 blob "); + + if (line->type == LINE_TREE_FILE) { + string_ncopy(ref_blob, text, 40); + /* Also update the blob view's ref, since all there must always + * be in sync. */ + string_copy(VIEW(REQ_VIEW_BLOB)->ref, ref_blob); - string_ncopy(view->ref, text + STRING_SIZE("100644 blob "), 40); - string_copy(ref_blob, view->ref); + } else if (line->type != LINE_TREE_DIR) { + return; } + + string_ncopy(view->ref, text, 40); } static struct view_ops tree_ops = { @@ -2658,7 +2663,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. */ @@ -2774,6 +2779,89 @@ 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; +}; + +/* The current stack of revisions on the graph. */ +static struct rev_stack graph_stacks[2]; +static unsigned int graph_stack_no; + +/* Parents of the commit being visualized. */ +static struct rev_stack graph_parents; + +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)) + return; + + if (stack->size < SIZEOF_REVITEMS) { + string_ncopy(stack->rev[stack->size++], parent, SIZEOF_REV); + } +} + +void +update_rev_graph(struct commit *commit) +{ + struct rev_stack *stack = &graph_stacks[graph_stack_no++ & 1]; + struct rev_stack *graph = &graph_stacks[graph_stack_no & 1]; + chtype symbol; + 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)) { + while (stackpos + 1 < stack->size && + !strcmp(stack->rev[stackpos + 1], commit->id)) + stackpos++; + break; + } + + push_rev_stack(graph, stack->rev[stackpos]); + commit->graph[commit->graph_size++] = ACS_VLINE; + commit->graph[commit->graph_size++] = ' '; + } + + 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'; + else if (stackpos >= stack->size) + symbol = '+'; + else + symbol = '*'; + + commit->graph[commit->graph_size++] = symbol; + + stackpos++; + + /* FIXME: Moving branches left and right when collapsing a branch. */ + while (stackpos < stack->size) { + push_rev_stack(graph, stack->rev[stackpos++]); + commit->graph[commit->graph_size++] = ' '; + commit->graph[commit->graph_size++] = ACS_VLINE; + } + + stack->size = graph_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) @@ -2793,7 +2881,14 @@ 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; + 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); + } break; case LINE_AUTHOR: @@ -2804,6 +2899,8 @@ main_read(struct view *view, char *line) if (!commit) break; + update_rev_graph(commit); + if (end) { char *email = end + 1;