X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tig.c;h=e5612c197c7320b51ea0303284ab52718ca6d9eb;hb=a7dbd419967a1e1880b00bc6f7ed7c80ac102bc9;hp=cad66c8e6e20d85fe8f84eb262e007c7e2112dc7;hpb=fca29b02e7f12119ac06a00a090e515b95de9f05;p=tig.git

diff --git a/tig.c b/tig.c
index cad66c8..e5612c1 100644
--- a/tig.c
+++ b/tig.c
@@ -68,8 +68,6 @@
 static void __NORETURN die(const char *err, ...);
 static void warn(const char *msg, ...);
 static void report(const char *msg, ...);
-static size_t utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size);
-static inline unsigned char utf8_char_length(const char *string, const char *end);
 
 #define ABS(x)		((x) >= 0  ? (x) : -(x))
 #define MIN(x, y)	((x) < (y) ? (x) :  (y))
@@ -142,14 +140,6 @@ static struct ref_list *get_ref_list(const char *id);
 static void foreach_ref(bool (*visitor)(void *data, const struct ref *ref), void *data);
 static int load_refs(void);
 
-enum format_flags {
-	FORMAT_ALL,		/* Perform replacement in all arguments. */
-	FORMAT_DASH,		/* Perform replacement up until "--". */
-	FORMAT_NONE		/* No replacement should be performed. */
-};
-
-static bool format_argv(const char *dst[], const char *src[], enum format_flags flags);
-
 enum input_status {
 	INPUT_OK,
 	INPUT_SKIP,
@@ -219,7 +209,7 @@ string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen)
 #define string_add(dst, from, src) \
 	string_ncopy_do(dst + (from), sizeof(dst) - (from), src, sizeof(src))
 
-static void
+static size_t
 string_expand(char *dst, size_t dstlen, const char *src, int tabsize)
 {
 	size_t size, pos;
@@ -238,6 +228,7 @@ string_expand(char *dst, size_t dstlen, const char *src, int tabsize)
 	}
 
 	dst[size] = 0;
+	return pos;
 }
 
 static char *
@@ -359,9 +350,170 @@ suffixcmp(const char *str, int slen, const char *suffix)
 }
 
 
+/*
+ * Unicode / UTF-8 handling
+ *
+ * NOTE: Much of the following code for dealing with Unicode is derived from
+ * ELinks' UTF-8 code developed by Scrool <scroolik@gmail.com>. Origin file is
+ * src/intl/charset.c from the UTF-8 branch commit elinks-0.11.0-g31f2c28.
+ */
+
+static inline int
+unicode_width(unsigned long c, int tab_size)
+{
+	if (c >= 0x1100 &&
+	   (c <= 0x115f				/* Hangul Jamo */
+	    || c == 0x2329
+	    || c == 0x232a
+	    || (c >= 0x2e80  && c <= 0xa4cf && c != 0x303f)
+						/* CJK ... Yi */
+	    || (c >= 0xac00  && c <= 0xd7a3)	/* Hangul Syllables */
+	    || (c >= 0xf900  && c <= 0xfaff)	/* CJK Compatibility Ideographs */
+	    || (c >= 0xfe30  && c <= 0xfe6f)	/* CJK Compatibility Forms */
+	    || (c >= 0xff00  && c <= 0xff60)	/* Fullwidth Forms */
+	    || (c >= 0xffe0  && c <= 0xffe6)
+	    || (c >= 0x20000 && c <= 0x2fffd)
+	    || (c >= 0x30000 && c <= 0x3fffd)))
+		return 2;
+
+	if (c == '\t')
+		return tab_size;
+
+	return 1;
+}
+
+/* Number of bytes used for encoding a UTF-8 character indexed by first byte.
+ * Illegal bytes are set one. */
+static const unsigned char utf8_bytes[256] = {
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,
+	3,3,3,3,3,3,3,3, 3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4, 5,5,5,5,6,6,1,1,
+};
+
+static inline unsigned char
+utf8_char_length(const char *string, const char *end)
+{
+	int c = *(unsigned char *) string;
+
+	return utf8_bytes[c];
+}
+
+/* Decode UTF-8 multi-byte representation into a Unicode character. */
+static inline unsigned long
+utf8_to_unicode(const char *string, size_t length)
+{
+	unsigned long unicode;
+
+	switch (length) {
+	case 1:
+		unicode  =   string[0];
+		break;
+	case 2:
+		unicode  =  (string[0] & 0x1f) << 6;
+		unicode +=  (string[1] & 0x3f);
+		break;
+	case 3:
+		unicode  =  (string[0] & 0x0f) << 12;
+		unicode += ((string[1] & 0x3f) << 6);
+		unicode +=  (string[2] & 0x3f);
+		break;
+	case 4:
+		unicode  =  (string[0] & 0x0f) << 18;
+		unicode += ((string[1] & 0x3f) << 12);
+		unicode += ((string[2] & 0x3f) << 6);
+		unicode +=  (string[3] & 0x3f);
+		break;
+	case 5:
+		unicode  =  (string[0] & 0x0f) << 24;
+		unicode += ((string[1] & 0x3f) << 18);
+		unicode += ((string[2] & 0x3f) << 12);
+		unicode += ((string[3] & 0x3f) << 6);
+		unicode +=  (string[4] & 0x3f);
+		break;
+	case 6:
+		unicode  =  (string[0] & 0x01) << 30;
+		unicode += ((string[1] & 0x3f) << 24);
+		unicode += ((string[2] & 0x3f) << 18);
+		unicode += ((string[3] & 0x3f) << 12);
+		unicode += ((string[4] & 0x3f) << 6);
+		unicode +=  (string[5] & 0x3f);
+		break;
+	default:
+		return 0;
+	}
+
+	/* Invalid characters could return the special 0xfffd value but NUL
+	 * should be just as good. */
+	return unicode > 0xffff ? 0 : unicode;
+}
+
+/* Calculates how much of string can be shown within the given maximum width
+ * and sets trimmed parameter to non-zero value if all of string could not be
+ * shown. If the reserve flag is TRUE, it will reserve at least one
+ * trailing character, which can be useful when drawing a delimiter.
+ *
+ * Returns the number of bytes to output from string to satisfy max_width. */
+static size_t
+utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size)
+{
+	const char *string = *start;
+	const char *end = strchr(string, '\0');
+	unsigned char last_bytes = 0;
+	size_t last_ucwidth = 0;
+
+	*width = 0;
+	*trimmed = 0;
+
+	while (string < end) {
+		unsigned char bytes = utf8_char_length(string, end);
+		size_t ucwidth;
+		unsigned long unicode;
+
+		if (string + bytes > end)
+			break;
+
+		/* Change representation to figure out whether
+		 * it is a single- or double-width character. */
+
+		unicode = utf8_to_unicode(string, bytes);
+		/* FIXME: Graceful handling of invalid Unicode character. */
+		if (!unicode)
+			break;
+
+		ucwidth = unicode_width(unicode, tab_size);
+		if (skip > 0) {
+			skip -= ucwidth <= skip ? ucwidth : skip;
+			*start += bytes;
+		}
+		*width  += ucwidth;
+		if (*width > max_width) {
+			*trimmed = 1;
+			*width -= ucwidth;
+			if (reserve && *width == max_width) {
+				string -= last_bytes;
+				*width -= last_ucwidth;
+			}
+			break;
+		}
+
+		string  += bytes;
+		last_bytes = ucwidth ? bytes : 0;
+		last_ucwidth = ucwidth;
+	}
+
+	return string - *start;
+}
+
+
 #define DATE_INFO \
 	DATE_(NO), \
 	DATE_(DEFAULT), \
+	DATE_(LOCAL), \
 	DATE_(RELATIVE), \
 	DATE_(SHORT)
 
@@ -426,7 +578,13 @@ mkdate(const struct time *time, enum date date)
 		}
 	}
 
-	gmtime_r(&time->sec, &tm);
+	if (date == DATE_LOCAL) {
+		time_t date = time->sec + time->tz;
+		localtime_r(&date, &tm);
+	}
+	else {
+		gmtime_r(&time->sec, &tm);
+	}
 	return strftime(buf, sizeof(buf), DATE_FORMAT, &tm) ? buf : NULL;
 }
 
@@ -503,7 +661,7 @@ argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd)
 	return *argc < SIZEOF_ARG;
 }
 
-static void
+static bool
 argv_from_env(const char **argv, const char *name)
 {
 	char *env = argv ? getenv(name) : NULL;
@@ -511,8 +669,59 @@ argv_from_env(const char **argv, const char *name)
 
 	if (env && *env)
 		env = strdup(env);
-	if (env && !argv_from_string(argv, &argc, env))
-		die("Too many arguments in the `%s` environment variable", name);
+	return !env || argv_from_string(argv, &argc, env);
+}
+
+static void
+argv_free(const char *argv[])
+{
+	int argc;
+
+	if (!argv)
+		return;
+	for (argc = 0; argv[argc]; argc++)
+		free((void *) argv[argc]);
+	argv[0] = NULL;
+}
+
+DEFINE_ALLOCATOR(argv_realloc, const char *, SIZEOF_ARG)
+
+static bool
+argv_append(const char ***argv, const char *arg)
+{
+	int argc = 0;
+
+	while (*argv && (*argv)[argc])
+		argc++;
+
+	if (!argv_realloc(argv, argc, 2))
+		return FALSE;
+
+	(*argv)[argc++] = strdup(arg);
+	(*argv)[argc] = NULL;
+	return TRUE;
+}
+
+static bool
+argv_append_array(const char ***dst_argv, const char *src_argv[])
+{
+	int i;
+
+	for (i = 0; src_argv && src_argv[i]; i++)
+		if (!argv_append(dst_argv, src_argv[i]))
+			return FALSE;
+	return TRUE;
+}
+
+static bool
+argv_copy(const char ***dst, const char *src[])
+{
+	int argc;
+
+	for (argc = 0; src[argc]; argc++)
+		if (!argv_append(dst, src[argc]))
+			return FALSE;
+	return TRUE;
 }
 
 
