index 2a31ddd03b89507c1ecde2cfc788f1110a54eb15..801fccd4914e0338a8e23e576d3dded09f8ee8a2 100644 (file)
--- a/tig.c
+++ b/tig.c
/* ncurses(3): Must be defined to have extended wide-character functions. */
#define _XOPEN_SOURCE_EXTENDED
-#ifdef HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_H
#include <ncursesw/ncurses.h>
#else
-#ifdef HAVE_NCURSES_NCURSES_H
-#include <ncurses/ncurses.h>
-#else
#include <ncurses.h>
#endif
-#endif
#if __GNUC__ >= 3
#define __NORETURN __attribute__((__noreturn__))
return io_run(&io, IO_RD, NULL, argv) && io_read_buf(&io, buf, bufsize);
}
+typedef int (*io_read_fn)(char *, size_t, char *, size_t, void *data);
+
static int
io_load(struct io *io, const char *separators,
- int (*read_property)(char *, size_t, char *, size_t))
+ io_read_fn read_property, void *data)
{
char *name;
int state = OK;
valuelen = 0;
}
- state = read_property(name, namelen, value, valuelen);
+ state = read_property(name, namelen, value, valuelen, data);
}
if (state != ERR && io_error(io))
static int
io_run_load(const char **argv, const char *separators,
- int (*read_property)(char *, size_t, char *, size_t))
+ io_read_fn read_property, void *data)
{
struct io io;
if (!io_run(&io, IO_RD, NULL, argv))
return ERR;
- return io_load(&io, separators, read_property);
+ return io_load(&io, separators, read_property, data);
}
static signed char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */
static char opt_editor[SIZEOF_STR] = "";
static FILE *opt_tty = NULL;
-static const char **opt_diff_args = NULL;
-static const char **opt_rev_args = NULL;
-static const char **opt_file_args = NULL;
+static const char **opt_diff_argv = NULL;
+static const char **opt_rev_argv = NULL;
+static const char **opt_file_argv = NULL;
#define is_initial_commit() (!get_ref_head())
#define is_head_commit(rev) (!strcmp((rev), "HEAD") || (get_ref_head() && !strcmp(rev, get_ref_head()->id)))
* User config file handling.
*/
-static int config_lineno;
-static bool config_errors;
-static const char *config_msg;
+#define OPT_ERR_INFO \
+ OPT_ERR_(INTEGER_VALUE_OUT_OF_BOUND, "Integer value out of bound"), \
+ OPT_ERR_(INVALID_STEP_VALUE, "Invalid step value"), \
+ OPT_ERR_(NO_OPTION_VALUE, "No option value"), \
+ OPT_ERR_(NO_VALUE_ASSIGNED, "No value assigned"), \
+ OPT_ERR_(OBSOLETE_REQUEST_NAME, "Obsolete request name"), \
+ OPT_ERR_(TOO_MANY_OPTION_ARGUMENTS, "Too many option arguments"), \
+ OPT_ERR_(UNKNOWN_ATTRIBUTE, "Unknown attribute"), \
+ OPT_ERR_(UNKNOWN_COLOR, "Unknown color"), \
+ OPT_ERR_(UNKNOWN_COLOR_NAME, "Unknown color name"), \
+ OPT_ERR_(UNKNOWN_KEY, "Unknown key"), \
+ OPT_ERR_(UNKNOWN_KEY_MAP, "Unknown key map"), \
+ OPT_ERR_(UNKNOWN_OPTION_COMMAND, "Unknown option command"), \
+ OPT_ERR_(UNKNOWN_REQUEST_NAME, "Unknown request name"), \
+ OPT_ERR_(UNKNOWN_VARIABLE_NAME, "Unknown variable name"), \
+ OPT_ERR_(UNMATCHED_QUOTATION, "Unmatched quotation"), \
+ OPT_ERR_(WRONG_NUMBER_OF_ARGUMENTS, "Wrong number of arguments"),
+
+enum option_code {
+#define OPT_ERR_(name, msg) OPT_ERR_ ## name
+ OPT_ERR_INFO
+#undef OPT_ERR_
+ OPT_OK
+};
+
+static const char *option_errors[] = {
+#define OPT_ERR_(name, msg) msg
+ OPT_ERR_INFO
+#undef OPT_ERR_
+};
static const struct enum_map color_map[] = {
#define COLOR_MAP(name) ENUM_MAP(#name, COLOR_##name)
#define set_attribute(attr, name) map_enum(attr, attr_map, name)
-static int parse_step(double *opt, const char *arg)
+static enum option_code
+parse_step(double *opt, const char *arg)
{
*opt = atoi(arg);
if (!strchr(arg, '%'))
- return OK;
+ return OPT_OK;
/* "Shift down" so 100% and 1 does not conflict. */
*opt = (*opt - 1) / 100;
if (*opt >= 1.0) {
*opt = 0.99;
- config_msg = "Step value larger than 100%";
- return ERR;
+ return OPT_ERR_INVALID_STEP_VALUE;
}
if (*opt < 0.0) {
*opt = 1;
- config_msg = "Invalid step value";
- return ERR;
+ return OPT_ERR_INVALID_STEP_VALUE;
}
- return OK;
+ return OPT_OK;
}
-static int
+static enum option_code
parse_int(int *opt, const char *arg, int min, int max)
{
int value = atoi(arg);
if (min <= value && value <= max) {
*opt = value;
- return OK;
+ return OPT_OK;
}
- config_msg = "Integer value out of bound";
- return ERR;
+ return OPT_ERR_INTEGER_VALUE_OUT_OF_BOUND;
}
static bool
}
/* Wants: object fgcolor bgcolor [attribute] */
-static int
+static enum option_code
option_color_command(int argc, const char *argv[])
{
struct line_info *info;
- if (argc < 3) {
- config_msg = "Wrong number of arguments given to color command";
- return ERR;
- }
+ if (argc < 3)
+ return OPT_ERR_WRONG_NUMBER_OF_ARGUMENTS;
info = get_line_info(argv[0]);
if (!info) {
int index;
if (!map_enum(&index, obsolete, argv[0])) {
- config_msg = "Unknown color name";
- return ERR;
+ return OPT_ERR_UNKNOWN_COLOR_NAME;
}
info = &line_info[index];
}
if (!set_color(&info->fg, argv[1]) ||
!set_color(&info->bg, argv[2])) {
- config_msg = "Unknown color";
- return ERR;
+ return OPT_ERR_UNKNOWN_COLOR;
}
info->attr = 0;
int attr;
if (!set_attribute(&attr, argv[argc])) {
- config_msg = "Unknown attribute";
- return ERR;
+ return OPT_ERR_UNKNOWN_ATTRIBUTE;
}
info->attr |= attr;
}
- return OK;
+ return OPT_OK;
}
-static int parse_bool(bool *opt, const char *arg)
+static enum option_code
+parse_bool(bool *opt, const char *arg)
{
*opt = (!strcmp(arg, "1") || !strcmp(arg, "true") || !strcmp(arg, "yes"))
? TRUE : FALSE;
- return OK;
+ return OPT_OK;
}
-static int parse_enum_do(unsigned int *opt, const char *arg,
- const struct enum_map *map, size_t map_size)
+static enum option_code
+parse_enum_do(unsigned int *opt, const char *arg,
+ const struct enum_map *map, size_t map_size)
{
bool is_true;
assert(map_size > 1);
if (map_enum_do(map, map_size, (int *) opt, arg))
- return OK;
-
- if (parse_bool(&is_true, arg) != OK)
- return ERR;
+ return OPT_OK;
+ parse_bool(&is_true, arg);
*opt = is_true ? map[1].value : map[0].value;
- return OK;
+ return OPT_OK;
}
#define parse_enum(opt, arg, map) \
parse_enum_do(opt, arg, map, ARRAY_SIZE(map))
-static int
+static enum option_code
parse_string(char *opt, const char *arg, size_t optsize)
{
int arglen = strlen(arg);
switch (arg[0]) {
case '\"':
case '\'':
- if (arglen == 1 || arg[arglen - 1] != arg[0]) {
- config_msg = "Unmatched quotation";
- return ERR;
- }
+ if (arglen == 1 || arg[arglen - 1] != arg[0])
+ return OPT_ERR_UNMATCHED_QUOTATION;
arg += 1; arglen -= 2;
default:
string_ncopy_do(opt, optsize, arg, arglen);
- return OK;
+ return OPT_OK;
}
}
/* Wants: name = value */
-static int
+static enum option_code
option_set_command(int argc, const char *argv[])
{
- if (argc != 3) {
- config_msg = "Wrong number of arguments given to set command";
- return ERR;
- }
+ if (argc != 3)
+ return OPT_ERR_WRONG_NUMBER_OF_ARGUMENTS;
- if (strcmp(argv[1], "=")) {
- config_msg = "No value assigned";
- return ERR;
- }
+ if (strcmp(argv[1], "="))
+ return OPT_ERR_NO_VALUE_ASSIGNED;
if (!strcmp(argv[0], "show-author"))
return parse_enum(&opt_author, argv[2], author_map);
if (!strcmp(argv[0], "status-untracked-dirs"))
return parse_bool(&opt_untracked_dirs_content, argv[2]);
- config_msg = "Unknown variable name";
- return ERR;
+ return OPT_ERR_UNKNOWN_VARIABLE_NAME;
}
/* Wants: mode request key */
-static int
+static enum option_code
option_bind_command(int argc, const char *argv[])
{
enum request request;
int keymap = -1;
int key;
- if (argc < 3) {
- config_msg = "Wrong number of arguments given to bind command";
- return ERR;
- }
+ if (argc < 3)
+ return OPT_ERR_WRONG_NUMBER_OF_ARGUMENTS;
- if (!set_keymap(&keymap, argv[0])) {
- config_msg = "Unknown key map";
- return ERR;
- }
+ if (!set_keymap(&keymap, argv[0]))
+ return OPT_ERR_UNKNOWN_KEY_MAP;
key = get_key_value(argv[1]);
- if (key == ERR) {
- config_msg = "Unknown key";
- return ERR;
- }
+ if (key == ERR)
+ return OPT_ERR_UNKNOWN_KEY;
request = get_request(argv[2]);
if (request == REQ_UNKNOWN) {
if (map_enum(&alias, obsolete, argv[2])) {
if (alias != REQ_NONE)
add_keybinding(keymap, alias, key);
- config_msg = "Obsolete request name";
- return ERR;
+ return OPT_ERR_OBSOLETE_REQUEST_NAME;
}
}
if (request == REQ_UNKNOWN && *argv[2]++ == '!')
request = add_run_request(keymap, key, argv + 2);
- if (request == REQ_UNKNOWN) {
- config_msg = "Unknown request name";
- return ERR;
- }
+ if (request == REQ_UNKNOWN)
+ return OPT_ERR_UNKNOWN_REQUEST_NAME;
add_keybinding(keymap, request, key);
- return OK;
+ return OPT_OK;
}
-static int
+static enum option_code
set_option(const char *opt, char *value)
{
const char *argv[SIZEOF_ARG];
int argc = 0;
- if (!argv_from_string(argv, &argc, value)) {
- config_msg = "Too many option arguments";
- return ERR;
- }
+ if (!argv_from_string(argv, &argc, value))
+ return OPT_ERR_TOO_MANY_OPTION_ARGUMENTS;
if (!strcmp(opt, "color"))
return option_color_command(argc, argv);
if (!strcmp(opt, "bind"))
return option_bind_command(argc, argv);
- config_msg = "Unknown option command";
- return ERR;
+ return OPT_ERR_UNKNOWN_OPTION_COMMAND;
}
+struct config_state {
+ int lineno;
+ bool errors;
+};
+
static int
-read_option(char *opt, size_t optlen, char *value, size_t valuelen)
+read_option(char *opt, size_t optlen, char *value, size_t valuelen, void *data)
{
- int status = OK;
+ struct config_state *config = data;
+ enum option_code status = OPT_ERR_NO_OPTION_VALUE;
- config_lineno++;
- config_msg = "Internal error";
+ config->lineno++;
/* Check for comment markers, since read_properties() will
* only ensure opt and value are split at first " \t". */
if (optlen == 0)
return OK;
- if (opt[optlen] != 0) {
- config_msg = "No option value";
- status = ERR;
-
- } else {
+ if (opt[optlen] == 0) {
/* Look for comment endings in the value. */
size_t len = strcspn(value, "#");
status = set_option(opt, value);
}
- if (status == ERR) {
+ if (status != OPT_OK) {
warn("Error on line %d, near '%.*s': %s",
- config_lineno, (int) optlen, opt, config_msg);
- config_errors = TRUE;
+ config->lineno, (int) optlen, opt, option_errors[status]);
+ config->errors = TRUE;
}
/* Always keep going if errors are encountered. */
static void
load_option_file(const char *path)
{
+ struct config_state config = { 0, FALSE };
struct io io;
/* It's OK that the file doesn't exist. */
if (!io_open(&io, "%s", path))
return;
- config_lineno = 0;
- config_errors = FALSE;
-
- if (io_load(&io, " \t", read_option) == ERR ||
- config_errors == TRUE)
+ if (io_load(&io, " \t", read_option, &config) == ERR ||
+ config.errors == TRUE)
warn("Errors while loading %s.", path);
}
* that conflict with keybindings. */
add_builtin_run_requests();
- if (!opt_diff_args && tig_diff_opts && *tig_diff_opts) {
+ if (!opt_diff_argv && tig_diff_opts && *tig_diff_opts) {
static const char *diff_opts[SIZEOF_ARG] = { NULL };
int argc = 0;
if (!string_format(buf, "%s", tig_diff_opts) ||
!argv_from_string(diff_opts, &argc, buf))
die("TIG_DIFF_OPTS contains too many arguments");
- else if (!argv_copy(&opt_diff_args, diff_opts))
+ else if (!argv_copy(&opt_diff_argv, diff_opts))
die("Failed to format TIG_DIFF_OPTS arguments");
}
* Option management
*/
-static void
-toggle_enum_option_do(unsigned int *opt, const char *help,
- const struct enum_map *map, size_t size)
-{
- *opt = (*opt + 1) % size;
- redraw_display(FALSE);
- report("Displaying %s %s", enum_name(map[*opt]), help);
-}
-
-#define toggle_enum_option(opt, help, map) \
- toggle_enum_option_do(opt, help, map, ARRAY_SIZE(map))
-
-#define toggle_date() toggle_enum_option(&opt_date, "dates", date_map)
-#define toggle_author() toggle_enum_option(&opt_author, "author names", author_map)
-
-static void
-toggle_view_option(bool *option, const char *help)
-{
- *option = !*option;
- redraw_display(FALSE);
- report("%sabling %s", *option ? "En" : "Dis", help);
-}
+#define TOGGLE_MENU \
+ TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, NULL) \
+ TOGGLE_(DATE, 'D', "dates", &opt_date, date_map) \
+ TOGGLE_(AUTHOR, 'A', "author names", &opt_author, author_map) \
+ TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, NULL) \
+ TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, NULL)
static void
-open_option_menu(void)
-{
+toggle_option(enum request request)
+{
+ const struct {
+ enum request request;
+ const struct enum_map *map;
+ size_t map_size;
+ } data[] = {
+#define TOGGLE_(id, key, help, value, map) { REQ_TOGGLE_ ## id, map, ARRAY_SIZE(map) },
+ TOGGLE_MENU
+#undef TOGGLE_
+ };
const struct menu_item menu[] = {
- { '.', "line numbers", &opt_line_number },
- { 'D', "date display", &opt_date },
- { 'A', "author display", &opt_author },
- { 'g', "revision graph display", &opt_rev_graph },
- { 'F', "reference display", &opt_show_refs },
+#define TOGGLE_(id, key, help, value, map) { key, help, value },
+ TOGGLE_MENU
+#undef TOGGLE_
{ 0 }
};
- int selected = 0;
+ int i = 0;
- if (prompt_menu("Toggle option", menu, &selected)) {
- if (menu[selected].data == &opt_date)
- toggle_date();
- else if (menu[selected].data == &opt_author)
- toggle_author();
- else
- toggle_view_option(menu[selected].data, menu[selected].text);
+ if (request == REQ_OPTIONS) {
+ if (!prompt_menu("Toggle option", menu, &i))
+ return;
+ } else {
+ while (i < ARRAY_SIZE(data) && data[i].request != request)
+ i++;
+ if (i >= ARRAY_SIZE(data))
+ die("Invalid request (%d)", request);
+ }
+
+ if (data[i].map != NULL) {
+ unsigned int *opt = menu[i].data;
+
+ *opt = (*opt + 1) % data[i].map_size;
+ redraw_display(FALSE);
+ report("Displaying %s %s", enum_name(data[i].map[*opt]), menu[i].text);
+
+ } else {
+ bool *option = menu[i].data;
+
+ *option = !*option;
+ redraw_display(FALSE);
+ report("%sabling %s", *option ? "En" : "Dis", menu[i].text);
}
}
}
static bool
-format_argv(const char ***dst_argv, const char *src_argv[], bool replace)
+format_argv(const char ***dst_argv, const char *src_argv[], bool replace, bool first)
{
char buf[SIZEOF_STR];
int argc;
size_t bufpos = 0;
if (!strcmp(arg, "%(fileargs)")) {
- if (!argv_append_array(dst_argv, opt_file_args))
+ if (!argv_append_array(dst_argv, opt_file_argv))
break;
continue;
} else if (!strcmp(arg, "%(diffargs)")) {
- if (!argv_append_array(dst_argv, opt_diff_args))
+ if (!argv_append_array(dst_argv, opt_diff_argv))
break;
continue;
- } else if (!strcmp(arg, "%(revargs)")) {
- if (!argv_append_array(dst_argv, opt_rev_args))
+ } else if (!strcmp(arg, "%(revargs)") ||
+ (first && !strcmp(arg, "%(commit)"))) {
+ if (!argv_append_array(dst_argv, opt_rev_argv))
break;
continue;
}
prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
{
view->dir = dir;
- return format_argv(&view->argv, argv, replace);
+ return format_argv(&view->argv, argv, replace, !view->prev);
}
static bool
return;
}
- if (format_argv(&argv, req->argv, TRUE))
+ if (format_argv(&argv, req->argv, TRUE, FALSE))
open_external_viewer(argv, NULL);
if (argv)
argv_free(argv);
break;
case REQ_OPTIONS:
- open_option_menu();
- break;
-
case REQ_TOGGLE_LINENO:
- toggle_view_option(&opt_line_number, "line numbers");
- break;
-
case REQ_TOGGLE_DATE:
- toggle_date();
- break;
-
case REQ_TOGGLE_AUTHOR:
- toggle_author();
- break;
-
case REQ_TOGGLE_REV_GRAPH:
- toggle_view_option(&opt_rev_graph, "revision graph display");
- break;
-
case REQ_TOGGLE_REFS:
- toggle_view_option(&opt_show_refs, "reference display");
+ toggle_option(request);
break;
case REQ_TOGGLE_SORT_FIELD:
{
if (!data) {
/* Fall back to retry if no diff will be shown. */
- if (view->lines == 0 && opt_file_args) {
+ if (view->lines == 0 && opt_file_argv) {
int pos = argv_size(view->argv)
- - argv_size(opt_file_args) - 1;
+ - argv_size(opt_file_argv) - 1;
if (pos > 0 && !strcmp(view->argv[pos], "--")) {
for (; view->argv[pos]; pos++) {
switch (request) {
case REQ_ENTER:
+ if (view_is_displayed(view) && display[0] != view)
+ maximize_view(view);
open_view(view, REQ_VIEW_DIFF, flags);
break;
case REQ_REFRESH:
keypad(status_win, TRUE);
wbkgdset(status_win, get_line_attr(LINE_STATUS));
+#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119)
+ set_tabsize(opt_tab_size);
+#else
TABSIZE = opt_tab_size;
+#endif
term = getenv("XTERM_VERSION") ? NULL : getenv("COLORTERM");
if (term && !strcmp(term, "gnome-terminal")) {
}
static int
-read_ref(char *id, size_t idlen, char *name, size_t namelen)
+read_ref(char *id, size_t idlen, char *name, size_t namelen, void *data)
{
struct ref *ref = NULL;
bool tag = FALSE;
for (i = 0; i < refs_size; i++)
refs[i]->id[0] = 0;
- if (io_run_load(ls_remote_argv, "\t", read_ref) == ERR)
+ if (io_run_load(ls_remote_argv, "\t", read_ref, NULL) == ERR)
return ERR;
/* Update the ref lists to reflect changes. */
}
static void
-set_repo_config_option(char *name, char *value, int (*cmd)(int, const char **))
+set_repo_config_option(char *name, char *value, enum option_code (*cmd)(int, const char **))
{
const char *argv[SIZEOF_ARG] = { name, "=" };
int argc = 1 + (cmd == option_set_command);
- int error = ERR;
+ enum option_code error;
if (!argv_from_string(argv, &argc, value))
- config_msg = "Too many option arguments";
+ error = OPT_ERR_TOO_MANY_OPTION_ARGUMENTS;
else
error = cmd(argc, argv);
- if (error == ERR)
- warn("Option 'tig.%s': %s", name, config_msg);
+ if (error != OPT_OK)
+ warn("Option 'tig.%s': %s", name, option_errors[error]);
}
static bool
}
static int
-read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen)
+read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen, void *data)
{
if (!strcmp(name, "i18n.commitencoding"))
string_ncopy(opt_encoding, value, valuelen);
{
const char *config_list_argv[] = { "git", "config", "--list", NULL };
- return io_run_load(config_list_argv, "=", read_repo_config_option);
+ return io_run_load(config_list_argv, "=", read_repo_config_option, NULL);
}
static int
-read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
+read_repo_info(char *name, size_t namelen, char *value, size_t valuelen, void *data)
{
if (!opt_git_dir[0]) {
string_ncopy(opt_git_dir, name, namelen);
"--show-cdup", "--show-prefix", NULL
};
- return io_run_load(rev_parse_argv, "=", read_repo_info);
+ return io_run_load(rev_parse_argv, "=", read_repo_info, NULL);
}
va_end(args);
}
-static const char ***filter_args;
-
static int
-read_filter_args(char *name, size_t namelen, char *value, size_t valuelen)
+read_filter_args(char *name, size_t namelen, char *value, size_t valuelen, void *data)
{
+ const char ***filter_args = data;
+
return argv_append(filter_args, name) ? OK : ERR;
}
@@ -7776,10 +7773,9 @@ filter_rev_parse(const char ***args, const char *arg1, const char *arg2, const c
const char *rev_parse_argv[SIZEOF_ARG] = { "git", "rev-parse", arg1, arg2 };
const char **all_argv = NULL;
- filter_args = args;
if (!argv_append_array(&all_argv, rev_parse_argv) ||
!argv_append_array(&all_argv, argv) ||
- !io_run_load(all_argv, "\n", read_filter_args) == ERR)
+ !io_run_load(all_argv, "\n", read_filter_args, args) == ERR)
die("Failed to split arguments");
argv_free(all_argv);
free(all_argv);
@@ -7788,9 +7784,9 @@ filter_rev_parse(const char ***args, const char *arg1, const char *arg2, const c
static void
filter_options(const char *argv[])
{
- filter_rev_parse(&opt_file_args, "--no-revs", "--no-flags", argv);
- filter_rev_parse(&opt_diff_args, "--no-revs", "--flags", argv);
- filter_rev_parse(&opt_rev_args, "--symbolic", "--revs-only", argv);
+ filter_rev_parse(&opt_file_argv, "--no-revs", "--no-flags", argv);
+ filter_rev_parse(&opt_diff_argv, "--no-revs", "--flags", argv);
+ filter_rev_parse(&opt_rev_argv, "--symbolic", "--revs-only", argv);
}
static enum request
const char *opt = argv[i];
if (seen_dashdash) {
- argv_append(&opt_file_args, opt);
+ argv_append(&opt_file_argv, opt);
continue;
} else if (!strcmp(opt, "--")) {
quit(0);
} else if (!strcmp(opt, "--all")) {
- argv_append(&opt_rev_args, opt);
+ argv_append(&opt_rev_argv, opt);
continue;
}