X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/7d31b0590bb4ae3f6a06d95e81ae54f13eebc632..c630ef12f388ecb40834d9b4456ce80fc499dedf:/tig.c diff --git a/tig.c b/tig.c index 3811a22..71ddbb5 100644 --- a/tig.c +++ b/tig.c @@ -51,6 +51,7 @@ #endif static void __NORETURN die(const char *err, ...); +static void warn(const char *msg, ...); static void report(const char *msg, ...); static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, size_t, char *, size_t)); static void set_nonblocking_input(bool loading); @@ -72,6 +73,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, #define REVGRAPH_MERGE 'M' #define REVGRAPH_BRANCH '+' #define REVGRAPH_COMMIT '*' +#define REVGRAPH_BOUND '^' #define REVGRAPH_LINE '|' #define SIZEOF_REVGRAPH 19 /* Size of revision ancestry graphics. */ @@ -105,13 +107,13 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, "git ls-remote $(git rev-parse --git-dir) 2>/dev/null" #define TIG_DIFF_CMD \ - "git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null" + "git show --no-color --root --patch-with-stat --find-copies-harder -C %s 2>/dev/null" #define TIG_LOG_CMD \ - "git log --cc --stat -n100 %s 2>/dev/null" + "git log --no-color --cc --stat -n100 %s 2>/dev/null" #define TIG_MAIN_CMD \ - "git log --topo-order --pretty=raw %s 2>/dev/null" + "git log --no-color --topo-order --boundary --pretty=raw %s 2>/dev/null" #define TIG_TREE_CMD \ "git ls-tree %s %s" @@ -318,6 +320,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(NEXT, "Move to next"), \ REQ_(PREVIOUS, "Move to previous"), \ REQ_(VIEW_NEXT, "Move focus to next view"), \ + REQ_(REFRESH, "Reload and refresh"), \ REQ_(VIEW_CLOSE, "Close the current view"), \ REQ_(QUIT, "Close all views and quit"), \ \ @@ -342,7 +345,6 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(FIND_PREV, "Find previous search match"), \ \ REQ_GROUP("Misc") \ - REQ_(NONE, "Do nothing"), \ REQ_(PROMPT, "Bring up the prompt"), \ REQ_(SCREEN_REDRAW, "Redraw the screen"), \ REQ_(SCREEN_RESIZE, "Resize the screen"), \ @@ -351,8 +353,10 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(TOGGLE_LINENO, "Toggle line numbers"), \ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \ REQ_(STATUS_UPDATE, "Update file status"), \ + REQ_(STATUS_MERGE, "Merge file using external tool"), \ + REQ_(TREE_PARENT, "Switch to parent directory in tree view"), \ REQ_(EDIT, "Open in editor"), \ - REQ_(CHERRY_PICK, "Cherry-pick commit to current branch") + REQ_(NONE, "Do nothing") /* User action requests. */ @@ -362,8 +366,7 @@ enum request { /* Offset all requests to avoid conflicts with ncurses getch values. */ REQ_OFFSET = KEY_MAX + 1, - REQ_INFO, - REQ_UNKNOWN, + REQ_INFO #undef REQ_GROUP #undef REQ_ @@ -395,7 +398,7 @@ get_request(const char *name) !string_enum_compare(req_info[i].name, name, namelen)) return req_info[i].request; - return REQ_UNKNOWN; + return REQ_NONE; } @@ -406,22 +409,14 @@ get_request(const char *name) static const char usage[] = "tig " TIG_VERSION " (" __DATE__ ")\n" "\n" -"Usage: tig [options]\n" -" or: tig [options] [--] [git log options]\n" -" or: tig [options] log [git log options]\n" -" or: tig [options] diff [git diff options]\n" -" or: tig [options] show [git show options]\n" -" or: tig [options] < [git command output]\n" +"Usage: tig [options] [revs] [--] [paths]\n" +" or: tig show [options] [revs] [--] [paths]\n" +" or: tig status\n" +" or: tig < [git command output]\n" "\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" -" -v, --version Show version and exit\n" -" -h, --help Show help message and exit\n"; +" -v, --version Show version and exit\n" +" -h, --help Show help message and exit\n"; /* Option and state variables. */ static bool opt_line_number = FALSE; @@ -439,6 +434,7 @@ 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] = ""; +static char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */ static char opt_editor[SIZEOF_STR] = ""; enum option_type { @@ -488,45 +484,41 @@ check_option(char *opt, char short_name, char *name, enum option_type type, ...) static bool parse_options(int argc, char *argv[]) { + char *altargv[1024]; + int altargc = 0; + char *subcommand = NULL; int i; for (i = 1; i < argc; i++) { char *opt = argv[i]; if (!strcmp(opt, "log") || - !strcmp(opt, "diff") || - !strcmp(opt, "show")) { + !strcmp(opt, "diff")) { + subcommand = opt; opt_request = opt[0] == 'l' ? REQ_VIEW_LOG : REQ_VIEW_DIFF; + warn("`tig %s' has been deprecated", opt); break; } - if (opt[0] && opt[0] != '-') - break; - - if (!strcmp(opt, "-l")) { - opt_request = REQ_VIEW_LOG; - continue; - } - - if (!strcmp(opt, "-d")) { + if (!strcmp(opt, "show")) { + subcommand = opt; opt_request = REQ_VIEW_DIFF; - continue; + break; } - if (!strcmp(opt, "-S")) { + if (!strcmp(opt, "status")) { + subcommand = opt; opt_request = REQ_VIEW_STATUS; - continue; + break; } - if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { - opt_line_number = TRUE; - continue; - } + if (opt[0] && opt[0] != '-') + break; - if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) { - opt_tab_size = MIN(opt_tab_size, TABSIZE); - continue; + if (!strcmp(opt, "--")) { + i++; + break; } if (check_option(opt, 'v', "version", OPT_NONE)) { @@ -539,29 +531,59 @@ parse_options(int argc, char *argv[]) return FALSE; } - if (!strcmp(opt, "--")) { - i++; - break; + if (!strcmp(opt, "-S")) { + warn("`%s' has been deprecated; use `tig status' instead", opt); + opt_request = REQ_VIEW_STATUS; + continue; + } + + if (!strcmp(opt, "-l")) { + opt_request = REQ_VIEW_LOG; + } else if (!strcmp(opt, "-d")) { + opt_request = REQ_VIEW_DIFF; + } else if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { + opt_line_number = TRUE; + } else if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) { + opt_tab_size = MIN(opt_tab_size, TABSIZE); + } else { + if (altargc >= ARRAY_SIZE(altargv)) + die("maximum number of arguments exceeded"); + altargv[altargc++] = opt; + continue; } - die("unknown option '%s'\n\n%s", opt, usage); + warn("`%s' has been deprecated", opt); } + /* Check that no 'alt' arguments occured before a subcommand. */ + if (subcommand && i < argc && altargc > 0) + die("unknown arguments before `%s'", argv[i]); + if (!isatty(STDIN_FILENO)) { opt_request = REQ_VIEW_PAGER; opt_pipe = stdin; - } else if (i < argc) { + } else if (opt_request == REQ_VIEW_STATUS) { + if (argc - i > 1) + warn("ignoring arguments after `%s'", argv[i]); + + } else if (i < argc || altargc > 0) { + int alti = 0; size_t buf_size; if (opt_request == REQ_VIEW_MAIN) /* XXX: This is vulnerable to the user overriding * options required for the main view parser. */ - string_copy(opt_cmd, "git log --pretty=raw"); + string_copy(opt_cmd, "git log --no-color --pretty=raw --boundary"); else string_copy(opt_cmd, "git"); buf_size = strlen(opt_cmd); + while (buf_size < sizeof(opt_cmd) && alti < altargc) { + opt_cmd[buf_size++] = ' '; + buf_size = sq_quote(opt_cmd, buf_size, altargv[alti++]); + } + while (buf_size < sizeof(opt_cmd) && i < argc) { opt_cmd[buf_size++] = ' '; buf_size = sq_quote(opt_cmd, buf_size, argv[i++]); @@ -625,6 +647,7 @@ LINE(MAIN_DELIM, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ 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(MAIN_REVGRAPH,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(STAT_SECTION, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ @@ -693,15 +716,15 @@ get_line_info(char *name, int namelen) static void init_colors(void) { - int default_bg = COLOR_BLACK; - int default_fg = COLOR_WHITE; + int default_bg = line_info[LINE_DEFAULT].bg; + int default_fg = line_info[LINE_DEFAULT].fg; enum line_type type; start_color(); - if (use_default_colors() != ERR) { - default_bg = -1; - default_fg = -1; + if (assume_default_colors(default_fg, default_bg) == ERR) { + default_bg = COLOR_BLACK; + default_fg = COLOR_WHITE; } for (type = 0; type < ARRAY_SIZE(line_info); type++) { @@ -751,6 +774,7 @@ static struct keybinding default_keybindings[] = { { KEY_RETURN, REQ_ENTER }, { KEY_UP, REQ_PREVIOUS }, { KEY_DOWN, REQ_NEXT }, + { 'R', REQ_REFRESH }, /* Cursor navigation */ { 'k', REQ_MOVE_UP }, @@ -784,8 +808,9 @@ static struct keybinding default_keybindings[] = { { 'g', REQ_TOGGLE_REV_GRAPH }, { ':', REQ_PROMPT }, { 'u', REQ_STATUS_UPDATE }, + { 'M', REQ_STATUS_MERGE }, + { ',', REQ_TREE_PARENT }, { 'e', REQ_EDIT }, - { 'C', REQ_CHERRY_PICK }, /* Using the ncurses SIGWINCH handler. */ { KEY_RESIZE, REQ_SCREEN_RESIZE }, @@ -911,10 +936,30 @@ get_key_value(const char *name) } static char * +get_key_name(int key_value) +{ + static char key_char[] = "'X'"; + char *seq = NULL; + int key; + + for (key = 0; key < ARRAY_SIZE(key_table); key++) + if (key_table[key].value == key_value) + seq = key_table[key].name; + + if (seq == NULL && + key_value < 127 && + isprint(key_value)) { + key_char[1] = (char) key_value; + seq = key_char; + } + + return seq ? seq : "'?'"; +} + +static char * get_key(enum request request) { static char buf[BUFSIZ]; - static char key_char[] = "'X'"; size_t pos = 0; char *sep = ""; int i; @@ -923,27 +968,12 @@ get_key(enum request request) for (i = 0; i < ARRAY_SIZE(default_keybindings); i++) { struct keybinding *keybinding = &default_keybindings[i]; - char *seq = NULL; - int key; if (keybinding->request != request) continue; - for (key = 0; key < ARRAY_SIZE(key_table); key++) - if (key_table[key].value == keybinding->alias) - seq = key_table[key].name; - - if (seq == NULL && - keybinding->alias < 127 && - isprint(keybinding->alias)) { - key_char[1] = (char) keybinding->alias; - seq = key_char; - } - - if (!seq) - seq = "'?'"; - - if (!string_format_from(buf, &pos, "%s%s", sep, seq)) + if (!string_format_from(buf, &pos, "%s%s", sep, + get_key_name(keybinding->alias))) return "Too many keybindings!"; sep = ", "; } @@ -951,6 +981,67 @@ get_key(enum request request) return buf; } +struct run_request { + enum keymap keymap; + int key; + char cmd[SIZEOF_STR]; +}; + +static struct run_request *run_request; +static size_t run_requests; + +static enum request +add_run_request(enum keymap keymap, int key, int argc, char **argv) +{ + struct run_request *tmp; + struct run_request req = { keymap, key }; + size_t bufpos; + + for (bufpos = 0; argc > 0; argc--, argv++) + if (!string_format_from(req.cmd, &bufpos, "%s ", *argv)) + return REQ_NONE; + + req.cmd[bufpos - 1] = 0; + + tmp = realloc(run_request, (run_requests + 1) * sizeof(*run_request)); + if (!tmp) + return REQ_NONE; + + run_request = tmp; + run_request[run_requests++] = req; + + return REQ_NONE + run_requests; +} + +static struct run_request * +get_run_request(enum request request) +{ + if (request <= REQ_NONE) + return NULL; + return &run_request[request - REQ_NONE - 1]; +} + +static void +add_builtin_run_requests(void) +{ + struct { + enum keymap keymap; + int key; + char *argv[1]; + } reqs[] = { + { KEYMAP_MAIN, 'C', { "git cherry-pick %(commit)" } }, + { KEYMAP_GENERIC, 'G', { "git gc" } }, + }; + int i; + + for (i = 0; i < ARRAY_SIZE(reqs); i++) { + enum request req; + + req = add_run_request(reqs[i].keymap, reqs[i].key, 1, reqs[i].argv); + if (req != REQ_NONE) + add_keybinding(reqs[i].keymap, req, reqs[i].key); + } +} /* * User config file handling. @@ -1083,7 +1174,7 @@ option_bind_command(int argc, char *argv[]) int keymap; int key; - if (argc != 3) { + if (argc < 3) { config_msg = "Wrong number of arguments given to bind command"; return ERR; } @@ -1100,7 +1191,22 @@ option_bind_command(int argc, char *argv[]) } request = get_request(argv[2]); - if (request == REQ_UNKNOWN) { + if (request == REQ_NONE) { + const char *obsolete[] = { "cherry-pick" }; + size_t namelen = strlen(argv[2]); + int i; + + for (i = 0; i < ARRAY_SIZE(obsolete); i++) { + if (namelen == strlen(obsolete[i]) && + !string_enum_compare(obsolete[i], argv[2], namelen)) { + config_msg = "Obsolete request name"; + return ERR; + } + } + } + if (request == REQ_NONE && *argv[2]++ == '!') + request = add_run_request(keymap, key, argc - 2, argv + 2); + if (request == REQ_NONE) { config_msg = "Unknown request name"; return ERR; } @@ -1120,9 +1226,10 @@ set_option(char *opt, char *value) /* Tokenize */ while (argc < ARRAY_SIZE(argv) && (valuelen = strcspn(value, " \t"))) { argv[argc++] = value; - value += valuelen; - if (!*value) + + /* Nothing more to tokenize or last available token. */ + if (!*value || argc >= ARRAY_SIZE(argv)) break; *value++ = 0; @@ -1183,27 +1290,47 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen) return OK; } -static int -load_options(void) +static void +load_option_file(const char *path) { - char *home = getenv("HOME"); - char buf[SIZEOF_STR]; FILE *file; - config_lineno = 0; - config_errors = FALSE; - - if (!home || !string_format(buf, "%s/.tigrc", home)) - return ERR; - /* It's ok that the file doesn't exist. */ - file = fopen(buf, "r"); + file = fopen(path, "r"); if (!file) - return OK; + return; + + config_lineno = 0; + config_errors = FALSE; if (read_properties(file, " \t", read_option) == ERR || config_errors == TRUE) - fprintf(stderr, "Errors while loading %s.\n", buf); + fprintf(stderr, "Errors while loading %s.\n", path); +} + +static int +load_options(void) +{ + char *home = getenv("HOME"); + char *tigrc_user = getenv("TIGRC_USER"); + char *tigrc_system = getenv("TIGRC_SYSTEM"); + char buf[SIZEOF_STR]; + + add_builtin_run_requests(); + + if (!tigrc_system) { + if (!string_format(buf, "%s/tigrc", SYSCONFDIR)) + return ERR; + tigrc_system = buf; + } + load_option_file(tigrc_system); + + if (!tigrc_user) { + if (!home || !string_format(buf, "%s/.tigrc", home)) + return ERR; + tigrc_user = buf; + } + load_option_file(tigrc_user); return OK; } @@ -2143,7 +2270,31 @@ open_view(struct view *prev, enum request request, enum open_flags flags) } static void -open_editor(struct view *view, bool from_root, char *file) +open_external_viewer(const char *cmd) +{ + def_prog_mode(); /* save current tty modes */ + endwin(); /* restore original tty modes */ + system(cmd); + fprintf(stderr, "Press Enter to continue"); + getc(stdin); + reset_prog_mode(); + redraw_display(); +} + +static void +open_mergetool(const char *file) +{ + char cmd[SIZEOF_STR]; + char file_sq[SIZEOF_STR]; + + if (sq_quote(file_sq, 0, file) < sizeof(file_sq) && + string_format(cmd, "git mergetool %s", file_sq)) { + open_external_viewer(cmd); + } +} + +static void +open_editor(bool from_root, const char *file) { char cmd[SIZEOF_STR]; char file_sq[SIZEOF_STR]; @@ -2162,12 +2313,58 @@ open_editor(struct view *view, bool from_root, char *file) if (sq_quote(file_sq, 0, file) < sizeof(file_sq) && string_format(cmd, "%s %s%s", editor, prefix, file_sq)) { - def_prog_mode(); /* save current tty modes */ - endwin(); /* restore original tty modes */ - system(cmd); - reset_prog_mode(); - redraw_display(); + open_external_viewer(cmd); + } +} + +static void +open_run_request(enum request request) +{ + struct run_request *req = get_run_request(request); + char buf[SIZEOF_STR * 2]; + size_t bufpos; + char *cmd; + + if (!req) { + report("Unknown run request"); + return; + } + + bufpos = 0; + cmd = req->cmd; + + while (cmd) { + char *next = strstr(cmd, "%("); + int len = next - cmd; + char *value; + + if (!next) { + len = strlen(cmd); + value = ""; + + } else if (!strncmp(next, "%(head)", 7)) { + value = ref_head; + + } else if (!strncmp(next, "%(commit)", 9)) { + value = ref_commit; + + } else if (!strncmp(next, "%(blob)", 7)) { + value = ref_blob; + + } else { + report("Unknown replacement in run request: `%s`", req->cmd); + return; + } + + if (!string_format_from(buf, &bufpos, "%.*s%s", len, cmd, value)) + return; + + if (next) + next = strchr(next, ')') + 1; + cmd = next; } + + open_external_viewer(buf); } /* @@ -2184,6 +2381,11 @@ view_driver(struct view *view, enum request request) return TRUE; } + if (request > REQ_NONE) { + open_run_request(request); + return TRUE; + } + if (view && view->lines) { request = view->ops->request(view, request, &view->line[view->lineno]); if (request == REQ_NONE) @@ -2234,12 +2436,19 @@ view_driver(struct view *view, enum request request) open_view(view, request, OPEN_DEFAULT); break; + case REQ_VIEW_STATUS: + if (opt_is_inside_work_tree == FALSE) { + report("The status view requires a working tree"); + break; + } + open_view(view, request, OPEN_DEFAULT); + break; + case REQ_VIEW_MAIN: case REQ_VIEW_DIFF: case REQ_VIEW_LOG: case REQ_VIEW_TREE: case REQ_VIEW_HELP: - case REQ_VIEW_STATUS: open_view(view, request, OPEN_DEFAULT); break; @@ -2285,6 +2494,10 @@ view_driver(struct view *view, enum request request) report(""); break; } + case REQ_REFRESH: + report("Refreshing is not yet supported for the %s view", view->name); + break; + case REQ_TOGGLE_LINENO: opt_line_number = !opt_line_number; redraw_display(); @@ -2334,9 +2547,6 @@ view_driver(struct view *view, enum request request) report("Nothing to edit"); break; - case REQ_CHERRY_PICK: - report("Nothing to cherry-pick"); - break; case REQ_ENTER: report("Nothing to enter"); @@ -2625,6 +2835,8 @@ help_open(struct view *view) if (!req_info[i].request) lines++; + lines += run_requests + 1; + view->line = calloc(lines, sizeof(*view->line)); if (!view->line) return FALSE; @@ -2634,6 +2846,9 @@ help_open(struct view *view) for (i = 0; i < ARRAY_SIZE(req_info); i++) { char *key; + if (req_info[i].request == REQ_NONE) + continue; + if (!req_info[i].request) { add_line_text(view, "", LINE_DEFAULT); add_line_text(view, req_info[i].help, LINE_DEFAULT); @@ -2641,12 +2856,39 @@ help_open(struct view *view) } key = get_key(req_info[i].request); + if (!*key) + key = "(no key defined)"; + if (!string_format(buf, " %-25s %s", key, req_info[i].help)) continue; add_line_text(view, buf, LINE_DEFAULT); } + if (run_requests) { + add_line_text(view, "", LINE_DEFAULT); + add_line_text(view, "External commands:", LINE_DEFAULT); + } + + for (i = 0; i < run_requests; i++) { + struct run_request *req = get_run_request(REQ_NONE + i + 1); + char *key; + + if (!req) + continue; + + key = get_key_name(req->key); + if (!*key) + key = "(no key defined)"; + + if (!string_format(buf, " %-10s %-14s `%s`", + keymap_table[req->keymap].name, + key, req->cmd)) + continue; + + add_line_text(view, buf, LINE_DEFAULT); + } + return TRUE; } @@ -2818,6 +3060,16 @@ tree_request(struct view *view, enum request request, struct line *line) { enum open_flags flags; + if (request == REQ_TREE_PARENT) { + if (*opt_path) { + /* fake 'cd ..' */ + request = REQ_ENTER; + line = &view->line[1]; + } else { + /* quit view if at top of tree */ + return REQ_VIEW_CLOSE; + } + } if (request != REQ_ENTER) return request; @@ -2913,12 +3165,13 @@ struct status { struct { mode_t mode; char rev[SIZEOF_REV]; + char name[SIZEOF_STR]; } old; struct { mode_t mode; char rev[SIZEOF_REV]; + char name[SIZEOF_STR]; } new; - char name[SIZEOF_STR]; }; static struct status stage_status; @@ -2936,7 +3189,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize) char *new_rev = buf + 56; char *status = buf + 97; - if (bufsize != 99 || + if (bufsize < 99 || old_mode[-1] != ':' || new_mode[-1] != ' ' || old_rev[-1] != ' ' || @@ -2952,7 +3205,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize) file->old.mode = strtoul(old_mode, NULL, 8); file->new.mode = strtoul(new_mode, NULL, 8); - file->name[0] = 0; + file->old.name[0] = file->new.name[0] = 0; return TRUE; } @@ -2961,6 +3214,7 @@ static bool status_run(struct view *view, const char cmd[], bool diff, enum line_type type) { struct status *file = NULL; + struct status *unmerged = NULL; char buf[SIZEOF_STR * 4]; size_t bufsize = 0; FILE *pipe; @@ -3010,12 +3264,45 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type) if (!sep) break; sepsize = sep - buf + 1; + + /* Collapse all 'M'odified entries that + * follow a associated 'U'nmerged entry. + */ + if (file->status == 'U') { + unmerged = file; + + } else if (unmerged) { + int collapse = !strcmp(buf, unmerged->new.name); + + unmerged = NULL; + if (collapse) { + free(file); + view->lines--; + continue; + } + } + } + + /* Grab the old name for rename/copy. */ + if (!*file->old.name && + (file->status == 'R' || file->status == 'C')) { + sepsize = sep - buf + 1; + string_ncopy(file->old.name, buf, sepsize); + 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); + string_ncopy(file->new.name, buf, sepsize); + if (!*file->old.name) + string_copy(file->old.name, file->new.name); bufsize -= sepsize; memmove(buf, sep + 1, bufsize); file = NULL; @@ -3035,13 +3322,17 @@ error_out: return TRUE; } -#define STATUS_DIFF_INDEX_CMD "git diff-index -z --cached HEAD" -#define STATUS_DIFF_FILES_CMD "git diff-files -z" +/* Don't show unmerged entries in the staged section. */ +#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached -M HEAD" +#define STATUS_DIFF_FILES_CMD "git update-index -q --refresh && git diff-files -z" #define STATUS_LIST_OTHER_CMD \ "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" +#define STATUS_DIFF_INDEX_SHOW_CMD \ + "git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s %s 2>/dev/null" + +#define STATUS_DIFF_FILES_SHOW_CMD \ + "git diff-files --root --patch-with-stat -C -M -- %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 @@ -3052,12 +3343,13 @@ status_open(struct view *view) struct stat statbuf; char exclude[SIZEOF_STR]; char cmd[SIZEOF_STR]; + unsigned long prev_lineno = view->lineno; 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->lines = view->line_size = view->lineno = 0; view->line = NULL; if (!realloc_lines(view, view->line_size + 6)) @@ -3081,6 +3373,13 @@ status_open(struct view *view) !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED)) return FALSE; + /* If all went well restore the previous line number to stay in + * the context. */ + if (prev_lineno < view->lines) + view->lineno = prev_lineno; + else + view->lineno = view->lines - 1; + return TRUE; } @@ -3135,7 +3434,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele if (!selected) wattrset(view->win, A_NORMAL); wmove(view->win, lineno, 4); - waddstr(view->win, status->name); + waddstr(view->win, status->new.name); return TRUE; } @@ -3144,7 +3443,8 @@ static enum request status_enter(struct view *view, struct line *line) { struct status *status = line->data; - char path[SIZEOF_STR] = ""; + char oldpath[SIZEOF_STR] = ""; + char newpath[SIZEOF_STR] = ""; char *info; size_t cmdsize = 0; @@ -3154,8 +3454,15 @@ status_enter(struct view *view, struct line *line) return REQ_NONE; } - if (status && sq_quote(path, 0, status->name) >= sizeof(path)) - return REQ_QUIT; + if (status) { + if (sq_quote(oldpath, 0, status->old.name) >= sizeof(oldpath)) + return REQ_QUIT; + /* Diffs for unmerged entries are empty when pasing the + * new path, so leave it empty. */ + if (status->status != 'U' && + sq_quote(newpath, 0, status->new.name) >= sizeof(newpath)) + return REQ_QUIT; + } if (opt_cdup[0] && line->type != LINE_STAT_UNTRACKED && @@ -3164,8 +3471,8 @@ status_enter(struct view *view, struct line *line) switch (line->type) { case LINE_STAT_STAGED: - if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, - "--cached", path)) + if (!string_format_from(opt_cmd, &cmdsize, + STATUS_DIFF_INDEX_SHOW_CMD, oldpath, newpath)) return REQ_QUIT; if (status) info = "Staged changes to %s"; @@ -3174,8 +3481,8 @@ status_enter(struct view *view, struct line *line) break; case LINE_STAT_UNSTAGED: - if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, - "", path)) + if (!string_format_from(opt_cmd, &cmdsize, + STATUS_DIFF_FILES_SHOW_CMD, oldpath, newpath)) return REQ_QUIT; if (status) info = "Unstaged changes to %s"; @@ -3193,12 +3500,12 @@ status_enter(struct view *view, struct line *line) return REQ_NONE; } - opt_pipe = fopen(status->name, "r"); + opt_pipe = fopen(status->new.name, "r"); info = "Untracked file %s"; break; default: - die("w00t"); + die("line type %d not handled in switch", line->type); } open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT); @@ -3210,7 +3517,7 @@ status_enter(struct view *view, struct line *line) } stage_line_type = line->type; - string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.name); + string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.new.name); } return REQ_NONE; @@ -3237,7 +3544,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c", status->old.mode, status->old.rev, - status->name, 0)) + status->old.name, 0)) return FALSE; string_add(cmd, cmdsize, "git update-index -z --index-info"); @@ -3245,14 +3552,14 @@ status_update_file(struct view *view, struct status *status, enum line_type type case LINE_STAT_UNSTAGED: case LINE_STAT_UNTRACKED: - if (!string_format_from(buf, &bufsize, "%s%c", status->name, 0)) + if (!string_format_from(buf, &bufsize, "%s%c", status->new.name, 0)) return FALSE; string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin"); break; default: - die("w00t"); + die("line type %d not handled in switch", type); } pipe = popen(cmd, "w"); @@ -3292,8 +3599,6 @@ status_update(struct view *view) } else if (!status_update_file(view, line->data, line->type)) { report("Failed to update file status"); } - - open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); } static enum request @@ -3306,21 +3611,38 @@ status_request(struct view *view, enum request request, struct line *line) status_update(view); break; + case REQ_STATUS_MERGE: + if (!status || status->status != 'U') { + report("Merging only possible for files with unmerged status ('U')."); + return REQ_NONE; + } + open_mergetool(status->new.name); + break; + case REQ_EDIT: if (!status) return request; - open_editor(view, status->status != '?', status->name); + open_editor(status->status != '?', status->new.name); break; case REQ_ENTER: + /* After returning the status view has been split to + * show the stage view. No further reloading is + * necessary. */ status_enter(view, line); + return REQ_NONE; + + case REQ_REFRESH: + /* Simply reload the view. */ break; default: return request; } + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); + return REQ_NONE; } @@ -3330,8 +3652,9 @@ status_select(struct view *view, struct line *line) struct status *status = line->data; char file[SIZEOF_STR] = "all files"; char *text; + char *key; - if (status && !string_format(file, "'%s'", status->name)) + if (status && !string_format(file, "'%s'", status->new.name)) return; if (!status && line[1].type == LINE_STAT_NONE) @@ -3355,10 +3678,18 @@ status_select(struct view *view, struct line *line) break; default: - die("w00t"); + die("line type %d not handled in switch", line->type); } - string_format(view->ref, text, get_key(REQ_STATUS_UPDATE), file); + if (status && status->status == 'U') { + text = "Press %s to resolve conflict in %s"; + key = get_key(REQ_STATUS_MERGE); + + } else { + key = get_key(REQ_STATUS_UPDATE); + } + + string_format(view->ref, text, key, file); } static bool @@ -3376,7 +3707,7 @@ status_grep(struct view *view, struct line *line) char *text; switch (state) { - case S_NAME: text = status->name; break; + case S_NAME: text = status->new.name; break; case S_STATUS: buf[0] = status->status; text = buf; @@ -3541,10 +3872,10 @@ stage_request(struct view *view, enum request request, struct line *line) break; case REQ_EDIT: - if (!stage_status.name[0]) + if (!stage_status.new.name[0]) return request; - open_editor(view, stage_status.status != '?', stage_status.name); + open_editor(stage_status.status != '?', stage_status.new.name); break; case REQ_ENTER: @@ -3592,6 +3923,7 @@ struct rev_graph { size_t size; struct commit *commit; size_t pos; + unsigned int boundary:1; }; /* Parents of the commit being visualized. */ @@ -3664,7 +3996,9 @@ get_rev_graph_symbol(struct rev_graph *graph) { chtype symbol; - if (graph->parents->size == 0) + if (graph->boundary) + symbol = REVGRAPH_BOUND; + else if (graph->parents->size == 0) symbol = REVGRAPH_INIT; else if (graph_parent_is_merge(graph)) symbol = REVGRAPH_MERGE; @@ -3746,7 +4080,7 @@ prepare_rev_graph(struct rev_graph *graph) } /* Interleave the new revision parent(s). */ - for (i = 0; i < graph->parents->size; i++) + for (i = 0; !graph->boundary && i < graph->parents->size; i++) push_rev_graph(graph->next, graph->parents->rev[i]); /* Lastly, put any remaining revisions. */ @@ -3830,12 +4164,12 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select } col += AUTHOR_COLS; - if (type != LINE_CURSOR) - wattrset(view->win, A_NORMAL); if (opt_rev_graph && commit->graph_size) { size_t i; + if (type != LINE_CURSOR) + wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH)); wmove(view->win, lineno, col); /* Using waddch() instead of waddnstr() ensures that * they'll be rendered correctly for the cursor line. */ @@ -3845,6 +4179,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select waddch(view->win, ' '); col += commit->graph_size + 1; } + if (type != LINE_CURSOR) + wattrset(view->win, A_NORMAL); wmove(view->win, lineno, col); @@ -3904,7 +4240,13 @@ main_read(struct view *view, char *line) if (!commit) return FALSE; - string_copy_rev(commit->id, line + STRING_SIZE("commit ")); + line += STRING_SIZE("commit "); + if (*line == '-') { + graph->boundary = 1; + line++; + } + + string_copy_rev(commit->id, line); commit->refs = get_refs(commit->id); graph->commit = commit; add_line_data(view, commit, LINE_MAIN_COMMIT); @@ -3995,26 +4337,6 @@ main_read(struct view *view, char *line) return TRUE; } -static void -cherry_pick_commit(struct commit *commit) -{ - char cmd[SIZEOF_STR]; - char *cherry_pick = getenv("TIG_CHERRY_PICK"); - - if (!cherry_pick) - cherry_pick = "git cherry-pick"; - - if (string_format(cmd, "%s %s", cherry_pick, commit->id)) { - def_prog_mode(); /* save current tty modes */ - endwin(); /* restore original tty modes */ - system(cmd); - fprintf(stderr, "Press Enter to continue"); - getc(stdin); - reset_prog_mode(); - redraw_display(); - } -} - static enum request main_request(struct view *view, enum request request, struct line *line) { @@ -4022,8 +4344,6 @@ main_request(struct view *view, enum request request, struct line *line) if (request == REQ_ENTER) open_view(view, REQ_VIEW_DIFF, flags); - else if (request == REQ_CHERRY_PICK) - cherry_pick_commit(line->data); else return request; @@ -4262,6 +4582,21 @@ report(const char *msg, ...) if (input_mode) return; + if (!view) { + char buf[SIZEOF_STR]; + va_list args; + + va_start(args, msg); + if (vsnprintf(buf, sizeof(buf), msg, args) >= sizeof(buf)) { + buf[sizeof(buf) - 1] = 0; + buf[sizeof(buf) - 2] = '.'; + buf[sizeof(buf) - 3] = '.'; + buf[sizeof(buf) - 4] = '.'; + } + va_end(args); + die("%s", buf); + } + if (!status_empty || *msg) { va_list args; @@ -4541,10 +4876,21 @@ load_repo_config(void) static int read_repo_info(char *name, size_t namelen, char *value, size_t valuelen) { - if (!opt_git_dir[0]) + if (!opt_git_dir[0]) { string_ncopy(opt_git_dir, name, namelen); - else + + } else if (opt_is_inside_work_tree == -1) { + /* This can be 3 different values depending on the + * version of git being used. If git-rev-parse does not + * understand --is-inside-work-tree it will simply echo + * the option else either "true" or "false" is printed. + * Default to true for the unknown case. */ + opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE; + + } else { string_ncopy(opt_cdup, name, namelen); + } + return OK; } @@ -4553,7 +4899,7 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen) static int load_repo_info(void) { - return read_properties(popen("git rev-parse --git-dir --show-cdup 2>/dev/null", "r"), + return read_properties(popen("git rev-parse --git-dir --is-inside-work-tree --show-cdup 2>/dev/null", "r"), "=", read_repo_info); } @@ -4627,6 +4973,18 @@ die(const char *err, ...) exit(1); } +static void +warn(const char *msg, ...) +{ + va_list args; + + va_start(args, msg); + fputs("tig warning: ", stderr); + vfprintf(stderr, msg, args); + fputs("\n", stderr); + va_end(args); +} + int main(int argc, char *argv[]) {