X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tig.c;h=bd30997c00ede3035271484f5cb18326fe64c34c;hb=9c45a9c80cd684f9b92a2a79756477861bb725e7;hp=084fc0f362c2f69879127ee8021773128b0449b1;hpb=1cb715dd72650568a45b63f69dc9470304d5d35c;p=tig.git

diff --git a/tig.c b/tig.c
index 084fc0f..bd30997 100644
--- a/tig.c
+++ b/tig.c
@@ -114,10 +114,6 @@ static size_t utf8_length(const char **string, size_t col, int *width, size_t ma
 
 #define S_ISGITLINK(mode) (((mode) & S_IFMT) == 0160000)
 
-#ifndef GIT_CONFIG
-#define GIT_CONFIG "config"
-#endif
-
 /* Some ASCII-shorthands fitted into the ncurses namespace. */
 #define KEY_TAB		'\t'
 #define KEY_RETURN	'\r'
@@ -141,7 +137,7 @@ struct ref_list {
 };
 
 static struct ref_list *get_ref_list(const char *id);
-static void foreach_ref(bool (*visitor)(void *data, struct ref *ref), void *data);
+static void foreach_ref(bool (*visitor)(void *data, const struct ref *ref), void *data);
 static int load_refs(void);
 
 enum format_flags {
@@ -501,9 +497,22 @@ init_io_rd(struct io *io, const char *argv[], const char *dir,
 }
 
 static bool
-io_open(struct io *io, const char *name)
+io_open(struct io *io, const char *fmt, ...)
 {
+	char name[SIZEOF_STR] = "";
+	bool fits;
+	va_list args;
+
 	init_io(io, NULL, IO_FD);
+
+	va_start(args, fmt);
+	fits = vsnprintf(name, sizeof(name), fmt, args) < sizeof(name);
+	va_end(args);
+
+	if (!fits) {
+		io->error = ENAMETOOLONG;
+		return FALSE;
+	}
 	io->pipe = *name ? open(name, O_RDONLY) : STDIN_FILENO;
 	if (io->pipe == -1)
 		io->error = errno;
@@ -649,9 +658,9 @@ run_io_append(const char **argv, enum format_flags flags, int fd)
 }
 
 static bool
-run_io_rd(struct io *io, const char **argv, enum format_flags flags)
+run_io_rd(struct io *io, const char **argv, const char *dir, enum format_flags flags)
 {
-	return init_io_rd(io, argv, NULL, flags) && start_io(io);
+	return init_io_rd(io, argv, dir, flags) && start_io(io);
 }
 
 static bool
@@ -788,7 +797,8 @@ run_io_buf(const char **argv, char buf[], size_t bufsize)
 {
 	struct io io = {};
 
-	return run_io_rd(&io, argv, FORMAT_NONE) && io_read_buf(&io, buf, bufsize);
+	return run_io_rd(&io, argv, NULL, FORMAT_NONE)
+	    && io_read_buf(&io, buf, bufsize);
 }
 
 static int
@@ -1855,7 +1865,7 @@ load_option_file(const char *path)
 	struct io io = {};
 
 	/* It's OK that the file doesn't exist. */
-	if (!io_open(&io, path))
+	if (!io_open(&io, "%s", path))
 		return;
 
 	config_lineno = 0;
@@ -1981,6 +1991,8 @@ struct view_ops {
 	bool (*grep)(struct view *view, struct line *line);
 	/* Select line */
 	void (*select)(struct view *view, struct line *line);
+	/* Prepare view for loading */
+	bool (*prepare)(struct view *view);
 };
 
 static struct view_ops blame_ops;
@@ -2984,7 +2996,7 @@ prepare_update_file(struct view *view, const char *name)
 {
 	if (view->pipe)
 		end_update(view, TRUE);
-	return io_open(&view->io, name);
+	return io_open(&view->io, "%s", name);
 }
 
 static bool
@@ -2993,16 +3005,13 @@ begin_update(struct view *view, bool refresh)
 	if (view->pipe)
 		end_update(view, TRUE);
 
-	if (refresh) {
-		if (!start_io(&view->io))
-			return FALSE;
-
-	} else {
-		if (view == VIEW(REQ_VIEW_TREE) && strcmp(view->vid, view->id))
-			opt_path[0] = 0;
-
-		if (!run_io_rd(&view->io, view->ops->argv, FORMAT_ALL))
+	if (!refresh) {
+		if (view->ops->prepare) {
+			if (!view->ops->prepare(view))
+				return FALSE;
+		} else if (!init_io_rd(&view->io, view->ops->argv, NULL, FORMAT_ALL)) {
 			return FALSE;
+		}
 
 		/* Put the current ref_* value to the view title ref
 		 * member. This is needed by the blob view. Most other
@@ -3011,6 +3020,9 @@ begin_update(struct view *view, bool refresh)
 		string_copy_rev(view->ref, view->id);
 	}
 
+	if (!start_io(&view->io))
+		return FALSE;
+
 	setup_update(view, view->id);
 
 	return TRUE;
@@ -3189,6 +3201,11 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		display[current_view] = view;
 	}
 
+	/* No parent signals that this is the first loaded view. */
+	if (prev && view != prev) {
+		view->parent = prev;
+	}
+
 	/* Resize the view when switching between split- and full-screen,
 	 * or when switching between two different full-screen views. */
 	if (nviews != displayed_views() ||
@@ -3224,8 +3241,6 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 			/* "Blur" the previous view. */
 			update_view_title(prev);
 		}
-
-		view->parent = prev;
 	}
 
 	if (view->pipe && view->lines == 0) {
@@ -4249,7 +4264,7 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 			return TRUE;
 		}
 
-		if (!run_io_rd(&io, log_file, FORMAT_NONE)) {
+		if (!run_io_rd(&io, log_file, opt_cdup, FORMAT_NONE)) {
 			report("Failed to load tree data");
 			return TRUE;
 		}
@@ -4272,8 +4287,6 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 		if (!pos)
 			return TRUE;
 		text = pos + 1;
-		if (*opt_prefix && !strncmp(text, opt_prefix, strlen(opt_prefix)))
-			text += strlen(opt_prefix);
 		if (*opt_path && !strncmp(text, opt_path, strlen(opt_path)))
 			text += strlen(opt_path);
 		pos = strchr(text, '/');
@@ -4516,6 +4529,32 @@ tree_select(struct view *view, struct line *line)
 	string_copy_rev(view->ref, entry->id);
 }
 
+static bool
+tree_prepare(struct view *view)
+{
+	if (view->lines == 0 && opt_prefix[0]) {
+		char *pos = opt_prefix;
+
+		while (pos && *pos) {
+			char *end = strchr(pos, '/');
+
+			if (end)
+				*end = 0;
+			push_tree_stack_entry(pos, 0);
+			pos = end;
+			if (end) {
+				*end = '/';
+				pos++;
+			}
+		}
+
+	} else if (strcmp(view->vid, view->id)) {
+		opt_path[0] = 0;
+	}
+
+	return init_io_rd(&view->io, view->ops->argv, opt_cdup, FORMAT_ALL);
+}
+
 static const char *tree_argv[SIZEOF_ARG] = {
 	"git", "ls-tree", "%(commit)", "%(directory)", NULL
 };
@@ -4529,6 +4568,7 @@ static struct view_ops tree_ops = {
 	tree_request,
 	tree_grep,
 	tree_select,
+	tree_prepare,
 };
 
 static bool
@@ -4607,8 +4647,16 @@ struct blame {
 static bool
 blame_open(struct view *view)
 {
-	if (*opt_ref || !io_open(&view->io, opt_file)) {
-		if (!run_io_rd(&view->io, blame_cat_file_argv, FORMAT_ALL))
+	char path[SIZEOF_STR];
+
+	if (!view->parent && *opt_prefix) {
+		string_copy(path, opt_file);
+		if (!string_format(opt_file, "%s%s", opt_prefix, path))
+			return FALSE;
+	}
+
+	if (*opt_ref || !io_open(&view->io, "%s%s", opt_cdup, opt_file)) {
+		if (!run_io_rd(&view->io, blame_cat_file_argv, opt_cdup, FORMAT_ALL))
 			return FALSE;
 	}
 
@@ -4704,7 +4752,7 @@ blame_read_file(struct view *view, const char *line, bool *read_file)
 		if (view->lines == 0 && !view->parent)
 			die("No blame exist for %s", view->vid);
 
-		if (view->lines == 0 || !run_io_rd(&io, argv, FORMAT_ALL)) {
+		if (view->lines == 0 || !run_io_rd(&io, argv, opt_cdup, FORMAT_ALL)) {
 			report("Failed to load blame data");
 			return TRUE;
 		}
@@ -4988,7 +5036,7 @@ static struct view_ops blame_ops = {
 struct branch {
 	const char *author;		/* Author of the last commit. */
 	time_t time;			/* Date of the last activity. */
-	struct ref *ref;		/* Name and commit ID information. */
+	const struct ref *ref;		/* Name and commit ID information. */
 };
 
 static const enum sort_field branch_sort_fields[] = {
@@ -5096,7 +5144,7 @@ branch_read(struct view *view, char *line)
 }
 
 static bool
-branch_open_visitor(void *data, struct ref *ref)
+branch_open_visitor(void *data, const struct ref *ref)
 {
 	struct view *view = data;
 	struct branch *branch;
@@ -5120,7 +5168,7 @@ branch_open(struct view *view)
 			"--simplify-by-decoration", "--all", NULL
 	};
 
-	if (!run_io_rd(&view->io, branch_log, FORMAT_NONE)) {
+	if (!run_io_rd(&view->io, branch_log, NULL, FORMAT_NONE)) {
 		report("Failed to load branch data");
 		return TRUE;
 	}
@@ -5389,8 +5437,7 @@ status_update_onbranch(void)
 		if (!*opt_head) {
 			struct io io = {};
 
-			if (string_format(buf, "%s/rebase-merge/head-name", opt_git_dir) &&
-			    io_open(&io, buf) &&
+			if (io_open(&io, "%s/rebase-merge/head-name", opt_git_dir) &&
 			    io_read_buf(&io, buf, sizeof(buf))) {
 				head = buf;
 				if (!prefixcmp(head, "refs/heads/"))
@@ -5767,9 +5814,8 @@ status_revert(struct status *status, enum line_type type, bool has_none)
 		} else {
 			report("Cannot revert changes to multiple files");
 		}
-		return FALSE;
 
-	} else {
+	} else if (prompt_yesno("Are you sure you want to revert changes?")) {
 		char mode[10] = "100644";
 		const char *reset_argv[] = {
 			"git", "update-index", "--cacheinfo", mode,
@@ -5779,12 +5825,25 @@ status_revert(struct status *status, enum line_type type, bool has_none)
 			"git", "checkout", "--", status->old.name, NULL
 		};
 
-		if (!prompt_yesno("Are you sure you want to overwrite any changes?"))
-			return FALSE;
-		string_format(mode, "%o", status->old.mode);
-		return (status->status != 'U' || run_io_fg(reset_argv, opt_cdup)) &&
-			run_io_fg(checkout_argv, opt_cdup);
+		if (status->status == 'U') {
+			string_format(mode, "%5o", status->old.mode);
+
+			if (status->old.mode == 0 && status->new.mode == 0) {
+				reset_argv[2] = "--force-remove";
+				reset_argv[3] = status->old.name;
+				reset_argv[4] = NULL;
+			}
+
+			if (!run_io_fg(reset_argv, opt_cdup))
+				return FALSE;
+			if (status->old.mode == 0 && status->new.mode == 0)
+				return TRUE;
+		}
+
+		return run_io_fg(checkout_argv, opt_cdup);
 	}
+
+	return FALSE;
 }
 
 static enum request
@@ -5823,10 +5882,8 @@ status_request(struct view *view, enum request request, struct line *line)
 		break;
 
 	case REQ_VIEW_BLAME:
-		if (status) {
-			string_copy(opt_file, status->new.name);
+		if (status)
 			opt_ref[0] = 0;
-		}
 		return request;
 
 	case REQ_ENTER:
@@ -5893,6 +5950,8 @@ status_select(struct view *view, struct line *line)
 	}
 
 	string_format(view->ref, text, key, file);
+	if (status)
+		string_copy(opt_file, status->new.name);
 }
 
 static bool
@@ -7148,7 +7207,7 @@ compare_refs(const void *ref1_, const void *ref2_)
 }
 
 static void
-foreach_ref(bool (*visitor)(void *data, struct ref *ref), void *data)
+foreach_ref(bool (*visitor)(void *data, const struct ref *ref), void *data)
 {
 	size_t i;
 
@@ -7419,7 +7478,7 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 static int
 load_git_config(void)
 {
-	const char *config_list_argv[] = { "git", GIT_CONFIG, "--list", NULL };
+	const char *config_list_argv[] = { "git", "config", "--list", NULL };
 
 	return run_io_load(config_list_argv, "=", read_repo_config_option);
 }