X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/9989bf60292d8a42b07a416aaf62839f6b069953..380ec161ae41e781c46510e9a2bc4b770f0e677f:/tig.c diff --git a/tig.c b/tig.c index 49c2492..0237cb0 100644 --- a/tig.c +++ b/tig.c @@ -1,8 +1,9 @@ /* Copyright (c) 2006 Jonas Fonseca * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -63,6 +64,7 @@ static void die(const char *err, ...); static void report(const char *msg, ...); +static int read_properties(const char *cmd, int separator, int (*read)(char *, int, char *, int)); static void set_nonblocking_input(bool loading); static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed); @@ -291,14 +293,14 @@ parse_options(int argc, char *argv[]) } /** - * -t[NSPACES], --tab-size[=NSPACES]:: + * -b[NSPACES], --tab-size[=NSPACES]:: * Set the number of spaces tabs should be expanded to. **/ - if (!strncmp(opt, "-t", 2) || + if (!strncmp(opt, "-b", 2) || !strncmp(opt, "--tab-size", 10)) { char *num = opt; - if (opt[1] == 't') { + if (opt[1] == 'b') { num = opt + 2; } else if (opt[STRING_SIZE("--tab-size")] == '=') { @@ -436,6 +438,9 @@ parse_options(int argc, char *argv[]) } + if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8")) + opt_utf8 = FALSE; + return TRUE; } @@ -469,9 +474,9 @@ parse_options(int argc, char *argv[]) "git ls-remote . 2>/dev/null" /** - * [[view-commands]] - * View commands - * ~~~~~~~~~~~~~ + * [[history-commands]] + * History commands + * ~~~~~~~~~~~~~~~~ * It is possible to alter which commands are used for the different views. * If for example you prefer commits in the main view to be sorted by date * and only show 500 commits, use: @@ -853,7 +858,7 @@ update_view_title(struct view *view) wprintw(view->title, " %lds", secs); } - + wmove(view->title, 0, view->width - 1); wrefresh(view->title); } @@ -902,7 +907,6 @@ resize_display(void) wresize(view->win, view->height, view->width); mvwin(view->win, offset, 0); mvwin(view->title, offset + view->height, 0); - wrefresh(view->win); } offset += view->height + 1; @@ -921,6 +925,20 @@ redraw_display(void) } } +static void +update_display_cursor(void) +{ + struct view *view = display[current_view]; + + /* Move the cursor to the right-most column of the cursor line. + * + * XXX: This could turn out to be a bit expensive, but it ensures that + * the cursor does not jump around. */ + if (view->lines) { + wmove(view->win, view->lineno - view->offset, view->width - 1); + wrefresh(view->win); + } +} /* * Navigation @@ -1340,17 +1358,15 @@ open_view(struct view *prev, enum request request, enum open_flags flags) } if (prev && view != prev) { - /* Continue loading split views in the background. */ - if (!split) - end_update(prev); - else if (!backgrounded) + if (split && !backgrounded) { /* "Blur" the previous view. */ update_view_title(prev); + } view->parent = prev; } - if (view->pipe) { + if (view->pipe && view->lines == 0) { /* Clear the old view and let the incremental updating refill * the screen. */ wclear(view->win); @@ -1479,11 +1495,15 @@ view_driver(struct view *view, enum request request) return TRUE; case REQ_VIEW_CLOSE: - if (view->parent) { + /* XXX: Mark closed views by letting view->parent point to the + * view itself. Parents to closed view should never be + * followed. */ + if (view->parent && + view->parent->parent != view->parent) { memset(display, 0, sizeof(display)); current_view = 0; display[current_view] = view->parent; - view->parent = NULL; + view->parent = view; resize_display(); redraw_display(); break; @@ -1617,8 +1637,8 @@ pager_enter(struct view *view, struct line *line) scroll_view(view, REQ_SCROLL_LINE_DOWN); /* FIXME: A minor workaround. Scrolling the view will call report("") - * but if we are scolling a non-current view this won't properly update - * the view title. */ + * but if we are scrolling a non-current view this won't properly + * update the view title. */ if (split) update_view_title(view); @@ -2203,15 +2223,7 @@ report(const char *msg, ...) } update_view_title(view); - - /* Move the cursor to the right-most column of the cursor line. - * - * XXX: This could turn out to be a bit expensive, but it ensures that - * the cursor does not jump around. */ - if (view->lines) { - wmove(view->win, view->lineno - view->offset, view->width - 1); - wrefresh(view->win); - } + update_display_cursor(); } /* Controls when nodelay should be in effect when polling user input. */ @@ -2323,111 +2335,120 @@ get_refs(char *id) } static int -load_refs(void) +read_ref(char *id, int idlen, char *name, int namelen) { - const char *cmd_env = getenv("TIG_LS_REMOTE"); - const char *cmd = cmd_env && *cmd_env ? cmd_env : TIG_LS_REMOTE; - FILE *pipe = popen(cmd, "r"); - char buffer[BUFSIZ]; - char *line; - - if (!pipe) - return ERR; + struct ref *ref; + bool tag = FALSE; + bool tag_commit = FALSE; + + /* Commits referenced by tags has "^{}" appended. */ + if (name[namelen - 1] == '}') { + while (namelen > 0 && name[namelen] != '^') + namelen--; + if (namelen > 0) + tag_commit = TRUE; + name[namelen] = 0; + } - while ((line = fgets(buffer, sizeof(buffer), pipe))) { - char *name = strchr(line, '\t'); - struct ref *ref; - int namelen; - bool tag = FALSE; - bool tag_commit = FALSE; + if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) { + if (!tag_commit) + return OK; + name += STRING_SIZE("refs/tags/"); + tag = TRUE; - if (!name) - continue; + } else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) { + name += STRING_SIZE("refs/heads/"); - *name++ = 0; - namelen = strlen(name) - 1; + } else if (!strcmp(name, "HEAD")) { + return OK; + } - /* Commits referenced by tags has "^{}" appended. */ - if (name[namelen - 1] == '}') { - while (namelen > 0 && name[namelen] != '^') - namelen--; - if (namelen > 0) - tag_commit = TRUE; - } - name[namelen] = 0; + refs = realloc(refs, sizeof(*refs) * (refs_size + 1)); + if (!refs) + return ERR; - if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) { - if (!tag_commit) - continue; - name += STRING_SIZE("refs/tags/"); - tag = TRUE; + ref = &refs[refs_size++]; + ref->name = strdup(name); + if (!ref->name) + return ERR; - } else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) { - name += STRING_SIZE("refs/heads/"); + ref->tag = tag; + string_copy(ref->id, id); - } else if (!strcmp(name, "HEAD")) { - continue; - } + return OK; +} - refs = realloc(refs, sizeof(*refs) * (refs_size + 1)); - if (!refs) - return ERR; +static int +load_refs(void) +{ + const char *cmd_env = getenv("TIG_LS_REMOTE"); + const char *cmd = cmd_env && *cmd_env ? cmd_env : TIG_LS_REMOTE; - ref = &refs[refs_size++]; - ref->tag = tag; - ref->name = strdup(name); - if (!ref->name) - return ERR; + return read_properties(cmd, '\t', read_ref); +} - string_copy(ref->id, line); +static int +read_config_option(char *name, int namelen, char *value, int valuelen) +{ + if (!strcmp(name, "i18n.commitencoding")) { + string_copy(opt_encoding, value); } - if (ferror(pipe)) - return ERR; - - pclose(pipe); - return OK; } static int load_config(void) { - FILE *pipe = popen("git repo-config --list", "r"); + return read_properties("git repo-config --list", '=', + read_config_option); +} + +static int +read_properties(const char *cmd, int separator, + int (*read_property)(char *, int, char *, int)) +{ + FILE *pipe = popen(cmd, "r"); char buffer[BUFSIZ]; char *name; + int state = OK; if (!pipe) return ERR; - while ((name = fgets(buffer, sizeof(buffer), pipe))) { - char *value = strchr(name, '='); - int valuelen, namelen; - - /* No boolean options, yet */ - if (!value) - continue; - - namelen = value - name; - - *value++ = 0; - valuelen = strlen(value); - if (valuelen > 0) - value[valuelen - 1] = 0; + while (state == OK && (name = fgets(buffer, sizeof(buffer), pipe))) { + char *value = strchr(name, separator); + int namelen; + int valuelen; + + if (value) { + namelen = value - name; + *value++ = 0; + valuelen = strlen(value); + if (valuelen > 0) { + valuelen--; + value[valuelen] = 0; + } - if (!strcmp(name, "i18n.commitencoding")) { - string_copy(opt_encoding, value); + } else { + namelen = strlen(name); + value = ""; + valuelen = 0; } + + if (namelen) + state = read_property(name, namelen, value, valuelen); } - if (ferror(pipe)) - return ERR; + if (state != ERR && ferror(pipe)) + state = ERR; pclose(pipe); - return OK; + return state; } + /* * Main */ @@ -2472,6 +2493,11 @@ main(int argc, char *argv[]) signal(SIGINT, quit); + /* Load the repo config file first so options can be overwritten from + * the command line. */ + if (load_config() == ERR) + die("Failed to load repo config."); + if (!parse_options(argc, argv)) return 0; @@ -2482,15 +2508,9 @@ main(int argc, char *argv[]) if (refs_size == 0 && opt_request != REQ_VIEW_PAGER) die("Not a git repository"); - if (load_config() == ERR) - die("Failed to load repo config."); - for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++) view->cmd_env = getenv(view->cmd_env); - if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8")) - opt_utf8 = FALSE; - request = opt_request; init_display(); @@ -2562,7 +2582,8 @@ main(int argc, char *argv[]) * * You can tune the interaction with git by making use of the options * explained in this section. For example, by configuring the environment - * variables described in the <> section. + * variables described in the <> + * section. * * Limit by path name * ~~~~~~~~~~~~~~~~~~ @@ -2681,7 +2702,7 @@ main(int argc, char *argv[]) * - link:http://www.kernel.org/pub/software/scm/cogito/docs/[cogito(7)] * * Other git repository browsers: -* + * * - gitk(1) * - qgit(1) * - gitview(1)