X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/5699e0cfd59c6a6b30776efeab8b96fbdc586fa7..bdcc0d6bbed273f1c7cc55e7f67b91db07a08192:/tig.c diff --git a/tig.c b/tig.c index 371377a..5b45844 100644 --- a/tig.c +++ b/tig.c @@ -27,10 +27,11 @@ #include #include #include +#include +#include #include #include -#include #include #include @@ -335,7 +336,8 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(SHOW_VERSION, "Show version information"), \ REQ_(STOP_LOADING, "Stop all loading views"), \ REQ_(TOGGLE_LINENO, "Toggle line numbers"), \ - REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization") + REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \ + REQ_(STATUS_UPDATE, "Update file status") \ /* User action requests. */ @@ -421,6 +423,7 @@ static char opt_codeset[20] = "UTF-8"; static iconv_t opt_iconv = ICONV_NONE; static char opt_search[SIZEOF_STR] = ""; static char opt_cdup[SIZEOF_STR] = ""; +static char opt_git_dir[SIZEOF_STR] = ""; enum option_type { OPT_NONE, @@ -497,7 +500,7 @@ parse_options(int argc, char *argv[]) if (!strcmp(opt, "-S")) { opt_request = REQ_VIEW_STATUS; - break; + continue; } if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { @@ -763,6 +766,7 @@ static struct keybinding default_keybindings[] = { { '.', REQ_TOGGLE_LINENO }, { 'g', REQ_TOGGLE_REV_GRAPH }, { ':', REQ_PROMPT }, + { 'u', REQ_STATUS_UPDATE }, /* Using the ncurses SIGWINCH handler. */ { KEY_RESIZE, REQ_SCREEN_RESIZE }, @@ -1151,7 +1155,7 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen) if (status == ERR) { fprintf(stderr, "Error on line %d, near '%.*s': %s\n", - config_lineno, optlen, opt, config_msg); + config_lineno, (int) optlen, opt, config_msg); config_errors = TRUE; } @@ -1287,8 +1291,8 @@ static struct view views[] = { VIEW_(LOG, "log", &pager_ops, ref_head), VIEW_(TREE, "tree", &tree_ops, ref_commit), VIEW_(BLOB, "blob", &blob_ops, ref_blob), - VIEW_(HELP, "help", &help_ops, ""), - VIEW_(PAGER, "pager", &pager_ops, ""), + VIEW_(HELP, "help", &help_ops, ""), + VIEW_(PAGER, "pager", &pager_ops, "stdin"), VIEW_(STATUS, "status", &status_ops, ""), }; @@ -1364,7 +1368,7 @@ update_view_title(struct view *view) assert(view_is_displayed(view)); - if (view->lines || view->pipe) { + if (!VIEW(REQ_VIEW_STATUS) && (view->lines || view->pipe)) { unsigned int view_lines = view->offset + view->height; unsigned int lines = view->lines ? MIN(view_lines, view->lines) * 100 / view->lines @@ -1392,7 +1396,7 @@ update_view_title(struct view *view) if (minsize < view->width) refsize = view->width - minsize + 7; - string_format_from(buf, &bufpos, " %.*s", refsize, view->ref); + string_format_from(buf, &bufpos, " %.*s", (int) refsize, view->ref); } if (statelen && bufpos < view->width) { @@ -2118,6 +2122,8 @@ open_view(struct view *prev, enum request request, enum open_flags flags) * User request switch noodle */ +static void status_update(struct view *view); + static int view_driver(struct view *view, enum request request) { @@ -2150,7 +2156,7 @@ view_driver(struct view *view, enum request request) break; case REQ_VIEW_PAGER: - if (!VIEW(REQ_VIEW_PAGER)->lines) { + if (!opt_pipe && !VIEW(REQ_VIEW_PAGER)->lines) { report("No pager content, press %s to run command from prompt", get_key(REQ_PROMPT)); break; @@ -2175,10 +2181,15 @@ 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))) { + int line; + view = view->parent; + line = view->lineno; move_view(view, request); if (view_is_displayed(view)) update_view_title(view); + if (line == view->lineno) + break; } else { move_view(view, request); break; @@ -2253,6 +2264,10 @@ view_driver(struct view *view, enum request request) redraw_display(); break; + case REQ_STATUS_UPDATE: + status_update(view); + break; + case REQ_NONE: doupdate(); return TRUE; @@ -2903,9 +2918,10 @@ error_out: #define STATUS_DIFF_INDEX_CMD "git diff-index -z --cached HEAD" #define STATUS_DIFF_FILES_CMD "git diff-files -z" #define STATUS_LIST_OTHER_CMD \ - "_git_exclude=$(git rev-parse --git-dir)/info/exclude;" \ - "test -f \"$_git_exclude\" && exclude=\"--exclude-from=$_git_exclude\";" \ - "git ls-files -z --others --exclude-per-directory=.gitignore \"$exclude\"" \ + "git ls-files -z --others --exclude-per-directory=.gitignore" + +#define STATUS_DIFF_SHOW_CMD \ + "git diff --root --patch-with-stat --find-copies-harder -B -C %s -- %s 2>/dev/null" /* First parse staged info using git-diff-index(1), then parse unstaged * info using git-diff-files(1), and finally untracked files using @@ -2913,6 +2929,9 @@ error_out: static bool status_open(struct view *view) { + struct stat statbuf; + char exclude[SIZEOF_STR]; + char cmd[SIZEOF_STR]; size_t i; for (i = 0; i < view->lines; i++) @@ -2924,9 +2943,22 @@ status_open(struct view *view) if (!realloc_lines(view, view->line_size + 6)) return FALSE; + if (!string_format(exclude, "%s/info/exclude", opt_git_dir)) + return FALSE; + + string_copy(cmd, STATUS_LIST_OTHER_CMD); + + if (stat(exclude, &statbuf) >= 0) { + size_t cmdsize = strlen(cmd); + + if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") || + sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd)) + return FALSE; + } + if (!status_run(view, STATUS_DIFF_INDEX_CMD, TRUE, LINE_STAT_STAGED) || !status_run(view, STATUS_DIFF_FILES_CMD, TRUE, LINE_STAT_UNSTAGED) || - !status_run(view, STATUS_LIST_OTHER_CMD, FALSE, LINE_STAT_UNTRACKED)) + !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED)) return FALSE; return TRUE; @@ -2992,6 +3024,73 @@ static bool status_enter(struct view *view, struct line *line) { struct status *status = line->data; + char path[SIZEOF_STR] = ""; + char *info; + size_t cmdsize = 0; + + if (line->type == LINE_STAT_NONE || + (!status && line[1].type == LINE_STAT_NONE)) { + report("No file to diff"); + return TRUE; + } + + if (status && sq_quote(path, 0, status->name) >= sizeof(path)) + return FALSE; + + if (opt_cdup[0] && + line->type != LINE_STAT_UNTRACKED && + !string_format_from(opt_cmd, &cmdsize, "cd %s;", opt_cdup)) + return FALSE; + + switch (line->type) { + case LINE_STAT_STAGED: + if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, + "--cached", path)) + return FALSE; + if (status) + info = "Staged changes to %s"; + else + info = "Staged changes"; + break; + + case LINE_STAT_UNSTAGED: + if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, + "", path)) + return FALSE; + if (status) + info = "Unstaged changes to %s"; + else + info = "Unstaged changes"; + break; + + case LINE_STAT_UNTRACKED: + if (opt_pipe) + return FALSE; + + if (!status) { + report("No file to show"); + return TRUE; + } + + opt_pipe = fopen(status->name, "r"); + info = "Untracked file %s"; + break; + + default: + die("w00t"); + } + + open_view(view, REQ_VIEW_DIFF, OPEN_RELOAD | OPEN_SPLIT); + if (view_is_displayed(VIEW(REQ_VIEW_DIFF))) { + string_format(VIEW(REQ_VIEW_DIFF)->ref, info, status->name); + } + + return TRUE; +} + +static bool +status_update_file(struct view *view, struct status *status, enum line_type type) +{ char cmd[SIZEOF_STR]; char buf[SIZEOF_STR]; size_t cmdsize = 0; @@ -2999,15 +3098,12 @@ status_enter(struct view *view, struct line *line) size_t written = 0; FILE *pipe; - if (!status) - return TRUE; - if (opt_cdup[0] && - line->type != LINE_STAT_UNTRACKED && + type != LINE_STAT_UNTRACKED && !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup)) return FALSE; - switch (line->type) { + switch (type) { case LINE_STAT_STAGED: if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c", status->old.mode, @@ -3043,36 +3139,74 @@ status_enter(struct view *view, struct line *line) if (written != bufsize) return FALSE; - open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); return TRUE; } static void +status_update(struct view *view) +{ + if (view == VIEW(REQ_VIEW_STATUS)) { + struct line *line = &view->line[view->lineno]; + + assert(view->lines); + + if (!line->data) { + while (++line < view->line + view->lines && line->data) { + if (!status_update_file(view, line->data, line->type)) + report("Failed to update file status"); + } + + if (!line[-1].data) { + report("Nothing to update"); + return; + } + + + } else if (!status_update_file(view, line->data, line->type)) { + report("Failed to update file status"); + } + + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); + } else { + report("This action is only valid for the status view"); + } +} + +static void status_select(struct view *view, struct line *line) { + struct status *status = line->data; + char file[SIZEOF_STR] = "all files"; char *text; + if (status && !string_format(file, "'%s'", status->name)) + return; + + if (!status && line[1].type == LINE_STAT_NONE) + line++; + switch (line->type) { case LINE_STAT_STAGED: - text = "Press Enter to unstage file for commit"; + text = "Press %s to unstage %s for commit"; break; case LINE_STAT_UNSTAGED: - text = "Press Enter to stage file for commit "; + text = "Press %s to stage %s for commit"; break; case LINE_STAT_UNTRACKED: - text = "Press Enter to stage file for addition"; + text = "Press %s to stage %s for addition"; break; case LINE_STAT_NONE: - return; + text = "Nothing to update"; + break; default: die("w00t"); } - string_ncopy(view->ref, text, strlen(text)); + string_format(view->ref, text, get_key(REQ_STATUS_UPDATE), file); } static bool @@ -4061,15 +4195,19 @@ load_repo_config(void) static int read_repo_info(char *name, size_t namelen, char *value, size_t valuelen) { - if (!opt_cdup[0]) + if (!opt_git_dir[0]) + string_ncopy(opt_git_dir, name, namelen); + else string_ncopy(opt_cdup, name, namelen); return OK; } +/* XXX: The line outputted by "--show-cdup" can be empty so the option + * must be the last one! */ static int load_repo_info(void) { - return read_properties(popen("git rev-parse --show-cdup", "r"), + return read_properties(popen("git rev-parse --git-dir --show-cdup 2>/dev/null", "r"), "=", read_repo_info); } @@ -4158,6 +4296,13 @@ main(int argc, char *argv[]) string_ncopy(opt_codeset, codeset, strlen(codeset)); } + if (load_repo_info() == ERR) + die("Failed to load repo info."); + + /* Require a git repository unless when running in pager mode. */ + if (!opt_git_dir[0]) + die("Not a git repository"); + if (load_options() == ERR) die("Failed to load user config."); @@ -4166,9 +4311,6 @@ main(int argc, char *argv[]) if (load_repo_config() == ERR) die("Failed to load repo config."); - if (load_repo_info() == ERR) - die("Failed to load repo info."); - if (!parse_options(argc, argv)) return 0; @@ -4181,10 +4323,6 @@ main(int argc, char *argv[]) if (load_refs() == ERR) die("Failed to load refs."); - /* Require a git repository unless when running in pager mode. */ - if (refs_size == 0 && opt_request != REQ_VIEW_PAGER) - die("Not a git repository"); - for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++) view->cmd_env = getenv(view->cmd_env);