X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/0ff3b97cdb548763d320ef004a846e20b86209b7..739e81def0105e91ba4f8b0e6209834983d68019:/tig.c diff --git a/tig.c b/tig.c index b712173..5805f58 100644 --- a/tig.c +++ b/tig.c @@ -11,8 +11,8 @@ * GNU General Public License for more details. */ -#ifndef VERSION -#define VERSION "tig-0.6.git" +#ifndef VERSION +#define VERSION "unknown-version" #endif #ifndef DEBUG @@ -110,6 +110,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, /* XXX: Needs to be defined to the empty string. */ #define TIG_HELP_CMD "" #define TIG_PAGER_CMD "" +#define TIG_STATUS_CMD "" /* Some ascii-shorthands fitted into the ncurses namespace. */ #define KEY_TAB '\t' @@ -168,7 +169,7 @@ string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen) /* Shorthands for safely copying into a fixed buffer. */ #define string_copy(dst, src) \ - string_ncopy_do(dst, sizeof(dst), src, sizeof(dst)) + string_ncopy_do(dst, sizeof(dst), src, sizeof(src)) #define string_ncopy(dst, src, srclen) \ string_ncopy_do(dst, sizeof(dst), src, srclen) @@ -176,6 +177,9 @@ string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen) #define string_copy_rev(dst, src) \ string_ncopy_do(dst, SIZEOF_REV, src, SIZEOF_REV - 1) +#define string_add(dst, from, src) \ + string_ncopy_do(dst + (from), sizeof(dst) - (from), src, sizeof(src)) + static char * chomp_string(char *name) { @@ -293,6 +297,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(VIEW_BLOB, "Show blob view"), \ REQ_(VIEW_HELP, "Show help page"), \ REQ_(VIEW_PAGER, "Show pager view"), \ + REQ_(VIEW_STATUS, "Show status view"), \ \ REQ_GROUP("View manipulation") \ REQ_(ENTER, "Enter current line and scroll"), \ @@ -382,7 +387,7 @@ get_request(const char *name) */ static const char usage[] = -VERSION " (" __DATE__ ")\n" +"tig " VERSION " (" __DATE__ ")\n" "\n" "Usage: tig [options]\n" " or: tig [options] [--] [git log options]\n" @@ -394,6 +399,7 @@ VERSION " (" __DATE__ ")\n" "Options:\n" " -l Start up in log view\n" " -d Start up in diff view\n" +" -S Start up in status view\n" " -n[I], --line-number[=I] Show line numbers with given interval\n" " -b[N], --tab-size[=N] Set number of spaces for tab expansion\n" " -- Mark end of tig options\n" @@ -414,6 +420,7 @@ static bool opt_utf8 = TRUE; 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] = ""; enum option_type { OPT_NONE, @@ -488,6 +495,11 @@ parse_options(int argc, char *argv[]) continue; } + if (!strcmp(opt, "-S")) { + opt_request = REQ_VIEW_STATUS; + break; + } + if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { opt_line_number = TRUE; continue; @@ -595,7 +607,12 @@ LINE(MAIN_TAG, "", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \ LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ -LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL) +LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ +LINE(STAT_SECTION, "", COLOR_DEFAULT, COLOR_BLUE, A_BOLD), \ +LINE(STAT_NONE, "", COLOR_DEFAULT, COLOR_DEFAULT, 0), \ +LINE(STAT_STAGED, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ +LINE(STAT_UNSTAGED,"", COLOR_YELLOW, COLOR_DEFAULT, 0), \ +LINE(STAT_UNTRACKED,"", COLOR_MAGENTA, COLOR_DEFAULT, 0) enum line_type { #define LINE(type, line, fg, bg, attr) \ @@ -706,6 +723,7 @@ static struct keybinding default_keybindings[] = { { 'f', REQ_VIEW_BLOB }, { 'p', REQ_VIEW_PAGER }, { 'h', REQ_VIEW_HELP }, + { 'S', REQ_VIEW_STATUS }, /* View manipulation */ { 'q', REQ_VIEW_CLOSE }, @@ -758,7 +776,8 @@ static struct keybinding default_keybindings[] = { KEYMAP_(TREE), \ KEYMAP_(BLOB), \ KEYMAP_(PAGER), \ - KEYMAP_(HELP) \ + KEYMAP_(HELP), \ + KEYMAP_(STATUS) enum keymap { #define KEYMAP_(name) KEYMAP_##name @@ -1023,7 +1042,7 @@ option_set_command(int argc, char *argv[]) break; } default: - string_copy(opt_encoding, arg); + string_ncopy(opt_encoding, arg, strlen(arg)); return OK; } } @@ -1253,6 +1272,7 @@ static struct view_ops main_ops; static struct view_ops tree_ops; static struct view_ops blob_ops; static struct view_ops help_ops; +static struct view_ops status_ops; #define VIEW_STR(name, cmd, env, ref, ops, map) \ { name, cmd, #env, ref, ops, map} @@ -1262,13 +1282,14 @@ static struct view_ops help_ops; static struct view views[] = { - VIEW_(MAIN, "main", &main_ops, ref_head), - VIEW_(DIFF, "diff", &pager_ops, ref_commit), - 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_(MAIN, "main", &main_ops, ref_head), + VIEW_(DIFF, "diff", &pager_ops, ref_commit), + 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_(STATUS, "status", &status_ops, ""), }; #define VIEW(req) (&views[(req) - REQ_OFFSET - 1]) @@ -1781,8 +1802,6 @@ end_update(struct view *view) static bool begin_update(struct view *view) { - const char *id = view->id; - if (view->pipe) end_update(view); @@ -1803,11 +1822,12 @@ begin_update(struct view *view) else if (sq_quote(path, 0, opt_path) >= sizeof(path)) return FALSE; - if (!string_format(view->cmd, format, id, path)) + if (!string_format(view->cmd, format, view->id, path)) return FALSE; } else { const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt; + const char *id = view->id; if (!string_format(view->cmd, format, id, id, id, id, id)) return FALSE; @@ -1816,7 +1836,7 @@ begin_update(struct view *view) * member. This is needed by the blob view. Most other * views sets it automatically after loading because the * first line is a commit line. */ - string_copy(view->ref, id); + string_copy_rev(view->ref, view->id); } /* Special case for the pager view. */ @@ -1835,7 +1855,7 @@ begin_update(struct view *view) view->offset = 0; view->lines = 0; view->lineno = 0; - string_copy_rev(view->vid, id); + string_copy_rev(view->vid, view->id); if (view->line) { int i; @@ -2143,6 +2163,7 @@ view_driver(struct view *view, enum request request) case REQ_VIEW_LOG: case REQ_VIEW_TREE: case REQ_VIEW_HELP: + case REQ_VIEW_STATUS: open_view(view, request, OPEN_DEFAULT); break; @@ -2222,7 +2243,7 @@ view_driver(struct view *view, enum request request) break; case REQ_SHOW_VERSION: - report("%s (built %s)", VERSION, __DATE__); + report("tig-%s (built %s)", VERSION, __DATE__); return TRUE; case REQ_SCREEN_RESIZE: @@ -2752,6 +2773,352 @@ static struct view_ops blob_ops = { /* + * Status backend + */ + +struct status { + char status; + struct { + mode_t mode; + char rev[SIZEOF_REV]; + } old; + struct { + mode_t mode; + char rev[SIZEOF_REV]; + } new; + char name[SIZEOF_STR]; +}; + +/* Get fields from the diff line: + * :100644 100644 06a5d6ae9eca55be2e0e585a152e6b1336f2b20e 0000000000000000000000000000000000000000 M + */ +static inline bool +status_get_diff(struct status *file, char *buf, size_t bufsize) +{ + char *old_mode = buf + 1; + char *new_mode = buf + 8; + char *old_rev = buf + 15; + char *new_rev = buf + 56; + char *status = buf + 97; + + if (bufsize != 99 || + old_mode[-1] != ':' || + new_mode[-1] != ' ' || + old_rev[-1] != ' ' || + new_rev[-1] != ' ' || + status[-1] != ' ') + return FALSE; + + file->status = *status; + + string_copy_rev(file->old.rev, old_rev); + string_copy_rev(file->new.rev, new_rev); + + file->old.mode = strtoul(old_mode, NULL, 8); + file->new.mode = strtoul(new_mode, NULL, 8); + + file->name[0] = 0; + + return TRUE; +} + +static bool +status_run(struct view *view, const char cmd[], bool diff, enum line_type type) +{ + struct status *file = NULL; + char buf[SIZEOF_STR * 4]; + size_t bufsize = 0; + FILE *pipe; + + pipe = popen(cmd, "r"); + if (!pipe) + return FALSE; + + add_line_data(view, NULL, type); + + while (!feof(pipe) && !ferror(pipe)) { + char *sep; + size_t readsize; + + readsize = fread(buf + bufsize, 1, sizeof(buf) - bufsize, pipe); + if (!readsize) + break; + bufsize += readsize; + + /* Process while we have NUL chars. */ + while ((sep = memchr(buf, 0, bufsize))) { + size_t sepsize = sep - buf + 1; + + if (!file) { + if (!realloc_lines(view, view->line_size + 1)) + goto error_out; + + file = calloc(1, sizeof(*file)); + if (!file) + goto error_out; + + add_line_data(view, file, type); + } + + /* Parse diff info part. */ + if (!diff) { + file->status = '?'; + + } else if (!file->status) { + if (!status_get_diff(file, buf, sepsize)) + goto error_out; + + bufsize -= sepsize; + memmove(buf, sep + 1, bufsize); + + sep = memchr(buf, 0, bufsize); + if (!sep) + break; + sepsize = sep - buf + 1; + } + + /* git-ls-files just delivers a NUL separated + * list of file names similar to the second half + * of the git-diff-* output. */ + string_ncopy(file->name, buf, sepsize); + bufsize -= sepsize; + memmove(buf, sep + 1, bufsize); + file = NULL; + } + } + + if (ferror(pipe)) { +error_out: + pclose(pipe); + return FALSE; + } + + if (!view->line[view->lines - 1].data) + add_line_data(view, NULL, LINE_STAT_NONE); + + pclose(pipe); + return TRUE; +} + +#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\"" \ + +/* First parse staged info using git-diff-index(1), then parse unstaged + * info using git-diff-files(1), and finally untracked files using + * git-ls-files(1). */ +static bool +status_open(struct view *view) +{ + size_t i; + + for (i = 0; i < view->lines; i++) + free(view->line[i].data); + free(view->line); + view->lines = view->line_size = 0; + view->line = NULL; + + if (!realloc_lines(view, view->line_size + 6)) + 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)) + return FALSE; + + return TRUE; +} + +static bool +status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected) +{ + struct status *status = line->data; + + wmove(view->win, lineno, 0); + + if (selected) { + wattrset(view->win, get_line_attr(LINE_CURSOR)); + wchgat(view->win, -1, 0, LINE_CURSOR, NULL); + + } else if (!status && line->type != LINE_STAT_NONE) { + wattrset(view->win, get_line_attr(LINE_STAT_SECTION)); + wchgat(view->win, -1, 0, LINE_STAT_SECTION, NULL); + + } else { + wattrset(view->win, get_line_attr(line->type)); + } + + if (!status) { + char *text; + + switch (line->type) { + case LINE_STAT_STAGED: + text = "Changes to be committed:"; + break; + + case LINE_STAT_UNSTAGED: + text = "Changed but not updated:"; + break; + + case LINE_STAT_UNTRACKED: + text = "Untracked files:"; + break; + + case LINE_STAT_NONE: + text = " (no files)"; + break; + + default: + return FALSE; + } + + waddstr(view->win, text); + return TRUE; + } + + waddch(view->win, status->status); + if (!selected) + wattrset(view->win, A_NORMAL); + wmove(view->win, lineno, 4); + waddstr(view->win, status->name); + + return TRUE; +} + +static bool +status_enter(struct view *view, struct line *line) +{ + struct status *status = line->data; + char cmd[SIZEOF_STR]; + char buf[SIZEOF_STR]; + size_t cmdsize = 0; + size_t bufsize = 0; + size_t written = 0; + FILE *pipe; + + if (!status) + return TRUE; + + if (opt_cdup[0] && + line->type != LINE_STAT_UNTRACKED && + !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup)) + return FALSE; + + switch (line->type) { + case LINE_STAT_STAGED: + if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c", + status->old.mode, + status->old.rev, + status->name, 0)) + return FALSE; + + string_add(cmd, cmdsize, "git update-index -z --index-info"); + break; + + case LINE_STAT_UNSTAGED: + case LINE_STAT_UNTRACKED: + if (!string_format_from(buf, &bufsize, "%s%c", status->name, 0)) + return FALSE; + + string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin"); + break; + + default: + die("w00t"); + } + + pipe = popen(cmd, "w"); + if (!pipe) + return FALSE; + + while (!ferror(pipe) && written < bufsize) { + written += fwrite(buf + written, 1, bufsize - written, pipe); + } + + pclose(pipe); + + if (written != bufsize) + return FALSE; + + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); + return TRUE; +} + +static void +status_select(struct view *view, struct line *line) +{ + char *text; + + switch (line->type) { + case LINE_STAT_STAGED: + text = "Press Enter to unstage file for commit"; + break; + + case LINE_STAT_UNSTAGED: + text = "Press Enter to stage file for commit "; + break; + + case LINE_STAT_UNTRACKED: + text = "Press Enter to stage file for addition"; + break; + + case LINE_STAT_NONE: + return; + + default: + die("w00t"); + } + + string_ncopy(view->ref, text, strlen(text)); +} + +static bool +status_grep(struct view *view, struct line *line) +{ + struct status *status = line->data; + enum { S_STATUS, S_NAME, S_END } state; + char buf[2] = "?"; + regmatch_t pmatch; + + if (!status) + return FALSE; + + for (state = S_STATUS; state < S_END; state++) { + char *text; + + switch (state) { + case S_NAME: text = status->name; break; + case S_STATUS: + buf[0] = status->status; + text = buf; + break; + + default: + return FALSE; + } + + if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH) + return TRUE; + } + + return FALSE; +} + +static struct view_ops status_ops = { + "file", + status_open, + NULL, + status_draw, + status_enter, + status_grep, + status_select, +}; + + +/* * Revision graph */ @@ -2837,7 +3204,7 @@ push_rev_graph(struct rev_graph *graph, char *parent) return; if (graph->size < SIZEOF_REVITEMS) { - string_ncopy(graph->rev[graph->size++], parent, SIZEOF_REV); + string_copy_rev(graph->rev[graph->size++], parent); } } @@ -3125,7 +3492,7 @@ main_read(struct view *view, char *line) ident = "Unknown"; } - string_copy(commit->author, ident); + string_ncopy(commit->author, ident, strlen(ident)); /* Parse epoch and timezone */ if (emailend[1] == ' ') { @@ -3171,7 +3538,7 @@ main_read(struct view *view, char *line) /* FIXME: More graceful handling of titles; append "..." to * shortened titles, etc. */ - string_copy(commit->title, line); + string_ncopy(commit->title, line, strlen(line)); } return TRUE; @@ -3679,7 +4046,7 @@ static int read_repo_config_option(char *name, int namelen, char *value, int valuelen) { if (!strcmp(name, "i18n.commitencoding")) - string_copy(opt_encoding, value); + string_ncopy(opt_encoding, value, valuelen); return OK; } @@ -3692,6 +4059,21 @@ load_repo_config(void) } static int +read_repo_info(char *name, int namelen, char *value, int valuelen) +{ + if (!opt_cdup[0]) + string_ncopy(opt_cdup, name, namelen); + return OK; +} + +static int +load_repo_info(void) +{ + return read_properties(popen("git rev-parse --show-cdup", "r"), + "=", read_repo_info); +} + +static int read_properties(FILE *pipe, const char *separators, int (*read_property)(char *, int, char *, int)) { @@ -3771,17 +4153,22 @@ main(int argc, char *argv[]) signal(SIGINT, quit); if (setlocale(LC_ALL, "")) { - string_copy(opt_codeset, nl_langinfo(CODESET)); + char *codeset = nl_langinfo(CODESET); + + string_ncopy(opt_codeset, codeset, strlen(codeset)); } if (load_options() == ERR) die("Failed to load user config."); /* Load the repo config file so options can be overwritten from - * the command line. */ + * the command line. */ 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; @@ -3851,7 +4238,7 @@ main(int argc, char *argv[]) char *search = read_prompt(prompt); if (search) - string_copy(opt_search, search); + string_ncopy(opt_search, search, strlen(search)); else request = REQ_NONE; break;