![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 90c2fc148b724677fe0ef8c7c14008cdc1f90f71..8bca63498e8b0417ed1278e4c6d0eb87aeb0c348 100644 (file)
--- a/tig.c
+++ b/tig.c
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);
}
REQ_(MOVE_LAST_LINE, "Move cursor to last line"), \
\
REQ_GROUP("Scrolling") \
+ REQ_(SCROLL_FIRST_COL, "Scroll to the first line columns"), \
REQ_(SCROLL_LEFT, "Scroll two columns left"), \
REQ_(SCROLL_RIGHT, "Scroll two columns right"), \
REQ_(SCROLL_LINE_UP, "Scroll one line up"), \
REQ_(OPTIONS, "Open option menu"), \
REQ_(TOGGLE_LINENO, "Toggle line numbers"), \
REQ_(TOGGLE_DATE, "Toggle date display"), \
- REQ_(TOGGLE_DATE_SHORT, "Toggle short (date-only) dates"), \
REQ_(TOGGLE_AUTHOR, "Toggle author display"), \
REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \
REQ_(TOGGLE_REFS, "Toggle reference display (tags/branches)"), \
static bool opt_line_graphics = TRUE;
static bool opt_rev_graph = FALSE;
static bool opt_show_refs = TRUE;
+static bool opt_untracked_dirs_content = TRUE;
static int opt_num_interval = 5;
static double opt_hscroll = 0.50;
static double opt_scale_split_view = 2.0 / 3.0;
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)))
{ KEY_HOME, REQ_MOVE_FIRST_LINE },
{ KEY_END, REQ_MOVE_LAST_LINE },
{ KEY_NPAGE, REQ_MOVE_PAGE_DOWN },
+ { KEY_CTL('D'), REQ_MOVE_PAGE_DOWN },
{ ' ', REQ_MOVE_PAGE_DOWN },
{ KEY_PPAGE, REQ_MOVE_PAGE_UP },
{ KEY_CTL('U'), REQ_MOVE_PAGE_UP },
{ '-', REQ_MOVE_PAGE_UP },
/* Scrolling */
+ { '|', REQ_SCROLL_FIRST_COL },
{ KEY_LEFT, REQ_SCROLL_LEFT },
{ KEY_RIGHT, REQ_SCROLL_RIGHT },
{ KEY_IC, REQ_SCROLL_LINE_UP },
if (!strcmp(argv[0], "commit-encoding"))
return parse_string(opt_encoding, argv[2], sizeof(opt_encoding));
+ if (!strcmp(argv[0], "status-untracked-dirs"))
+ return parse_bool(&opt_untracked_dirs_content, argv[2]);
+
config_msg = "Unknown variable name";
return ERR;
}
}
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;
config_lineno = 0;
config_errors = FALSE;
- if (io_load(&io, " \t", read_option) == ERR ||
+ if (io_load(&io, " \t", read_option, NULL) == 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");
}
}
waddnstr(view->win, string, len);
- }
- if (trimmed && use_tilde) {
- set_view_attr(view, LINE_DELIMITER);
- waddch(view->win, '~');
- col++;
+
+ if (trimmed && use_tilde) {
+ set_view_attr(view, LINE_DELIMITER);
+ waddch(view->win, '~');
+ col++;
+ }
}
return col;
assert(view_is_displayed(view));
switch (request) {
+ case REQ_SCROLL_FIRST_COL:
+ view->yoffset = 0;
+ redraw_view_from(view, 0);
+ report("");
+ return;
case REQ_SCROLL_LEFT:
if (view->yoffset == 0) {
report("Cannot scroll beyond the first column");
}
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);
move_view(view, request);
break;
+ case REQ_SCROLL_FIRST_COL:
case REQ_SCROLL_LEFT:
case REQ_SCROLL_RIGHT:
case REQ_SCROLL_LINE_DOWN:
{
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++) {
};
static const char *status_list_other_argv[] = {
- "git", "ls-files", "-z", "--others", "--exclude-standard", opt_prefix, NULL
+ "git", "ls-files", "-z", "--others", "--exclude-standard", opt_prefix, NULL, NULL,
};
static const char *status_list_no_head_argv[] = {
return FALSE;
}
+ if (!opt_untracked_dirs_content)
+ status_list_other_argv[ARRAY_SIZE(status_list_other_argv) - 2] = "--directory";
+
if (!status_run(view, status_diff_files_argv, 0, LINE_STAT_UNSTAGED) ||
!status_run(view, status_list_other_argv, '?', LINE_STAT_UNTRACKED))
return FALSE;
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 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;
}
@@ -7760,10 +7785,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);
@@ -7772,9 +7796,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;
}