@@ -530,12 +739,9 @@ enum io_type {
 };
 
 struct io {
-	enum io_type type;	/* The requested type of pipe. */
-	const char *dir;	/* Directory from which to execute. */
-	pid_t pid;		/* PID of spawned process. */
 	int pipe;		/* Pipe end for reading or writing. */
+	pid_t pid;		/* PID of spawned process. */
 	int error;		/* Error status. */
-	const char *argv[SIZEOF_ARG];	/* Shell command arguments. */
 	char *buf;		/* Read buffer. */
 	size_t bufalloc;	/* Allocated buffer size. */
 	size_t bufsize;		/* Buffer content size. */
@@ -544,30 +750,10 @@ struct io {
 };
 
 static void
-io_reset(struct io *io)
+io_init(struct io *io)
 {
+	memset(io, 0, sizeof(*io));
 	io->pipe = -1;
-	io->pid = 0;
-	io->buf = io->bufpos = NULL;
-	io->bufalloc = io->bufsize = 0;
-	io->error = 0;
-	io->eof = 0;
-}
-
-static void
-io_init(struct io *io, const char *dir, enum io_type type)
-{
-	io_reset(io);
-	io->type = type;
-	io->dir = dir;
-}
-
-static bool
-io_format(struct io *io, const char *dir, enum io_type type,
-	  const char *argv[], enum format_flags flags)
-{
-	io_init(io, dir, type);
-	return format_argv(io->argv, argv, flags);
 }
 
 static bool
@@ -577,7 +763,7 @@ io_open(struct io *io, const char *fmt, ...)
 	bool fits;
 	va_list args;
 
-	io_init(io, NULL, IO_FD);
+	io_init(io);
 
 	va_start(args, fmt);
 	fits = vsnprintf(name, sizeof(name), fmt, args) < sizeof(name);
@@ -607,7 +793,7 @@ io_done(struct io *io)
 	if (io->pipe != -1)
 		close(io->pipe);
 	free(io->buf);
-	io_reset(io);
+	io_init(io);
 
 	while (pid > 0) {
 		int status;
@@ -630,35 +816,37 @@ io_done(struct io *io)
 }
 
 static bool
-io_start(struct io *io)
+io_run(struct io *io, enum io_type type, const char *dir, const char *argv[], ...)
 {
 	int pipefds[2] = { -1, -1 };
+	va_list args;
 
-	if (io->type == IO_FD)
-		return TRUE;
+	io_init(io);
 
-	if ((io->type == IO_RD || io->type == IO_WR) && pipe(pipefds) < 0) {
+	if ((type == IO_RD || type == IO_WR) && pipe(pipefds) < 0) {
 		io->error = errno;
 		return FALSE;
-	} else if (io->type == IO_AP) {
-		pipefds[1] = io->pipe;
+	} else if (type == IO_AP) {
+		va_start(args, argv);
+		pipefds[1] = va_arg(args, int);
+		va_end(args);
 	}
 
 	if ((io->pid = fork())) {
 		if (io->pid == -1)
 			io->error = errno;
-		if (pipefds[!(io->type == IO_WR)] != -1)
-			close(pipefds[!(io->type == IO_WR)]);
+		if (pipefds[!(type == IO_WR)] != -1)
+			close(pipefds[!(type == IO_WR)]);
 		if (io->pid != -1) {
-			io->pipe = pipefds[!!(io->type == IO_WR)];
+			io->pipe = pipefds[!!(type == IO_WR)];
 			return TRUE;
 		}
 
 	} else {
-		if (io->type != IO_FG) {
+		if (type != IO_FG) {
 			int devnull = open("/dev/null", O_RDWR);
-			int readfd  = io->type == IO_WR ? pipefds[0] : devnull;
-			int writefd = (io->type == IO_RD || io->type == IO_AP)
+			int readfd  = type == IO_WR ? pipefds[0] : devnull;
+			int writefd = (type == IO_RD || type == IO_AP)
 							? pipefds[1] : devnull;
 
 			dup2(readfd,  STDIN_FILENO);
@@ -672,71 +860,42 @@ io_start(struct io *io)
 				close(pipefds[1]);
 		}
 
-		if (io->dir && *io->dir && chdir(io->dir) == -1)
+		if (dir && *dir && chdir(dir) == -1)
 			exit(errno);
 
-		execvp(io->argv[0], (char *const*) io->argv);
+		execvp(argv[0], (char *const*) argv);
 		exit(errno);
 	}
 
-	if (pipefds[!!(io->type == IO_WR)] != -1)
-		close(pipefds[!!(io->type == IO_WR)]);
+	if (pipefds[!!(type == IO_WR)] != -1)
+		close(pipefds[!!(type == IO_WR)]);
 	return FALSE;
 }
 
 static bool
-io_run(struct io *io, const char **argv, const char *dir, enum io_type type)
+io_complete(enum io_type type, const char **argv, const char *dir, int fd)
 {
-	io_init(io, dir, type);
-	if (!format_argv(io->argv, argv, FORMAT_NONE))
-		return FALSE;
-	return io_start(io);
-}
+	struct io io;
 
-static int
-io_complete(struct io *io)
-{
-	return io_start(io) && io_done(io);
+	return io_run(&io, type, dir, argv, fd) && io_done(&io);
 }
 
-static int
+static bool
 io_run_bg(const char **argv)
 {
-	struct io io = {};
-
-	if (!io_format(&io, NULL, IO_BG, argv, FORMAT_NONE))
-		return FALSE;
-	return io_complete(&io);
+	return io_complete(IO_BG, argv, NULL, -1);
 }
 
 static bool
 io_run_fg(const char **argv, const char *dir)
 {
-	struct io io = {};
-
-	if (!io_format(&io, dir, IO_FG, argv, FORMAT_NONE))
-		return FALSE;
-	return io_complete(&io);
-}
-
-static bool
-io_run_append(const char **argv, enum format_flags flags, int fd)
-{
-	struct io io = {};
-
-	if (!io_format(&io, NULL, IO_AP, argv, flags)) {
-		close(fd);
-		return FALSE;
-	}
-
-	io.pipe = fd;
-	return io_complete(&io);
+	return io_complete(IO_FG, argv, dir, -1);
 }
 
 static bool
-io_run_rd(struct io *io, const char **argv, const char *dir, enum format_flags flags)
+io_run_append(const char **argv, int fd)
 {
-	return io_format(io, dir, IO_RD, argv, flags) && io_start(io);
+	return io_complete(IO_AP, argv, NULL, fd);
 }
 
 static bool
@@ -871,10 +1030,9 @@ io_read_buf(struct io *io, char buf[], size_t bufsize)
 static bool
 io_run_buf(const char **argv, char buf[], size_t bufsize)
 {
-	struct io io = {};
+	struct io io;
 
-	return io_run_rd(&io, argv, NULL, FORMAT_NONE)
-	    && io_read_buf(&io, buf, bufsize);
+	return io_run(&io, IO_RD, NULL, argv) && io_read_buf(&io, buf, bufsize);
 }
 
 static int
@@ -884,9 +1042,6 @@ io_load(struct io *io, const char *separators,
 	char *name;
 	int state = OK;
 
-	if (!io_start(io))
-		return ERR;
-
 	while (state == OK && (name = io_get(io, '\n', TRUE))) {
 		char *value;
 		size_t namelen;
@@ -919,10 +1074,11 @@ static int
 io_run_load(const char **argv, const char *separators,
 	    int (*read_property)(char *, size_t, char *, size_t))
 {
-	struct io io = {};
+	struct io io;
 
-	return io_format(&io, NULL, IO_RD, argv, FORMAT_NONE)
-		? io_load(&io, separators, read_property) : ERR;
+	if (!io_run(&io, IO_RD, NULL, argv))
+		return ERR;
+	return io_load(&io, separators, read_property);
 }
 
 
@@ -1010,7 +1166,8 @@ enum request {
 #define REQ_(req, help) REQ_##req
 
 	/* Offset all requests to avoid conflicts with ncurses getch values. */
-	REQ_OFFSET = KEY_MAX + 1,
+	REQ_UNKNOWN = KEY_MAX + 1,
+	REQ_OFFSET,
 	REQ_INFO
 
 #undef	REQ_GROUP
@@ -1042,7 +1199,7 @@ get_request(const char *name)
 		if (enum_equals(req_info[i], name, namelen))
 			return req_info[i].request;
 
-	return REQ_NONE;
+	return REQ_UNKNOWN;
 }
 
 
@@ -1077,6 +1234,9 @@ static char opt_git_dir[SIZEOF_STR]	= "";
 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;
 
 #define is_initial_commit()	(!get_ref_head())
 #define is_head_commit(rev)	(!strcmp((rev), "HEAD") || (get_ref_head() && !strcmp(rev, get_ref_head()->id)))
@@ -1115,6 +1275,8 @@ LINE(AUTHOR,	   "author ",		COLOR_GREEN,	COLOR_DEFAULT,	0), \
 LINE(COMMITTER,	   "committer ",	COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(SIGNOFF,	   "    Signed-off-by", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(ACKED,	   "    Acked-by",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(TESTED,	   "    Tested-by",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(REVIEWED,	   "    Reviewed-by",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(DEFAULT,	   "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(CURSOR,	   "",			COLOR_WHITE,	COLOR_GREEN,	A_BOLD), \
 LINE(STATUS,	   "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
@@ -1248,7 +1410,7 @@ struct keybinding {
 	enum request request;
 };
 
-static const struct keybinding default_keybindings[] = {
+static struct keybinding default_keybindings[] = {
 	/* View switching */
 	{ 'm',		REQ_VIEW_MAIN },
 	{ 'd',		REQ_VIEW_DIFF },
@@ -1358,12 +1520,28 @@ static void
 add_keybinding(enum keymap keymap, enum request request, int key)
 {
 	struct keybinding_table *table = &keybindings[keymap];
+	size_t i;
+
+	for (i = 0; i < keybindings[keymap].size; i++) {
+		if (keybindings[keymap].data[i].alias == key) {
+			keybindings[keymap].data[i].request = request;
+			return;
+		}
+	}
 
 	table->data = realloc(table->data, (table->size + 1) * sizeof(*table->data));
 	if (!table->data)
 		die("Failed to allocate keybinding");
 	table->data[table->size].alias = key;
 	table->data[table->size++].request = request;
+
+	if (request == REQ_NONE && keymap == KEYMAP_GENERIC) {
+		int i;
+
+		for (i = 0; i < ARRAY_SIZE(default_keybindings); i++)
+			if (default_keybindings[i].alias == key)
+				default_keybindings[i].request = REQ_NONE;
+	}
 }
 
 /* Looks for a key binding first in the given map, then in the generic map, and
@@ -1531,7 +1709,7 @@ get_keys(enum keymap keymap, enum request request, bool all)
 struct run_request {
 	enum keymap keymap;
 	int key;
-	const char *argv[SIZEOF_ARG];
+	const char **argv;
 };
 
 static struct run_request *run_request;
@@ -1540,22 +1718,19 @@ static size_t run_requests;
 DEFINE_ALLOCATOR(realloc_run_requests, struct run_request, 8)
 
 static enum request
-add_run_request(enum keymap keymap, int key, int argc, const char **argv)
+add_run_request(enum keymap keymap, int key, const char **argv)
 {
 	struct run_request *req;
 
-	if (argc >= ARRAY_SIZE(req->argv) - 1)
-		return REQ_NONE;
-
 	if (!realloc_run_requests(&run_request, run_requests, 1))
 		return REQ_NONE;
 
 	req = &run_request[run_requests];
 	req->keymap = keymap;
 	req->key = key;
-	req->argv[0] = NULL;
+	req->argv = NULL;
 
-	if (!format_argv(req->argv, argv, FORMAT_NONE))
+	if (!argv_copy(&req->argv, argv))
 		return REQ_NONE;
 
 	return REQ_NONE + ++run_requests;
@@ -1573,24 +1748,23 @@ static void
 add_builtin_run_requests(void)
 {
 	const char *cherry_pick[] = { "git", "cherry-pick", "%(commit)", NULL };
+	const char *checkout[] = { "git", "checkout", "%(branch)", NULL };
 	const char *commit[] = { "git", "commit", NULL };
 	const char *gc[] = { "git", "gc", NULL };
-	struct {
-		enum keymap keymap;
-		int key;
-		int argc;
-		const char **argv;
-	} reqs[] = {
-		{ KEYMAP_MAIN,	  'C', ARRAY_SIZE(cherry_pick) - 1, cherry_pick },
-		{ KEYMAP_STATUS,  'C', ARRAY_SIZE(commit) - 1, commit },
-		{ KEYMAP_GENERIC, 'G', ARRAY_SIZE(gc) - 1, gc },
+	struct run_request reqs[] = {
+		{ KEYMAP_MAIN,	  'C', cherry_pick },
+		{ KEYMAP_STATUS,  'C', commit },
+		{ KEYMAP_BRANCH,  'C', checkout },
+		{ KEYMAP_GENERIC, 'G', gc },
 	};
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(reqs); i++) {
-		enum request req;
+		enum request req = get_keybinding(reqs[i].keymap, reqs[i].key);
 
-		req = add_run_request(reqs[i].keymap, reqs[i].key, reqs[i].argc, reqs[i].argv);
+		if (req != reqs[i].key)
+			continue;
+		req = add_run_request(reqs[i].keymap, reqs[i].key, reqs[i].argv);
 		if (req != REQ_NONE)
 			add_keybinding(reqs[i].keymap, req, reqs[i].key);
 	}
@@ -1835,7 +2009,7 @@ option_bind_command(int argc, const char *argv[])
 		return ERR;
 	}
 
-	if (set_keymap(&keymap, argv[0]) == ERR) {
+	if (!set_keymap(&keymap, argv[0])) {
 		config_msg = "Unknown key map";
 		return ERR;
 	}
@@ -1847,7 +2021,7 @@ option_bind_command(int argc, const char *argv[])
 	}
 
 	request = get_request(argv[2]);
-	if (request == REQ_NONE) {
+	if (request == REQ_UNKNOWN) {
 		static const struct enum_map obsolete[] = {
 			ENUM_MAP("cherry-pick",		REQ_NONE),
 			ENUM_MAP("screen-resize",	REQ_NONE),
@@ -1862,9 +2036,9 @@ option_bind_command(int argc, const char *argv[])
 			return ERR;
 		}
 	}
-	if (request == REQ_NONE && *argv[2]++ == '!')
-		request = add_run_request(keymap, key, argc - 2, argv + 2);
-	if (request == REQ_NONE) {
+	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;
 	}
@@ -1941,7 +2115,7 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen)
 static void
 load_option_file(const char *path)
 {
-	struct io io = {};
+	struct io io;
 
 	/* It's OK that the file doesn't exist. */
 	if (!io_open(&io, "%s", path))
@@ -1963,8 +2137,6 @@ load_options(void)
 	const char *tigrc_system = getenv("TIGRC_SYSTEM");
 	char buf[SIZEOF_STR];
 
-	add_builtin_run_requests();
-
 	if (!tigrc_system)
 		tigrc_system = SYSCONFDIR "/tigrc";
 	load_option_file(tigrc_system);
@@ -1976,6 +2148,10 @@ load_options(void)
 	}
 	load_option_file(tigrc_user);
 
+	/* Add _after_ loading config files to avoid adding run requests
+	 * that conflict with keybindings. */
+	add_builtin_run_requests();
+
 	return OK;
 }
 
@@ -2000,8 +2176,24 @@ static unsigned int current_view;
 static char ref_blob[SIZEOF_REF]	= "";
 static char ref_commit[SIZEOF_REF]	= "HEAD";
 static char ref_head[SIZEOF_REF]	= "HEAD";
+static char ref_branch[SIZEOF_REF]	= "";
+
+enum view_type {
+	VIEW_MAIN,
+	VIEW_DIFF,
+	VIEW_LOG,
+	VIEW_TREE,
+	VIEW_BLOB,
+	VIEW_BLAME,
+	VIEW_BRANCH,
+	VIEW_HELP,
+	VIEW_PAGER,
+	VIEW_STATUS,
+	VIEW_STAGE,
+};
 
 struct view {
+	enum view_type type;	/* View type */
 	const char *name;	/* View name */
 	const char *cmd_env;	/* Command line set via environment */
 	const char *id;		/* Points to either of ref_{head,commit,blob} */
@@ -2034,6 +2226,7 @@ struct view {
 	/* If non-NULL, points to the view that opened this view. If this view
 	 * is closed tig will switch back to the parent view. */
 	struct view *parent;
+	struct view *prev;
 
 	/* Buffering */
 	size_t lines;		/* Total number of lines */
@@ -2047,6 +2240,8 @@ struct view {
 	bool has_scrolled;	/* View was scrolled. */
 
 	/* Loading */
+	const char **argv;	/* Shell command arguments. */
+	const char *dir;	/* Directory from which to execute. */
 	struct io io;
 	struct io *pipe;
 	time_t start_time;
@@ -2086,12 +2281,11 @@ static struct view_ops status_ops;
 static struct view_ops tree_ops;
 static struct view_ops branch_ops;
 
-#define VIEW_STR(name, env, ref, ops, map, git) \
-	{ name, #env, ref, ops, map, git }
+#define VIEW_STR(type, name, env, ref, ops, map, git) \
+	{ type, name, #env, ref, ops, map, git }
 
 #define VIEW_(id, name, ops, git, ref) \
-	VIEW_STR(name, TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
-
+	VIEW_STR(VIEW_##id, name, TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
 
 static struct view views[] = {
 	VIEW_(MAIN,   "main",   &main_ops,   TRUE,  ref_head),
@@ -2108,7 +2302,6 @@ static struct view views[] = {
 };
 
 #define VIEW(req) 	(&views[(req) - REQ_OFFSET - 1])
-#define VIEW_REQ(view)	((view) - views + REQ_OFFSET + 1)
 
 #define foreach_view(view, i) \
 	for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
@@ -2116,6 +2309,18 @@ static struct view views[] = {
 #define view_is_displayed(view) \
 	(view == display[0] || view == display[1])
 
+static enum request
+view_request(struct view *view, enum request request)
+{
+	if (!view || !view->lines)
+		return request;
+	return view->ops->request(view, request, &view->line[view->lineno]);
+}
+
+
+/*
+ * View drawing.
+ */
 
 static inline void
 set_view_attr(struct view *view, enum line_type type)
@@ -2192,7 +2397,15 @@ draw_space(struct view *view, enum line_type type, int max, int spaces)
 static bool
 draw_text(struct view *view, enum line_type type, const char *string, bool trim)
 {
-	view->col += draw_chars(view, type, string, view->width + view->yoffset - view->col, trim);
+	char text[SIZEOF_STR];
+
+	do {
+		size_t pos = string_expand(text, sizeof(text), string, opt_tab_size);
+
+		view->col += draw_chars(view, type, text, view->width + view->yoffset - view->col, trim);
+		string += pos;
+	} while (*string && view->width + view->yoffset > view->col);
+
 	return view->width + view->yoffset <= view->col;
 }
 
@@ -2384,7 +2597,7 @@ update_view_title(struct view *view)
 
 	assert(view_is_displayed(view));
 
-	if (view != VIEW(REQ_VIEW_STATUS) && view->lines) {
+	if (view->type != VIEW_STATUS && view->lines) {
 		unsigned int view_lines = view->offset + view->height;
 		unsigned int lines = view->lines
 				   ? MIN(view_lines, view->lines) * 100 / view->lines
@@ -2506,6 +2719,11 @@ redraw_display(bool clear)
 	}
 }
 
+
+/*
+ * Option management
+ */
+
 static void
 toggle_enum_option_do(unsigned int *opt, const char *help,
 		      const struct enum_map *map, size_t size)
@@ -2929,15 +3147,6 @@ reset_view(struct view *view)
 	view->update_secs = 0;
 }
 
-static void
-free_argv(const char *argv[])
-{
-	int argc;
-
-	for (argc = 0; argv[argc]; argc++)
-		free((void *) argv[argc]);
-}
-
 static const char *
 format_arg(const char *name)
 {
@@ -2955,6 +3164,7 @@ format_arg(const char *name)
 		FORMAT_VAR("%(head)",		ref_head,	""),
 		FORMAT_VAR("%(commit)",		ref_commit,	""),
 		FORMAT_VAR("%(blob)",		ref_blob,	""),
+		FORMAT_VAR("%(branch)",		ref_branch,	""),
 	};
 	int i;
 
@@ -2962,30 +3172,44 @@ format_arg(const char *name)
 		if (!strncmp(name, vars[i].name, vars[i].namelen))
 			return *vars[i].value ? vars[i].value : vars[i].value_if_empty;
 
+	report("Unknown replacement: `%s`", name);
 	return NULL;
 }
 
 static bool
-format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags flags)
+format_argv(const char ***dst_argv, const char *src_argv[], bool replace)
 {
 	char buf[SIZEOF_STR];
 	int argc;
-	bool noreplace = flags == FORMAT_NONE;
 
-	free_argv(dst_argv);
+	argv_free(*dst_argv);
 
 	for (argc = 0; src_argv[argc]; argc++) {
 		const char *arg = src_argv[argc];
 		size_t bufpos = 0;
 
+		if (!strcmp(arg, "%(file-args)")) {
+			if (!argv_append_array(dst_argv, opt_file_args))
+				break;
+			continue;
+
+		} else if (!strcmp(arg, "%(diff-args)")) {
+			if (!argv_append_array(dst_argv, opt_diff_args))
+				break;
+			continue;
+
+		} else if (!strcmp(arg, "%(rev-args)")) {
+			if (!argv_append_array(dst_argv, opt_rev_args))
+				break;
+			continue;
+		}
+
 		while (arg) {
 			char *next = strstr(arg, "%(");
 			int len = next - arg;
 			const char *value;
 
-			if (!next || noreplace) {
-				if (flags == FORMAT_DASH && !strcmp(arg, "--"))
-					noreplace = TRUE;
+			if (!next || !replace) {
 				len = strlen(arg);
 				value = "";
 
@@ -2993,7 +3217,6 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
 				value = format_arg(next);
 
 				if (!value) {
-					report("Unknown replacement: `%s`", next);
 					return FALSE;
 				}
 			}
@@ -3001,16 +3224,13 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
 			if (!string_format_from(buf, &bufpos, "%.*s%s", len, arg, value))
 				return FALSE;
 
-			arg = next && !noreplace ? strchr(next, ')') + 1 : NULL;
+			arg = next && replace ? strchr(next, ')') + 1 : NULL;
 		}
 
-		dst_argv[argc] = strdup(buf);
-		if (!dst_argv[argc])
+		if (!argv_append(dst_argv, buf))
 			break;
 	}
 
-	dst_argv[argc] = NULL;
-
 	return src_argv[argc] == NULL;
 }
 
@@ -3061,12 +3281,27 @@ setup_update(struct view *view, const char *vid)
 }
 
 static bool
-prepare_update(struct view *view, const char *argv[], const char *dir,
-	       enum format_flags flags)
+prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
+{
+	view->dir = dir;
+	return format_argv(&view->argv, argv, replace);
+}
+
+static bool
+prepare_update(struct view *view, const char *argv[], const char *dir)
 {
 	if (view->pipe)
 		end_update(view, TRUE);
-	return io_format(&view->io, dir, IO_RD, argv, flags);
+	return prepare_io(view, dir, argv, FALSE);
+}
+
+static bool
+start_update(struct view *view, const char **argv, const char *dir)
+{
+	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
@@ -3074,6 +3309,7 @@ prepare_update_file(struct view *view, const char *name)
 {
 	if (view->pipe)
 		end_update(view, TRUE);
+	argv_free(view->argv);
 	return io_open(&view->io, "%s/%s", opt_cdup[0] ? opt_cdup : ".", name);
 }
 
@@ -3087,7 +3323,7 @@ begin_update(struct view *view, bool refresh)
 		if (view->ops->prepare) {
 			if (!view->ops->prepare(view))
 				return FALSE;
-		} else if (!io_format(&view->io, NULL, IO_RD, view->ops->argv, FORMAT_ALL)) {
+		} else if (!prepare_io(view, NULL, view->ops->argv, TRUE)) {
 			return FALSE;
 		}
 
@@ -3098,7 +3334,8 @@ begin_update(struct view *view, bool refresh)
 		string_copy_rev(view->ref, view->id);
 	}
 
-	if (!io_start(&view->io))
+	if (view->argv && view->argv[0] &&
+	    !io_run(&view->io, IO_RD, view->dir, view->argv))
 		return FALSE;
 
 	setup_update(view, view->id);
@@ -3165,7 +3402,7 @@ update_view(struct view *view)
 		/* Keep the displayed view in sync with line number scaling. */
 		if (digits != view->digits) {
 			view->digits = digits;
-			if (opt_line_number || view == VIEW(REQ_VIEW_BLAME))
+			if (opt_line_number || view->type == VIEW_BLAME)
 				redraw = TRUE;
 		}
 	}
@@ -3175,7 +3412,8 @@ update_view(struct view *view)
 		end_update(view, TRUE);
 
 	} else if (io_eof(view->pipe)) {
-		report("");
+		if (view_is_displayed(view))
+			report("");
 		end_update(view, FALSE);
 	}
 
@@ -3272,6 +3510,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 	if (split) {
 		display[1] = view;
 		current_view = 1;
+		view->parent = prev;
 	} else if (!nomaximize) {
 		/* Maximize the current view. */
 		memset(display, 0, sizeof(display));
@@ -3279,9 +3518,9 @@ 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. */
+	/* No prev signals that this is the first loaded view. */
 	if (prev && view != prev) {
-		view->parent = prev;
+		view->prev = prev;
 	}
 
 	/* Resize the view when switching between split- and full-screen,
@@ -3375,16 +3614,18 @@ static void
 open_run_request(enum request request)
 {
 	struct run_request *req = get_run_request(request);
-	const char *argv[ARRAY_SIZE(req->argv)] = { NULL };
+	const char **argv = NULL;
 
 	if (!req) {
 		report("Unknown run request");
 		return;
 	}
 
-	if (format_argv(argv, req->argv, FORMAT_ALL))
+	if (format_argv(&argv, req->argv, TRUE))
 		open_external_viewer(argv, NULL);
-	free_argv(argv);
+	if (argv)
+		argv_free(argv);
+	free(argv);
 }
 
 /*
@@ -3401,22 +3642,13 @@ view_driver(struct view *view, enum request request)
 
 	if (request > REQ_NONE) {
 		open_run_request(request);
-		/* FIXME: When all views can refresh always do this. */
-		if (view == VIEW(REQ_VIEW_STATUS) ||
-		    view == VIEW(REQ_VIEW_MAIN) ||
-		    view == VIEW(REQ_VIEW_LOG) ||
-		    view == VIEW(REQ_VIEW_BRANCH) ||
-		    view == VIEW(REQ_VIEW_STAGE))
-			request = REQ_REFRESH;
-		else
-			return TRUE;
+		view_request(view, REQ_REFRESH);
+		return TRUE;
 	}
 
-	if (view && view->lines) {
-		request = view->ops->request(view, request, &view->line[view->lineno]);
-		if (request == REQ_NONE)
-			return TRUE;
-	}
+	request = view_request(view, request);
+	if (request == REQ_NONE)
+		return TRUE;
 
 	switch (request) {
 	case REQ_MOVE_UP:
@@ -3494,16 +3726,7 @@ view_driver(struct view *view, enum request request)
 	case REQ_PREVIOUS:
 		request = request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
 
-		if ((view == VIEW(REQ_VIEW_DIFF) &&
-		     view->parent == VIEW(REQ_VIEW_MAIN)) ||
-		   (view == VIEW(REQ_VIEW_DIFF) &&
-		     view->parent == VIEW(REQ_VIEW_BLAME)) ||
-		   (view == VIEW(REQ_VIEW_STAGE) &&
-		     view->parent == VIEW(REQ_VIEW_STATUS)) ||
-		   (view == VIEW(REQ_VIEW_BLOB) &&
-		     view->parent == VIEW(REQ_VIEW_TREE)) ||
-		   (view == VIEW(REQ_VIEW_MAIN) &&
-		     view->parent == VIEW(REQ_VIEW_BRANCH))) {
+		if (view->parent) {
 			int line;
 
 			view = view->parent;
@@ -3512,9 +3735,7 @@ view_driver(struct view *view, enum request request)
 			if (view_is_displayed(view))
 				update_view_title(view);
 			if (line != view->lineno)
-				view->ops->request(view, REQ_ENTER,
-						   &view->line[view->lineno]);
-
+				view_request(view, REQ_ENTER);
 		} else {
 			move_view(view, request);
 		}
@@ -3585,8 +3806,7 @@ view_driver(struct view *view, enum request request)
 		break;
 
 	case REQ_STOP_LOADING:
-		for (i = 0; i < ARRAY_SIZE(views); i++) {
-			view = &views[i];
+		foreach_view(view, i) {
 			if (view->pipe)
 				report("Stopped loading the %s view", view->name),
 			end_update(view, TRUE);
@@ -3610,13 +3830,12 @@ view_driver(struct view *view, enum request request)
 		break;
 
 	case REQ_VIEW_CLOSE:
-		/* XXX: Mark closed views by letting view->parent point to the
+		/* XXX: Mark closed views by letting view->prev point to the
 		 * view itself. Parents to closed view should never be
 		 * followed. */
-		if (view->parent &&
-		    view->parent->parent != view->parent) {
-			maximize_view(view->parent);
-			view->parent = view;
+		if (view->prev && view->prev != view) {
+			maximize_view(view->prev);
+			view->prev = view;
 			break;
 		}
 		/* Fall-through */
@@ -3724,8 +3943,8 @@ parse_timezone(struct time *time, const char *zone)
 
 	tz  = ('0' - zone[1]) * 60 * 60 * 10;
 	tz += ('0' - zone[2]) * 60 * 60;
-	tz += ('0' - zone[3]) * 60;
-	tz += ('0' - zone[4]);
+	tz += ('0' - zone[3]) * 60 * 10;
+	tz += ('0' - zone[4]) * 60;
 
 	if (zone[0] == '-')
 		tz = -tz;
@@ -3749,87 +3968,22 @@ parse_author_line(char *ident, const char **author, struct time *time)
 	if (!*ident) {
 		if (nameend)
 			ident = chomp_string(nameend + 1);
-		if (!*ident)
-			ident = "Unknown";
-	}
-
-	*author = get_author(ident);
-
-	/* Parse epoch and timezone */
-	if (emailend && emailend[1] == ' ') {
-		char *secs = emailend + 2;
-		char *zone = strchr(secs, ' ');
-
-		parse_timesec(time, secs);
-
-		if (zone && strlen(zone) == STRING_SIZE(" +0700"))
-			parse_timezone(time, zone + 1);
-	}
-}
-
-static bool
-open_commit_parent_menu(char buf[SIZEOF_STR], int *parents)
-{
-	char rev[SIZEOF_REV];
-	const char *revlist_argv[] = {
-		"git", "log", "--no-color", "-1", "--pretty=format:%s", rev, NULL
-	};
-	struct menu_item *items;
-	char text[SIZEOF_STR];
-	bool ok = TRUE;
-	int i;
-
-	items = calloc(*parents + 1, sizeof(*items));
-	if (!items)
-		return FALSE;
-
-	for (i = 0; i < *parents; i++) {
-		string_copy_rev(rev, &buf[SIZEOF_REV * i]);
-		if (!io_run_buf(revlist_argv, text, sizeof(text)) ||
-		    !(items[i].text = strdup(text))) {
-			ok = FALSE;
-			break;
-		}
+		if (!*ident)
+			ident = "Unknown";
 	}
 
-	if (ok) {
-		*parents = 0;
-		ok = prompt_menu("Select parent", items, parents);
-	}
-	for (i = 0; items[i].text; i++)
-		free((char *) items[i].text);
-	free(items);
-	return ok;
-}
+	*author = get_author(ident);
 
-static bool
-select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path)
-{
-	char buf[SIZEOF_STR * 4];
-	const char *revlist_argv[] = {
-		"git", "log", "--no-color", "-1",
-			"--pretty=format:%P", id, "--", path, NULL
-	};
-	int parents;
+	/* Parse epoch and timezone */
+	if (emailend && emailend[1] == ' ') {
+		char *secs = emailend + 2;
+		char *zone = strchr(secs, ' ');
 
-	if (!io_run_buf(revlist_argv, buf, sizeof(buf)) ||
-	    (parents = strlen(buf) / 40) < 0) {
-		report("Failed to get parent information");
-		return FALSE;
+		parse_timesec(time, secs);
 
-	} else if (parents == 0) {
-		if (path)
-			report("Path '%s' does not exist in the parent", path);
-		else
-			report("The selected commit has no parents");
-		return FALSE;
+		if (zone && strlen(zone) == STRING_SIZE(" +0700"))
+			parse_timezone(time, zone + 1);
 	}
-
-	if (parents > 1 && !open_commit_parent_menu(buf, &parents))
-		return FALSE;
-
-	string_copy_rev(rev, &buf[41 * parents]);
-	return TRUE;
 }
 
 /*
@@ -3839,13 +3993,10 @@ select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path)
 static bool
 pager_draw(struct view *view, struct line *line, unsigned int lineno)
 {
-	char text[SIZEOF_STR];
-
 	if (opt_line_number && draw_lineno(view, lineno))
 		return TRUE;
 
-	string_expand(text, sizeof(text), line->data, opt_tab_size);
-	draw_text(view, line->type, text, TRUE);
+	draw_text(view, line->type, line->data, TRUE);
 	return TRUE;
 }
 
@@ -3879,7 +4030,7 @@ add_pager_refs(struct view *view, struct line *line)
 
 	list = get_ref_list(commit_id);
 	if (!list) {
-		if (view == VIEW(REQ_VIEW_DIFF))
+		if (view->type == VIEW_DIFF)
 			goto try_add_describe_ref;
 		return;
 	}
@@ -3896,7 +4047,7 @@ add_pager_refs(struct view *view, struct line *line)
 			is_tag = TRUE;
 	}
 
-	if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) {
+	if (!is_tag && view->type == VIEW_DIFF) {
 try_add_describe_ref:
 		/* Add <tag>-g<commit_id> "fake" reference. */
 		if (!add_describe_ref(buf, &bufpos, commit_id, sep))
@@ -3922,8 +4073,8 @@ pager_read(struct view *view, char *data)
 		return FALSE;
 
 	if (line->type == LINE_COMMIT &&
-	    (view == VIEW(REQ_VIEW_DIFF) ||
-	     view == VIEW(REQ_VIEW_LOG)))
+	    (view->type == VIEW_DIFF ||
+	     view->type == VIEW_LOG))
 		add_pager_refs(view, line);
 
 	return TRUE;
@@ -3938,8 +4089,8 @@ pager_request(struct view *view, enum request request, struct line *line)
 		return request;
 
 	if (line->type == LINE_COMMIT &&
-	   (view == VIEW(REQ_VIEW_LOG) ||
-	    view == VIEW(REQ_VIEW_PAGER))) {
+	   (view->type == VIEW_LOG ||
+	    view->type == VIEW_PAGER)) {
 		open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
 		split = 1;
 	}
@@ -3972,7 +4123,7 @@ pager_select(struct view *view, struct line *line)
 	if (line->type == LINE_COMMIT) {
 		char *text = (char *)line->data + STRING_SIZE("commit ");
 
-		if (view != VIEW(REQ_VIEW_PAGER))
+		if (view->type != VIEW_PAGER)
 			string_copy_rev(view->ref, text);
 		string_copy_rev(ref_commit, text);
 	}
@@ -4019,7 +4170,8 @@ static struct view_ops log_ops = {
 
 static const char *diff_argv[SIZEOF_ARG] = {
 	"git", "show", "--pretty=fuller", "--no-color", "--root",
-		"--patch-with-stat", "--find-copies-harder", "-C", "%(commit)", NULL
+		"--patch-with-stat", "--find-copies-harder", "-C",
+		"%(diff-args)", "%(commit)", "--", "%(file-args)", NULL
 };
 
 static struct view_ops diff_ops = {
@@ -4319,7 +4471,6 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 			"git", "log", "--no-color", "--pretty=raw",
 				"--cc", "--raw", view->id, "--", path, NULL
 		};
-		struct io io = {};
 
 		if (!view->lines) {
 			tree_entry(view, LINE_TREE_HEAD, opt_path, NULL, NULL);
@@ -4327,13 +4478,11 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 			return TRUE;
 		}
 
-		if (!io_run_rd(&io, log_file, opt_cdup, FORMAT_NONE)) {
+		if (!start_update(view, log_file, opt_cdup)) {
 			report("Failed to load tree data");
 			return TRUE;
 		}
 
-		io_done(view->pipe);
-		view->io = io;
 		*read_date = TRUE;
 		return FALSE;
 
@@ -4462,14 +4611,15 @@ tree_draw(struct view *view, struct line *line, unsigned int lineno)
 }
 
 static void
-open_blob_editor()
+open_blob_editor(const char *id)
 {
+	const char *blob_argv[] = { "git", "cat-file", "blob", id, NULL };
 	char file[SIZEOF_STR] = "/tmp/tigblob.XXXXXX";
 	int fd = mkstemp(file);
 
 	if (fd == -1)
 		report("Failed to create temporary file");
-	else if (!io_run_append(blob_ops.argv, FORMAT_ALL, fd))
+	else if (!io_run_append(blob_argv, fd))
 		report("Failed to save blob data to file");
 	else
 		open_editor(file);
@@ -4481,6 +4631,7 @@ static enum request
 tree_request(struct view *view, enum request request, struct line *line)
 {
 	enum open_flags flags;
+	struct tree_entry *entry = line->data;
 
 	switch (request) {
 	case REQ_VIEW_BLAME:
@@ -4496,7 +4647,7 @@ tree_request(struct view *view, enum request request, struct line *line)
 		if (line->type != LINE_TREE_FILE) {
 			report("Edit only supported for files");
 		} else if (!is_head_commit(view->vid)) {
-			open_blob_editor();
+			open_blob_editor(entry->id);
 		} else {
 			open_editor(opt_file);
 		}
@@ -4547,7 +4698,7 @@ tree_request(struct view *view, enum request request, struct line *line)
 		break;
 
 	case LINE_TREE_FILE:
-		flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+		flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
 		request = REQ_VIEW_BLOB;
 		break;
 
@@ -4615,7 +4766,7 @@ tree_prepare(struct view *view)
 		opt_path[0] = 0;
 	}
 
-	return io_format(&view->io, opt_cdup, IO_RD, view->ops->argv, FORMAT_ALL);
+	return prepare_io(view, opt_cdup, view->ops->argv, TRUE);
 }
 
 static const char *tree_argv[SIZEOF_ARG] = {
@@ -4647,7 +4798,7 @@ blob_request(struct view *view, enum request request, struct line *line)
 {
 	switch (request) {
 	case REQ_EDIT:
-		open_blob_editor();
+		open_blob_editor(view->vid);
 		return REQ_NONE;
 	default:
 		return pager_request(view, request, line);
@@ -4680,25 +4831,14 @@ static struct view_ops blob_ops = {
  *     reading output from git-blame.
  */
 
-static const char *blame_head_argv[] = {
-	"git", "blame", "--incremental", "--", "%(file)", NULL
-};
-
-static const char *blame_ref_argv[] = {
-	"git", "blame", "--incremental", "%(ref)", "--", "%(file)", NULL
-};
-
-static const char *blame_cat_file_argv[] = {
-	"git", "cat-file", "blob", "%(ref):%(file)", NULL
-};
-
 struct blame_commit {
 	char id[SIZEOF_REV];		/* SHA1 ID. */
 	char title[128];		/* First line of the commit message. */
 	const char *author;		/* Author of the commit. */
 	struct time time;		/* Date from the author ident. */
 	char filename[128];		/* Name of file. */
-	bool has_previous;		/* Was a "previous" line detected. */
+	char parent_id[SIZEOF_REV];	/* Parent/previous SHA1 ID. */
+	char parent_filename[128];	/* Parent/previous name of file. */
 };
 
 struct blame {
@@ -4711,18 +4851,42 @@ static bool
 blame_open(struct view *view)
 {
 	char path[SIZEOF_STR];
+	size_t i;
 
-	if (!view->parent && *opt_prefix) {
+	if (!view->prev && *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 (!io_run_rd(&view->io, blame_cat_file_argv, opt_cdup, FORMAT_ALL))
+		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))
 			return FALSE;
 	}
 
+	/* First pass: remove multiple references to the same commit. */
+	for (i = 0; i < view->lines; i++) {
+		struct blame *blame = view->line[i].data;
+
+		if (blame->commit && blame->commit->id[0])
+			blame->commit->id[0] = 0;
+		else
+			blame->commit = NULL;
+	}
+
+	/* Second pass: free existing references. */
+	for (i = 0; i < view->lines; i++) {
+		struct blame *blame = view->line[i].data;
+
+		if (blame->commit)
+			free(blame->commit);
+	}
+
 	setup_update(view, opt_file);
 	string_format(view->ref, "%s ...", opt_file);
 
@@ -4809,19 +4973,19 @@ static bool
 blame_read_file(struct view *view, const char *line, bool *read_file)
 {
 	if (!line) {
-		const char **argv = *opt_ref ? blame_ref_argv : blame_head_argv;
-		struct io io = {};
+		const char *blame_argv[] = {
+			"git", "blame", "--incremental",
+				*opt_ref ? opt_ref : "--incremental", "--", opt_file, NULL
+		};
 
-		if (view->lines == 0 && !view->parent)
+		if (view->lines == 0 && !view->prev)
 			die("No blame exist for %s", view->vid);
 
-		if (view->lines == 0 || !io_run_rd(&io, argv, opt_cdup, FORMAT_ALL)) {
+		if (view->lines == 0 || !start_update(view, blame_argv, opt_cdup)) {
 			report("Failed to load blame data");
 			return TRUE;
 		}
 
-		io_done(view->pipe);
-		view->io = io;
 		*read_file = FALSE;
 		return FALSE;
 
@@ -4892,7 +5056,11 @@ blame_read(struct view *view, char *line)
 		string_ncopy(commit->title, line, strlen(line));
 
 	} else if (match_blame_header("previous ", &line)) {
-		commit->has_previous = TRUE;
+		if (strlen(line) <= SIZEOF_REV)
+			return FALSE;
+		string_copy_rev(commit->parent_id, line);
+		line += SIZEOF_REV;
+		string_ncopy(commit->parent_filename, line, strlen(line));
 
 	} else if (match_blame_header("filename ", &line)) {
 		string_ncopy(commit->filename, line, strlen(line));
@@ -4908,7 +5076,6 @@ blame_draw(struct view *view, struct line *line, unsigned int lineno)
 	struct blame *blame = line->data;
 	struct time *time = NULL;
 	const char *id = NULL, *author = NULL;
-	char text[SIZEOF_STR];
 
 	if (blame->commit && *blame->commit->filename) {
 		id = blame->commit->id;
@@ -4928,8 +5095,7 @@ blame_draw(struct view *view, struct line *line, unsigned int lineno)
 	if (draw_lineno(view, lineno))
 		return TRUE;
 
-	string_expand(text, sizeof(text), blame->text, opt_tab_size);
-	draw_text(view, LINE_DEFAULT, text, TRUE);
+	draw_text(view, LINE_DEFAULT, blame->text, TRUE);
 	return TRUE;
 }
 
@@ -4948,16 +5114,20 @@ check_blame_commit(struct blame *blame, bool check_null_id)
 static void
 setup_blame_parent_line(struct view *view, struct blame *blame)
 {
+	char from[SIZEOF_REF + SIZEOF_STR];
+	char to[SIZEOF_REF + SIZEOF_STR];
 	const char *diff_tree_argv[] = {
-		"git", "diff-tree", "-U0", blame->commit->id,
-			"--", blame->commit->filename, NULL
+		"git", "diff", "--no-textconv", "--no-extdiff", "--no-color",
+			"-U0", from, to, "--", NULL
 	};
-	struct io io = {};
+	struct io io;
 	int parent_lineno = -1;
 	int blamed_lineno = -1;
 	char *line;
 
-	if (!io_run(&io, diff_tree_argv, NULL, IO_RD))
+	if (!string_format(from, "%s:%s", opt_ref, opt_file) ||
+	    !string_format(to, "%s:%s", blame->commit->id, blame->commit->filename) ||
+	    !io_run(&io, IO_RD, NULL, diff_tree_argv))
 		return;
 
 	while ((line = io_get(&io, '\n', TRUE))) {
@@ -4984,7 +5154,7 @@ setup_blame_parent_line(struct view *view, struct blame *blame)
 static enum request
 blame_request(struct view *view, enum request request, struct line *line)
 {
-	enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+	enum open_flags flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
 	struct blame *blame = line->data;
 
 	switch (request) {
@@ -4999,10 +5169,13 @@ blame_request(struct view *view, enum request request, struct line *line)
 		break;
 
 	case REQ_PARENT:
-		if (check_blame_commit(blame, TRUE) &&
-		    select_commit_parent(blame->commit->id, opt_ref,
-					 blame->commit->filename)) {
-			string_copy(opt_file, blame->commit->filename);
+		if (!check_blame_commit(blame, TRUE))
+			break;
+		if (!*blame->commit->parent_id) {
+			report("The selected commit has no parents");
+		} else {
+			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);
 		}
@@ -5023,14 +5196,14 @@ blame_request(struct view *view, enum request request, struct line *line)
 					"-C", "-M", "HEAD", "--", view->vid, NULL
 			};
 
-			if (!blame->commit->has_previous) {
+			if (!*blame->commit->parent_id) {
 				diff_index_argv[1] = "diff";
 				diff_index_argv[2] = "--no-color";
 				diff_index_argv[6] = "--";
 				diff_index_argv[7] = "/dev/null";
 			}
 
-			if (!prepare_update(diff, diff_index_argv, NULL, FORMAT_DASH)) {
+			if (!prepare_update(diff, diff_index_argv, NULL)) {
 				report("Failed to allocate diff command");
 				break;
 			}
@@ -5161,23 +5334,21 @@ branch_request(struct view *view, enum request request, struct line *line)
 		return REQ_NONE;
 
 	case REQ_ENTER:
-		if (branch->ref == &branch_all) {
-			const char *all_branches_argv[] = {
-				"git", "log", "--no-color", "--pretty=raw", "--parents",
-				      "--topo-order", "--all", NULL
-			};
-			struct view *main_view = VIEW(REQ_VIEW_MAIN);
+	{
+		const struct ref *ref = branch->ref;
+		const char *all_branches_argv[] = {
+			"git", "log", "--no-color", "--pretty=raw", "--parents",
+			      "--topo-order",
+			      ref == &branch_all ? "--all" : ref->name, NULL
+		};
+		struct view *main_view = VIEW(REQ_VIEW_MAIN);
 
-			if (!prepare_update(main_view, all_branches_argv, NULL, FORMAT_NONE)) {
-				report("Failed to load view of all branches");
-				return REQ_NONE;
-			}
+		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);
-		} else {
-			open_view(view, REQ_VIEW_MAIN, OPEN_SPLIT);
-		}
 		return REQ_NONE;
-
+	}
 	default:
 		return request;
 	}
@@ -5249,7 +5420,7 @@ branch_open(struct view *view)
 			"--simplify-by-decoration", "--all", NULL
 	};
 
-	if (!io_run_rd(&view->io, branch_log, NULL, FORMAT_NONE)) {
+	if (!start_update(view, branch_log, NULL)) {
 		report("Failed to load branch data");
 		return TRUE;
 	}
@@ -5283,6 +5454,7 @@ branch_select(struct view *view, struct line *line)
 	string_copy_rev(view->ref, branch->ref->id);
 	string_copy_rev(ref_commit, branch->ref->id);
 	string_copy_rev(ref_head, branch->ref->id);
+	string_copy_rev(ref_branch, branch->ref->name);
 }
 
 static struct view_ops branch_ops = {
@@ -5367,9 +5539,9 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty
 {
 	struct status *unmerged = NULL;
 	char *buf;
-	struct io io = {};
+	struct io io;
 
-	if (!io_run(&io, argv, opt_cdup, IO_RD))
+	if (!io_run(&io, IO_RD, opt_cdup, argv))
 		return FALSE;
 
 	add_line_data(view, NULL, type);
@@ -5517,7 +5689,7 @@ status_update_onbranch(void)
 			continue;
 
 		if (!*opt_head) {
-			struct io io = {};
+			struct io io;
 
 			if (io_open(&io, "%s/rebase-merge/head-name", opt_git_dir) &&
 			    io_read_buf(&io, buf, sizeof(buf))) {
@@ -5652,7 +5824,7 @@ status_enter(struct view *view, struct line *line)
 					"--", "/dev/null", newpath, NULL
 			};
 
-			if (!prepare_update(stage, no_head_diff_argv, opt_cdup, FORMAT_DASH))
+			if (!prepare_update(stage, no_head_diff_argv, opt_cdup))
 				return status_load_error(view, stage, newpath);
 		} else {
 			const char *index_show_argv[] = {
@@ -5661,7 +5833,7 @@ status_enter(struct view *view, struct line *line)
 					oldpath, newpath, NULL
 			};
 
-			if (!prepare_update(stage, index_show_argv, opt_cdup, FORMAT_DASH))
+			if (!prepare_update(stage, index_show_argv, opt_cdup))
 				return status_load_error(view, stage, newpath);
 		}
 
@@ -5678,7 +5850,7 @@ status_enter(struct view *view, struct line *line)
 				"-C", "-M", "--", oldpath, newpath, NULL
 		};
 
-		if (!prepare_update(stage, files_show_argv, opt_cdup, FORMAT_DASH))
+		if (!prepare_update(stage, files_show_argv, opt_cdup))
 			return status_load_error(view, stage, newpath);
 		if (status)
 			info = "Unstaged changes to %s";
@@ -5709,7 +5881,7 @@ status_enter(struct view *view, struct line *line)
 		die("line type %d not handled in switch", line->type);
 	}
 
-	split = view_is_displayed(view) ? OPEN_SPLIT : 0;
+	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) {
@@ -5764,11 +5936,11 @@ status_update_prepare(struct io *io, enum line_type type)
 
 	switch (type) {
 	case LINE_STAT_STAGED:
-		return io_run(io, staged_argv, opt_cdup, IO_WR);
+		return io_run(io, IO_WR, opt_cdup, staged_argv);
 
 	case LINE_STAT_UNSTAGED:
 	case LINE_STAT_UNTRACKED:
-		return io_run(io, others_argv, opt_cdup, IO_WR);
+		return io_run(io, IO_WR, opt_cdup, others_argv);
 
 	default:
 		die("line type %d not handled in switch", type);
@@ -5807,7 +5979,7 @@ status_update_write(struct io *io, struct status *status, enum line_type type)
 static bool
 status_update_file(struct status *status, enum line_type type)
 {
-	struct io io = {};
+	struct io io;
 	bool result;
 
 	if (!status_update_prepare(&io, type))
@@ -5821,7 +5993,7 @@ static bool
 status_update_files(struct view *view, struct line *line)
 {
 	char buf[sizeof(view->ref)];
-	struct io io = {};
+	struct io io;
 	bool result = TRUE;
 	struct line *pos = view->line + view->lines;
 	int files = 0;
@@ -6094,7 +6266,7 @@ stage_apply_chunk(struct view *view, struct line *chunk, bool revert)
 		"git", "apply", "--whitespace=nowarn", NULL
 	};
 	struct line *diff_hdr;
-	struct io io = {};
+	struct io io;
 	int argc = 3;
 
 	diff_hdr = stage_diff_find(view, chunk, LINE_DIFF_HEADER);
@@ -6107,7 +6279,7 @@ stage_apply_chunk(struct view *view, struct line *chunk, bool revert)
 		apply_argv[argc++] = "-R";
 	apply_argv[argc++] = "-";
 	apply_argv[argc++] = NULL;
-	if (!io_run(&io, apply_argv, opt_cdup, IO_WR))
+	if (!io_run(&io, IO_WR, opt_cdup, apply_argv))
 		return FALSE;
 
 	if (!stage_diff_write(&io, diff_hdr, chunk) ||
@@ -6523,7 +6695,8 @@ update_rev_graph(struct view *view, struct rev_graph *graph)
 
 static const char *main_argv[SIZEOF_ARG] = {
 	"git", "log", "--no-color", "--pretty=raw", "--parents",
-		      "--topo-order", "%(head)", NULL
+		"--topo-order", "%(diff-args)", "%(rev-args)",
+		"--", "%(file-args)", NULL
 };
 
 static bool
@@ -6589,7 +6762,7 @@ main_read(struct view *view, char *line)
 	if (!line) {
 		int i;
 
-		if (!view->lines && !view->parent)
+		if (!view->lines && !view->prev)
 			die("No revisions match the given arguments.");
 		if (view->lines > 0) {
 			commit = view->line[view->lines - 1].data;
@@ -6679,7 +6852,7 @@ main_read(struct view *view, char *line)
 static enum request
 main_request(struct view *view, enum request request, struct line *line)
 {
-	enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+	enum open_flags flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
 
 	switch (request) {
 	case REQ_ENTER:
@@ -6748,166 +6921,6 @@ static struct view_ops main_ops = {
 };
 
 
-/*
- * Unicode / UTF-8 handling
- *
- * NOTE: Much of the following code for dealing with Unicode is derived from
- * ELinks' UTF-8 code developed by Scrool <scroolik@gmail.com>. Origin file is
- * src/intl/charset.c from the UTF-8 branch commit elinks-0.11.0-g31f2c28.
- */
-
-static inline int
-unicode_width(unsigned long c, int tab_size)
-{
-	if (c >= 0x1100 &&
-	   (c <= 0x115f				/* Hangul Jamo */
-	    || c == 0x2329
-	    || c == 0x232a
-	    || (c >= 0x2e80  && c <= 0xa4cf && c != 0x303f)
-						/* CJK ... Yi */
-	    || (c >= 0xac00  && c <= 0xd7a3)	/* Hangul Syllables */
-	    || (c >= 0xf900  && c <= 0xfaff)	/* CJK Compatibility Ideographs */
-	    || (c >= 0xfe30  && c <= 0xfe6f)	/* CJK Compatibility Forms */
-	    || (c >= 0xff00  && c <= 0xff60)	/* Fullwidth Forms */
-	    || (c >= 0xffe0  && c <= 0xffe6)
-	    || (c >= 0x20000 && c <= 0x2fffd)
-	    || (c >= 0x30000 && c <= 0x3fffd)))
-		return 2;
-
-	if (c == '\t')
-		return tab_size;
-
-	return 1;
-}
-
-/* Number of bytes used for encoding a UTF-8 character indexed by first byte.
- * Illegal bytes are set one. */
-static const unsigned char utf8_bytes[256] = {
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
-	2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,
-	3,3,3,3,3,3,3,3, 3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4, 5,5,5,5,6,6,1,1,
-};
-
-static inline unsigned char
-utf8_char_length(const char *string, const char *end)
-{
-	int c = *(unsigned char *) string;
-
-	return utf8_bytes[c];
-}
-
-/* Decode UTF-8 multi-byte representation into a Unicode character. */
-static inline unsigned long
-utf8_to_unicode(const char *string, size_t length)
-{
-	unsigned long unicode;
-
-	switch (length) {
-	case 1:
-		unicode  =   string[0];
-		break;
-	case 2:
-		unicode  =  (string[0] & 0x1f) << 6;
-		unicode +=  (string[1] & 0x3f);
-		break;
-	case 3:
-		unicode  =  (string[0] & 0x0f) << 12;
-		unicode += ((string[1] & 0x3f) << 6);
-		unicode +=  (string[2] & 0x3f);
-		break;
-	case 4:
-		unicode  =  (string[0] & 0x0f) << 18;
-		unicode += ((string[1] & 0x3f) << 12);
-		unicode += ((string[2] & 0x3f) << 6);
-		unicode +=  (string[3] & 0x3f);
-		break;
-	case 5:
-		unicode  =  (string[0] & 0x0f) << 24;
-		unicode += ((string[1] & 0x3f) << 18);
-		unicode += ((string[2] & 0x3f) << 12);
-		unicode += ((string[3] & 0x3f) << 6);
-		unicode +=  (string[4] & 0x3f);
-		break;
-	case 6:
-		unicode  =  (string[0] & 0x01) << 30;
-		unicode += ((string[1] & 0x3f) << 24);
-		unicode += ((string[2] & 0x3f) << 18);
-		unicode += ((string[3] & 0x3f) << 12);
-		unicode += ((string[4] & 0x3f) << 6);
-		unicode +=  (string[5] & 0x3f);
-		break;
-	default:
-		die("Invalid Unicode length");
-	}
-
-	/* Invalid characters could return the special 0xfffd value but NUL
-	 * should be just as good. */
-	return unicode > 0xffff ? 0 : unicode;
-}
-
-/* Calculates how much of string can be shown within the given maximum width
- * and sets trimmed parameter to non-zero value if all of string could not be
- * shown. If the reserve flag is TRUE, it will reserve at least one
- * trailing character, which can be useful when drawing a delimiter.
- *
- * Returns the number of bytes to output from string to satisfy max_width. */
-static size_t
-utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size)
-{
-	const char *string = *start;
-	const char *end = strchr(string, '\0');
-	unsigned char last_bytes = 0;
-	size_t last_ucwidth = 0;
-
-	*width = 0;
-	*trimmed = 0;
-
-	while (string < end) {
-		unsigned char bytes = utf8_char_length(string, end);
-		size_t ucwidth;
-		unsigned long unicode;
-
-		if (string + bytes > end)
-			break;
-
-		/* Change representation to figure out whether
-		 * it is a single- or double-width character. */
-
-		unicode = utf8_to_unicode(string, bytes);
-		/* FIXME: Graceful handling of invalid Unicode character. */
-		if (!unicode)
-			break;
-
-		ucwidth = unicode_width(unicode, tab_size);
-		if (skip > 0) {
-			skip -= ucwidth <= skip ? ucwidth : skip;
-			*start += bytes;
-		}
-		*width  += ucwidth;
-		if (*width > max_width) {
-			*trimmed = 1;
-			*width -= ucwidth;
-			if (reserve && *width == max_width) {
-				string -= last_bytes;
-				*width -= last_ucwidth;
-			}
-			break;
-		}
-
-		string  += bytes;
-		last_bytes = ucwidth ? bytes : 0;
-		last_ucwidth = ucwidth;
-	}
-
-	return string - *start;
-}
-
-
 /*
  * Status management
  */
@@ -7041,12 +7054,13 @@ get_input(int prompt_position)
 {
 	struct view *view;
 	int i, key, cursor_y, cursor_x;
-	bool loading = FALSE;
 
 	if (prompt_position)
 		input_mode = TRUE;
 
 	while (TRUE) {
+		bool loading = FALSE;
+
 		foreach_view (view, i) {
 			update_view(view);
 			if (view_is_displayed(view) && view->has_scrolled &&
@@ -7430,7 +7444,8 @@ load_refs(void)
 	size_t i;
 
 	if (!init) {
-		argv_from_env(ls_remote_argv, "TIG_LS_REMOTE");
+		if (!argv_from_env(ls_remote_argv, "TIG_LS_REMOTE"))
+			die("TIG_LS_REMOTE contains too many arguments");
 		init = TRUE;
 	}
 
@@ -7662,19 +7677,45 @@ warn(const char *msg, ...)
 	va_end(args);
 }
 
+static const char ***filter_args;
+
+static int
+read_filter_args(char *name, size_t namelen, char *value, size_t valuelen)
+{
+	return argv_append(filter_args, name) ? OK : ERR;
+}
+
+static void
+filter_rev_parse(const char ***args, const char *arg1, const char *arg2, const char *argv[])
+{
+	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)
+		die("Failed to split arguments");
+	argv_free(all_argv);
+	free(all_argv);
+}
+
+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);
+}
+
 static enum request
 parse_options(int argc, const char *argv[])
 {
 	enum request request = REQ_VIEW_MAIN;
 	const char *subcommand;
 	bool seen_dashdash = FALSE;
-	/* XXX: This is vulnerable to the user overriding options
-	 * required for the main view parser. */
-	const char *custom_argv[SIZEOF_ARG] = {
-		"git", "log", "--no-color", "--pretty=raw", "--parents",
-			"--topo-order", NULL
-	};
-	int i, j = 6;
+	const char **filter_argv = NULL;
+	int i;
 
 	if (!isatty(STDIN_FILENO)) {
 		io_open(&VIEW(REQ_VIEW_PAGER)->io, "");
@@ -7682,7 +7723,7 @@ parse_options(int argc, const char *argv[])
 	}
 
 	if (argc <= 1)
-		return REQ_NONE;
+		return REQ_VIEW_MAIN;
 
 	subcommand = argv[1];
 	if (!strcmp(subcommand, "status")) {
@@ -7710,16 +7751,16 @@ parse_options(int argc, const char *argv[])
 		subcommand = NULL;
 	}
 
-	if (subcommand) {
-		custom_argv[1] = subcommand;
-		j = 2;
-	}
-
 	for (i = 1 + !!subcommand; i < argc; i++) {
 		const char *opt = argv[i];
 
-		if (seen_dashdash || !strcmp(opt, "--")) {
+		if (seen_dashdash) {
+			argv_append(&opt_file_args, opt);
+			continue;
+
+		} else if (!strcmp(opt, "--")) {
 			seen_dashdash = TRUE;
+			continue;
 
 		} else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) {
 			printf("tig version %s\n", TIG_VERSION);
@@ -7728,15 +7769,18 @@ parse_options(int argc, const char *argv[])
 		} else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
 			printf("%s\n", usage);
 			quit(0);
+
+		} else if (!strcmp(opt, "--all")) {
+			argv_append(&opt_rev_args, opt);
+			continue;
 		}
 
-		custom_argv[j++] = opt;
-		if (j >= ARRAY_SIZE(custom_argv))
+		if (!argv_append(&filter_argv, opt))
 			die("command too long");
 	}
 
-	if (!prepare_update(VIEW(request), custom_argv, NULL, FORMAT_NONE))
-		die("Failed to format arguments");
+	if (filter_argv)
+		filter_options(filter_argv);
 
 	return request;
 }
@@ -7784,15 +7828,18 @@ main(int argc, const char *argv[])
 	if (load_refs() == ERR)
 		die("Failed to load refs.");
 
-	foreach_view (view, i)
-		argv_from_env(view->ops->argv, view->cmd_env);
+	foreach_view (view, i) {
+		if (getenv(view->cmd_env))
+			warn("Use of the %s environment variable is deprecated,"
+			     " use options or TIG_DIFF_ARGS instead",
+			     view->cmd_env);
+		if (!argv_from_env(view->ops->argv, view->cmd_env))
+			die("Too many arguments in the `%s` environment variable",
+			    view->cmd_env);
+	}
 
 	init_display();
 
-	if (request != REQ_NONE)
-		open_view(NULL, request, OPEN_PREPARED);
-	request = request == REQ_NONE ? REQ_VIEW_MAIN : REQ_NONE;
-
 	while (view_driver(display[current_view], request)) {
 		int key = get_input(0);
 
@@ -7802,6 +7849,10 @@ main(int argc, const char *argv[])
 		/* Some low-level request handling. This keeps access to
 		 * status_win restricted. */
 		switch (request) {
+		case REQ_NONE:
+			report("Unknown key, press %s for help",
+			       get_key(view->keymap, REQ_VIEW_HELP));
+			break;
 		case REQ_PROMPT:
 		{
 			char *cmd = read_prompt(":");
@@ -7828,7 +7879,7 @@ main(int argc, const char *argv[])
 
 				if (!argv_from_string(argv, &argc, cmd)) {
 					report("Too many arguments");
-				} else if (!prepare_update(next, argv, NULL, FORMAT_DASH)) {
+				} else if (!prepare_update(next, argv, NULL)) {
 					report("Failed to format command");
 				} else {
 					open_view(view, REQ_VIEW_PAGER, OPEN_PREPARED);