![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 8b46fa7f79629ed6bde86251f838530c05dcc071..ac053b3510349b777f604a6bf13cb63d986387de 100644 (file)
--- a/tig.c
+++ b/tig.c
OPEN_RELOAD = 4, /* Reload view even if it is the current. */
OPEN_REFRESH = 16, /* Refresh view using previous command. */
OPEN_PREPARED = 32, /* Open already prepared command. */
+ OPEN_EXTRA = 64, /* Open extra data from command. */
};
struct view_ops {
}
static void
-maximize_view(struct view *view)
+maximize_view(struct view *view, bool redraw)
{
memset(display, 0, sizeof(display));
current_view = 0;
display[current_view] = view;
resize_display();
- redraw_display(FALSE);
- report("");
+ if (redraw) {
+ redraw_display(FALSE);
+ report("");
+ }
}
}
static bool
-format_argv(const char ***dst_argv, const char *src_argv[], bool replace, bool first)
+format_argv(const char ***dst_argv, const char *src_argv[], bool first)
{
char buf[SIZEOF_STR];
int argc;
@@ -2426,7 +2429,7 @@ format_argv(const char ***dst_argv, const char *src_argv[], bool replace, bool f
int len = next - arg;
const char *value;
- if (!next || !replace) {
+ if (!next) {
len = strlen(arg);
value = "";
@@ -2441,7 +2444,7 @@ format_argv(const char ***dst_argv, const char *src_argv[], bool replace, bool f
if (!string_format_from(buf, &bufpos, "%.*s%s", len, arg, value))
return FALSE;
- arg = next && replace ? strchr(next, ')') + 1 : NULL;
+ arg = next ? strchr(next, ')') + 1 : NULL;
}
if (!argv_append(dst_argv, buf))
}
static bool
-prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
-{
- view->dir = dir;
- return format_argv(&view->argv, argv, replace, !view->prev);
-}
-
-static bool
-prepare_update(struct view *view, const char *argv[], const char *dir)
-{
- if (view->pipe)
- end_update(view, TRUE);
- return prepare_io(view, dir, argv, FALSE);
-}
-
-static bool
-start_update(struct view *view, const char **argv, const char *dir)
+prepare_update(struct view *view, const char *dir, const char *argv[])
{
if (view->pipe)
io_done(view->pipe);
- return prepare_io(view, dir, argv, FALSE) &&
- io_run(&view->io, IO_RD, dir, view->argv);
-}
-
-static bool
-prepare_update_file(struct view *view, const char *name)
-{
- const char *file_argv[] = { opt_cdup, name , NULL };
-
- if (view->pipe)
- end_update(view, TRUE);
- return argv_copy(&view->argv, file_argv);
+ view->dir = dir;
+ return argv_copy(&view->argv, argv);
}
static bool
begin_update(struct view *view, const char *dir, const char **argv, enum open_flags flags)
{
- bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED));
+ bool extra = !!(flags & (OPEN_EXTRA));
+ bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED | OPEN_EXTRA));
bool refresh = flags & (OPEN_REFRESH | OPEN_PREPARED);
if (!reload && !strcmp(view->vid, view->id))
return TRUE;
- if (view->pipe)
- end_update(view, TRUE);
+ if (view->pipe) {
+ if (extra)
+ io_done(view->pipe);
+ else
+ end_update(view, TRUE);
+ }
if (!refresh) {
- if (!prepare_io(view, dir, argv, TRUE))
+ view->dir = dir;
+ if (!format_argv(&view->argv, argv, !view->prev))
return FALSE;
/* Put the current ref_* value to the view title ref
@@ -2557,11 +2541,9 @@ begin_update(struct view *view, const char *dir, const char **argv, enum open_fl
if (view->argv && view->argv[0] &&
!io_run(&view->io, IO_RD, view->dir, view->argv))
return FALSE;
- else if (view->argv && !strcmp(view->argv[0], opt_cdup) &&
- !io_open(&view->io, "%s%s", opt_cdup, view->argv[1]))
- return FALSE;
- setup_update(view, view->id);
+ if (!extra)
+ setup_update(view, view->id);
return TRUE;
}
@@ -2708,15 +2690,63 @@ add_line_format(struct view *view, enum line_type type, const char *fmt, ...)
* View opening
*/
+static void
+load_view(struct view *view, enum open_flags flags)
+{
+ if (view->pipe)
+ end_update(view, TRUE);
+ if (!view->ops->open(view, flags)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+ restore_view_position(view);
+
+ if (view->pipe && view->lines == 0) {
+ /* Clear the old view and let the incremental updating refill
+ * the screen. */
+ werase(view->win);
+ view->p_restore = flags & (OPEN_RELOAD | OPEN_REFRESH);
+ report("");
+ } else if (view_is_displayed(view)) {
+ redraw_view(view);
+ report("");
+ }
+}
+
+#define refresh_view(view) load_view(view, OPEN_REFRESH)
+
+static void
+split_view(struct view *prev, struct view *view)
+{
+ display[1] = view;
+ current_view = 1;
+ view->parent = prev;
+ resize_display();
+
+ if (prev->lineno - prev->offset >= prev->height) {
+ /* Take the title line into account. */
+ int lines = prev->lineno - prev->offset - prev->height + 1;
+
+ /* Scroll the view that was split if the current line is
+ * outside the new limited view. */
+ do_scroll_view(prev, lines);
+ }
+
+ if (view != prev && view_is_displayed(prev)) {
+ /* "Blur" the previous view. */
+ update_view_title(prev);
+ }
+}
+
static void
open_view(struct view *prev, enum request request, enum open_flags flags)
{
bool split = !!(flags & OPEN_SPLIT);
- bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED));
- bool nomaximize = !!(flags & OPEN_REFRESH);
+ bool reload = !!(flags & (OPEN_RELOAD | OPEN_PREPARED));
struct view *view = VIEW(request);
int nviews = displayed_views();
- struct view *base_view = display[0];
+
+ assert(flags ^ OPEN_REFRESH);
if (view == prev && nviews == 1 && !reload) {
report("Already in %s view", view->name);
}
if (split) {
- display[1] = view;
- current_view = 1;
- view->parent = prev;
- } else if (!nomaximize) {
- /* Maximize the current view. */
- memset(display, 0, sizeof(display));
- current_view = 0;
- display[current_view] = view;
+ split_view(prev, view);
+ } else {
+ maximize_view(view, FALSE);
}
/* No prev signals that this is the first loaded view. */
view->prev = prev;
}
- /* Resize the view when switching between split- and full-screen,
- * or when switching between two different full-screen views. */
- if (nviews != displayed_views() ||
- (nviews == 1 && base_view != display[0]))
- resize_display();
-
- if (view->ops->open) {
- if (view->pipe)
- end_update(view, TRUE);
- if (!view->ops->open(view, flags)) {
- report("Failed to load %s view", view->name);
- return;
- }
- restore_view_position(view);
- }
+ load_view(view, flags);
+}
- if (split && prev->lineno - prev->offset >= prev->height) {
- /* Take the title line into account. */
- int lines = prev->lineno - prev->offset - prev->height + 1;
+static void
+open_argv(struct view *prev, struct view *view, const char *argv[], const char *dir, enum open_flags flags)
+{
+ enum request request = view - views + REQ_OFFSET + 1;
- /* Scroll the view that was split if the current line is
- * outside the new limited view. */
- do_scroll_view(prev, lines);
+ if (!prepare_update(view, dir, argv)) {
+ report("Failed to open %s view: %s", view->name, io_strerror(&view->io));
+ } else {
+ open_view(prev, request, flags | OPEN_PREPARED);
}
+}
- if (prev && view != prev && split && view_is_displayed(prev)) {
- /* "Blur" the previous view. */
- update_view_title(prev);
- }
+static void
+open_file(struct view *prev, struct view *view, const char *file, enum open_flags flags)
+{
+ enum request request = view - views + REQ_OFFSET + 1;
+ const char *file_argv[] = { opt_cdup, file , NULL };
- if (view->pipe && view->lines == 0) {
- /* Clear the old view and let the incremental updating refill
- * the screen. */
- werase(view->win);
- view->p_restore = flags & (OPEN_RELOAD | OPEN_REFRESH);
- report("");
- } else if (view_is_displayed(view)) {
- redraw_view(view);
- report("");
+ if (view->pipe)
+ end_update(view, TRUE);
+ view->dir = opt_cdup;
+ if (!argv_copy(&view->argv, file_argv)) {
+ report("Failed to load %s: out of memory", file);
+ } else {
+ open_view(prev, request, flags | OPEN_PREPARED);
}
}
return;
}
- if (format_argv(&argv, req->argv, TRUE, FALSE))
+ if (format_argv(&argv, req->argv, FALSE))
open_external_viewer(argv, NULL);
if (argv)
argv_free(argv);
case REQ_MAXIMIZE:
if (displayed_views() == 2)
- maximize_view(view);
+ maximize_view(view, TRUE);
break;
case REQ_OPTIONS:
* view itself. Parents to closed view should never be
* followed. */
if (view->prev && view->prev != view) {
- maximize_view(view->prev);
+ maximize_view(view->prev, TRUE);
view->prev = view;
break;
}
switch (request) {
case REQ_REFRESH:
load_refs();
- open_view(view, REQ_VIEW_LOG, OPEN_REFRESH);
+ refresh_view(view);
return REQ_NONE;
default:
return pager_request(view, request, line);
if (line->type == LINE_HELP_KEYMAP) {
help_keymap_hidden[line->other] =
!help_keymap_hidden[line->other];
- view->p_restore = TRUE;
- open_view(view, REQ_VIEW_HELP, OPEN_REFRESH);
+ refresh_view(view);
}
return REQ_NONE;
return TRUE;
} else if (!text) {
- char *path = *opt_path ? opt_path : ".";
/* Find next entry to process */
const char *log_file[] = {
"git", "log", "--no-color", "--pretty=raw",
- "--cc", "--raw", view->id, "--", path, NULL
+ "--cc", "--raw", view->id, "--", "%(directory)", NULL
};
if (!view->lines) {
return TRUE;
}
- if (!start_update(view, log_file, opt_cdup)) {
+ if (!begin_update(view, opt_cdup, log_file, OPEN_EXTRA)) {
report("Failed to load tree data");
return TRUE;
}
static bool
blame_open(struct view *view, enum open_flags flags)
{
+ const char *file_argv[] = { opt_cdup, opt_file , NULL };
char path[SIZEOF_STR];
size_t i;
return FALSE;
}
- if (*opt_ref || !io_open(&view->io, "%s%s", opt_cdup, opt_file)) {
+ if (*opt_ref || !begin_update(view, opt_cdup, file_argv, flags)) {
const char *blame_cat_file_argv[] = {
"git", "cat-file", "blob", path, NULL
};
if (!string_format(path, "%s:%s", opt_ref, opt_file) ||
- !start_update(view, blame_cat_file_argv, opt_cdup))
+ !begin_update(view, opt_cdup, blame_cat_file_argv, flags))
return FALSE;
}
free(blame->commit);
}
- setup_update(view, opt_file);
+ string_format(view->vid, "%s:%s", opt_ref, opt_file);
string_format(view->ref, "%s ...", opt_file);
return TRUE;
if (view->lines == 0 && !view->prev)
die("No blame exist for %s", view->vid);
- if (view->lines == 0 || !start_update(view, blame_argv, opt_cdup)) {
+ if (view->lines == 0 || !begin_update(view, opt_cdup, blame_argv, OPEN_EXTRA)) {
report("Failed to load blame data");
return TRUE;
}
string_copy(opt_file, blame->commit->filename);
if (blame->lineno)
view->lineno = blame->lineno;
- open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH);
+ refresh_view(view);
}
break;
string_copy_rev(opt_ref, blame->commit->parent_id);
string_copy(opt_file, blame->commit->parent_filename);
setup_blame_parent_line(view, blame);
- open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH);
+ refresh_view(view);
}
break;
diff_index_argv[7] = "/dev/null";
}
- if (!prepare_update(diff, diff_index_argv, NULL)) {
- report("Failed to allocate diff command");
- break;
- }
- flags |= OPEN_PREPARED;
+ open_argv(view, diff, diff_index_argv, NULL, flags);
+ } else {
+ open_view(view, REQ_VIEW_DIFF, flags);
}
-
- open_view(view, REQ_VIEW_DIFF, flags);
if (VIEW(REQ_VIEW_DIFF)->pipe && !strcmp(blame->commit->id, NULL_ID))
string_copy_rev(VIEW(REQ_VIEW_DIFF)->ref, NULL_ID);
break;
switch (request) {
case REQ_REFRESH:
load_refs();
- open_view(view, REQ_VIEW_BRANCH, OPEN_REFRESH);
+ refresh_view(view);
return REQ_NONE;
case REQ_TOGGLE_SORT_FIELD:
};
struct view *main_view = VIEW(REQ_VIEW_MAIN);
- if (!prepare_update(main_view, all_branches_argv, NULL))
- report("Failed to load view of all branches");
- else
- open_view(view, REQ_VIEW_MAIN, OPEN_PREPARED | OPEN_SPLIT);
+ open_argv(view, main_view, all_branches_argv, NULL, OPEN_SPLIT);
return REQ_NONE;
}
default:
"--simplify-by-decoration", "--all", NULL
};
- if (!start_update(view, branch_log, NULL)) {
+ if (!begin_update(view, NULL, branch_log, flags)) {
report("Failed to load branch data");
return TRUE;
}
- setup_update(view, view->id);
branch_open_visitor(view, &branch_all);
foreach_ref(branch_open_visitor, view);
view->p_restore = TRUE;
return TRUE;
}
-static enum request
-status_load_error(struct view *view, struct view *stage, const char *path)
-{
- if (displayed_views() == 2 || display[current_view] != view)
- maximize_view(view);
- report("Failed to load '%s': %s", path, io_strerror(&stage->io));
- return REQ_NONE;
-}
-
static enum request
status_enter(struct view *view, struct line *line)
{
* path, so leave it empty. */
const char *newpath = status && status->status != 'U' ? status->new.name : NULL;
const char *info;
- enum open_flags split;
+ enum open_flags flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
struct view *stage = VIEW(REQ_VIEW_STAGE);
if (line->type == LINE_STAT_NONE ||
"--", "/dev/null", newpath, NULL
};
- if (!prepare_update(stage, no_head_diff_argv, opt_cdup))
- return status_load_error(view, stage, newpath);
+ open_argv(view, stage, no_head_diff_argv, opt_cdup, flags);
} else {
const char *index_show_argv[] = {
"git", "diff-index", "--root", "--patch-with-stat",
oldpath, newpath, NULL
};
- if (!prepare_update(stage, index_show_argv, opt_cdup))
- return status_load_error(view, stage, newpath);
+ open_argv(view, stage, index_show_argv, opt_cdup, flags);
}
if (status)
"-C", "-M", "--", oldpath, newpath, NULL
};
- if (!prepare_update(stage, files_show_argv, opt_cdup))
- return status_load_error(view, stage, newpath);
+ open_argv(view, stage, files_show_argv, opt_cdup, flags);
if (status)
info = "Unstaged changes to %s";
else
return REQ_NONE;
}
- if (!prepare_update_file(stage, newpath))
- return status_load_error(view, stage, newpath);
+ open_file(view, stage, newpath, flags);
info = "Untracked file %s";
break;
die("line type %d not handled in switch", line->type);
}
- split = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
- open_view(view, REQ_VIEW_STAGE, OPEN_PREPARED | split);
if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
if (status) {
stage_status = *status;
return request;
}
- open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
+ refresh_view(view);
return REQ_NONE;
}
return request;
}
- VIEW(REQ_VIEW_STATUS)->p_restore = TRUE;
- open_view(view, REQ_VIEW_STATUS, OPEN_REFRESH);
+ refresh_view(view->parent);
/* Check whether the staged entry still exists, and close the
* stage view if it doesn't. */
return REQ_VIEW_CLOSE;
}
- open_view(view, REQ_VIEW_STAGE, OPEN_REFRESH);
+ refresh_view(view);
return REQ_NONE;
}
switch (request) {
case REQ_ENTER:
if (view_is_displayed(view) && display[0] != view)
- maximize_view(view);
+ maximize_view(view, TRUE);
open_view(view, REQ_VIEW_DIFF, flags);
break;
case REQ_REFRESH:
load_refs();
- open_view(view, REQ_VIEW_MAIN, OPEN_REFRESH);
+ refresh_view(view);
break;
default:
return request;
if (!argv_from_string(argv, &argc, cmd)) {
report("Too many arguments");
- } else if (!prepare_update(next, argv, NULL)) {
- report("Failed to format command");
} else {
- open_view(view, REQ_VIEW_PAGER, OPEN_PREPARED);
+ open_argv(view, next, argv, NULL, OPEN_DEFAULT);
}
}