![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ad77c95d038b61993a21f514549aa966748105e7..86be4a2973615219fb321863eaa648e73210a8b6 100644 (file)
--- a/tig.c
+++ b/tig.c
-/* Copyright (c) 2006-2009 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2010 Jonas Fonseca <fonseca@diku.dk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include <sys/stat.h>
#include <sys/select.h>
#include <unistd.h>
+#include <sys/time.h>
#include <time.h>
#include <fcntl.h>
static void __NORETURN die(const char *err, ...);
static void warn(const char *msg, ...);
static void report(const char *msg, ...);
-static void set_nonblocking_input(bool loading);
-static size_t utf8_length(const char **string, size_t col, int *width, size_t max_width, int *trimmed, bool reserve);
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
@@ -103,26 +102,17 @@ static size_t utf8_length(const char **string, size_t col, int *width, size_t ma
/* The format and size of the date column in the main view. */
#define DATE_FORMAT "%Y-%m-%d %H:%M"
#define DATE_COLS STRING_SIZE("2006-04-29 14:21 ")
+#define DATE_SHORT_COLS STRING_SIZE("2006-04-29 ")
-#define AUTHOR_COLS 20
#define ID_COLS 8
+#define AUTHOR_COLS 19
-/* The default interval between line numbers. */
-#define NUMBER_INTERVAL 5
-
-#define TAB_SIZE 8
-
-#define SCALE_SPLIT_VIEW (2.0 / 3.0)
#define MIN_VIEW_HEIGHT 4
#define NULL_ID "0000000000000000000000000000000000000000"
#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'
struct ref **refs; /* References for this ID. */
};
+static struct ref *get_ref_head();
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 {
FORMAT_ALL, /* Perform replacement in all arguments. */
- FORMAT_DASH, /* Perform replacement up until "--". */
FORMAT_NONE /* No replacement should be performed. */
};
return 0;
}
+#define enum_equals(entry, str, len) \
+ ((entry).namelen == (len) && !string_enum_compare((entry).name, str, len))
+
struct enum_map {
const char *name;
int namelen;
#define ENUM_MAP(name, value) { name, STRING_SIZE(name), value }
+static char *
+enum_map_name(const char *name, size_t namelen)
+{
+ static char buf[SIZEOF_STR];
+ int bufpos;
+
+ for (bufpos = 0; bufpos <= namelen; bufpos++) {
+ buf[bufpos] = tolower(name[bufpos]);
+ if (buf[bufpos] == '_')
+ buf[bufpos] = '-';
+ }
+
+ buf[bufpos] = 0;
+ return buf;
+}
+
+#define enum_name(entry) enum_map_name((entry).name, (entry).namelen)
+
static bool
map_enum_do(const struct enum_map *map, size_t map_size, int *value, const char *name)
{
int i;
for (i = 0; i < map_size; i++)
- if (namelen == map[i].namelen &&
- !string_enum_compare(name, map[i].name, namelen)) {
+ if (enum_equals(map[i], name, namelen)) {
*value = map[i].value;
return TRUE;
}
}
+/*
+ * 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)
+
+enum date {
+#define DATE_(name) DATE_##name
+ DATE_INFO
+#undef DATE_
+};
+
+static const struct enum_map date_map[] = {
+#define DATE_(name) ENUM_MAP(#name, DATE_##name)
+ DATE_INFO
+#undef DATE_
+};
+
+struct time {
+ time_t sec;
+ int tz;
+};
+
+static inline int timecmp(const struct time *t1, const struct time *t2)
+{
+ return t1->sec - t2->sec;
+}
+
static const char *
-mkdate(const time_t *time)
+mkdate(const struct time *time, enum date date)
{
static char buf[DATE_COLS + 1];
+ static const struct enum_map reldate[] = {
+ { "second", 1, 60 * 2 },
+ { "minute", 60, 60 * 60 * 2 },
+ { "hour", 60 * 60, 60 * 60 * 24 * 2 },
+ { "day", 60 * 60 * 24, 60 * 60 * 24 * 7 * 2 },
+ { "week", 60 * 60 * 24 * 7, 60 * 60 * 24 * 7 * 5 },
+ { "month", 60 * 60 * 24 * 30, 60 * 60 * 24 * 30 * 12 },
+ };
struct tm tm;
- gmtime_r(time, &tm);
+ if (!date || !time || !time->sec)
+ return "";
+
+ if (date == DATE_RELATIVE) {
+ struct timeval now;
+ time_t date = time->sec + time->tz;
+ time_t seconds;
+ int i;
+
+ gettimeofday(&now, NULL);
+ seconds = now.tv_sec < date ? date - now.tv_sec : now.tv_sec - date;
+ for (i = 0; i < ARRAY_SIZE(reldate); i++) {
+ if (seconds >= reldate[i].value)
+ continue;
+
+ seconds /= reldate[i].namelen;
+ if (!string_format(buf, "%ld %s%s %s",
+ seconds, reldate[i].name,
+ seconds > 1 ? "s" : "",
+ now.tv_sec >= date ? "ago" : "ahead"))
+ break;
+ return buf;
+ }
+ }
+
+ 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;
}
+#define AUTHOR_VALUES \
+ AUTHOR_(NO), \
+ AUTHOR_(FULL), \
+ AUTHOR_(ABBREVIATED)
+
+enum author {
+#define AUTHOR_(name) AUTHOR_##name
+ AUTHOR_VALUES,
+#undef AUTHOR_
+ AUTHOR_DEFAULT = AUTHOR_FULL
+};
+
+static const struct enum_map author_map[] = {
+#define AUTHOR_(name) ENUM_MAP(#name, AUTHOR_##name)
+ AUTHOR_VALUES
+#undef AUTHOR_
+};
+
+static const char *
+get_author_initials(const char *author)
+{
+ static char initials[AUTHOR_COLS * 6 + 1];
+ size_t pos = 0;
+ const char *end = strchr(author, '\0');
+
+#define is_initial_sep(c) (isspace(c) || ispunct(c) || (c) == '@' || (c) == '-')
+
+ memset(initials, 0, sizeof(initials));
+ while (author < end) {
+ unsigned char bytes;
+ size_t i;
+
+ while (is_initial_sep(*author))
+ author++;
+
+ bytes = utf8_char_length(author, end);
+ if (bytes < sizeof(initials) - 1 - pos) {
+ while (bytes--) {
+ initials[pos++] = *author++;
+ }
+ }
+
+ for (i = pos; author < end && !is_initial_sep(*author); author++) {
+ if (i < sizeof(initials) - 1)
+ initials[i++] = *author;
+ }
+
+ initials[i++] = 0;
+ }
+
+ return initials;
+}
+
+
static bool
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;
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;
+
+ for (argc = 0; argv[argc]; argc++)
+ free((void *) argv[argc]);
+ argv[0] = NULL;
+}
+
+static bool
+argv_copy(const char *dst[], const char *src[], bool allocate)
+{
+ int argc;
+
+ for (argc = 0; src[argc]; argc++)
+ if (!(dst[argc] = allocate ? strdup(src[argc]) : src[argc]))
+ return FALSE;
+ return TRUE;
}
struct io {
enum io_type type; /* The requested type of pipe. */
const char *dir; /* Directory from which to execute. */
- pid_t pid; /* Pipe for reading or writing. */
+ pid_t pid; /* PID of spawned process. */
int pipe; /* Pipe end for reading or writing. */
int error; /* Error status. */
const char *argv[SIZEOF_ARG]; /* Shell command arguments. */
};
static void
-reset_io(struct io *io)
+io_reset(struct io *io)
{
io->pipe = -1;
io->pid = 0;
}
static void
-init_io(struct io *io, const char *dir, enum io_type type)
+io_init(struct io *io, const char *dir, enum io_type type)
{
- reset_io(io);
+ io_reset(io);
io->type = type;
io->dir = dir;
}
-static bool
-init_io_rd(struct io *io, const char *argv[], const char *dir,
- enum format_flags flags)
+static void
+io_prepare(struct io *io, const char *dir, enum io_type type, const char *argv[])
{
- init_io(io, dir, IO_RD);
- return format_argv(io->argv, argv, flags);
+ io_init(io, dir, type);
+ argv_copy(io->argv, argv, FALSE);
}
static bool
-io_open(struct io *io, const char *name)
+io_open(struct io *io, const char *fmt, ...)
{
- init_io(io, NULL, IO_FD);
+ char name[SIZEOF_STR] = "";
+ bool fits;
+ va_list args;
+
+ io_init(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;
}
static bool
-kill_io(struct io *io)
+io_kill(struct io *io)
{
return io->pid == 0 || kill(io->pid, SIGKILL) != -1;
}
static bool
-done_io(struct io *io)
+io_done(struct io *io)
{
pid_t pid = io->pid;
if (io->pipe != -1)
close(io->pipe);
free(io->buf);
- reset_io(io);
+ io_reset(io);
while (pid > 0) {
int status;
if (waiting < 0) {
if (errno == EINTR)
continue;
- report("waitpid failed (%s)", strerror(errno));
+ io->error = errno;
return FALSE;
}
}
static bool
-start_io(struct io *io)
+io_start(struct io *io)
{
int pipefds[2] = { -1, -1 };
if (io->type == IO_FD)
return TRUE;
- if ((io->type == IO_RD || io->type == IO_WR) &&
- pipe(pipefds) < 0)
+ if ((io->type == IO_RD || io->type == IO_WR) && pipe(pipefds) < 0) {
+ io->error = errno;
return FALSE;
- else if (io->type == IO_AP)
+ } else if (io->type == IO_AP) {
pipefds[1] = io->pipe;
+ }
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 (io->pid != -1) {
}
if (io->dir && *io->dir && chdir(io->dir) == -1)
- die("Failed to change directory: %s", strerror(errno));
+ exit(errno);
execvp(io->argv[0], (char *const*) io->argv);
- die("Failed to execute program: %s", strerror(errno));
+ exit(errno);
}
if (pipefds[!!(io->type == IO_WR)] != -1)
}
static bool
-run_io(struct io *io, const char **argv, const char *dir, enum io_type type)
+io_run(struct io *io, const char **argv, const char *dir, enum io_type type)
{
- init_io(io, dir, type);
- if (!format_argv(io->argv, argv, FORMAT_NONE))
- return FALSE;
- return start_io(io);
+ io_prepare(io, dir, type, argv);
+ return io_start(io);
}
-static int
-run_io_do(struct io *io)
-{
- return start_io(io) && done_io(io);
-}
-
-static int
-run_io_bg(const char **argv)
+static bool
+io_complete(enum io_type type, const char **argv, const char *dir, int fd)
{
struct io io = {};
- init_io(&io, NULL, IO_BG);
- if (!format_argv(io.argv, argv, FORMAT_NONE))
- return FALSE;
- return run_io_do(&io);
+ io_prepare(&io, dir, type, argv);
+ io.pipe = fd;
+ return io_start(&io) && io_done(&io);
}
static bool
-run_io_fg(const char **argv, const char *dir)
+io_run_bg(const char **argv)
{
- struct io io = {};
-
- init_io(&io, dir, IO_FG);
- if (!format_argv(io.argv, argv, FORMAT_NONE))
- return FALSE;
- return run_io_do(&io);
+ return io_complete(IO_BG, argv, NULL, -1);
}
static bool
-run_io_append(const char **argv, enum format_flags flags, int fd)
+io_run_fg(const char **argv, const char *dir)
{
- struct io io = {};
-
- init_io(&io, NULL, IO_AP);
- io.pipe = fd;
- if (format_argv(io.argv, argv, flags))
- return run_io_do(&io);
- close(fd);
- return FALSE;
+ return io_complete(IO_FG, argv, dir, -1);
}
static bool
-run_io_rd(struct io *io, const char **argv, enum format_flags flags)
+io_run_append(const char **argv, int fd)
{
- return init_io_rd(io, argv, NULL, flags) && start_io(io);
+ return io_complete(IO_AP, argv, NULL, -1);
}
static bool
} while (1);
}
-DEFINE_ALLOCATOR(realloc_io_buf, char, BUFSIZ)
+DEFINE_ALLOCATOR(io_realloc_buf, char, BUFSIZ)
static char *
io_get(struct io *io, int c, bool can_read)
memmove(io->buf, io->bufpos, io->bufsize);
if (io->bufalloc == io->bufsize) {
- if (!realloc_io_buf(&io->buf, io->bufalloc, BUFSIZ))
+ if (!io_realloc_buf(&io->buf, io->bufalloc, BUFSIZ))
return NULL;
io->bufalloc += BUFSIZ;
}
string_ncopy_do(buf, bufsize, result, strlen(result));
}
- return done_io(io) && result;
+ return io_done(io) && result;
}
static bool
-run_io_buf(const char **argv, char buf[], size_t bufsize)
+io_run_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);
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_start(&io) && io_read_buf(&io, buf, bufsize);
}
static int
char *name;
int state = OK;
- if (!start_io(io))
+ if (!io_start(io))
return ERR;
while (state == OK && (name = io_get(io, '\n', TRUE))) {
if (state != ERR && io_error(io))
state = ERR;
- done_io(io);
+ io_done(io);
return state;
}
static int
-run_io_load(const char **argv, const char *separators,
+io_run_load(const char **argv, const char *separators,
int (*read_property)(char *, size_t, char *, size_t))
{
struct io io = {};
- return init_io_rd(&io, argv, NULL, FORMAT_NONE)
- ? io_load(&io, separators, read_property) : ERR;
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_load(&io, separators, read_property);
}
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)"), \
#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
int i;
for (i = 0; i < ARRAY_SIZE(req_info); i++)
- if (req_info[i].namelen == namelen &&
- !string_enum_compare(req_info[i].name, name, namelen))
+ if (enum_equals(req_info[i], name, namelen))
return req_info[i].request;
- return REQ_NONE;
+ return REQ_UNKNOWN;
}
*/
/* Option and state variables. */
-static bool opt_date = TRUE;
-static bool opt_author = TRUE;
+static enum date opt_date = DATE_DEFAULT;
+static enum author opt_author = AUTHOR_DEFAULT;
static bool opt_line_number = FALSE;
static bool opt_line_graphics = TRUE;
static bool opt_rev_graph = FALSE;
static bool opt_show_refs = TRUE;
-static int opt_num_interval = NUMBER_INTERVAL;
+static int opt_num_interval = 5;
static double opt_hscroll = 0.50;
-static double opt_scale_split_view = SCALE_SPLIT_VIEW;
-static int opt_tab_size = TAB_SIZE;
-static int opt_author_cols = AUTHOR_COLS-1;
+static double opt_scale_split_view = 2.0 / 3.0;
+static int opt_tab_size = 8;
+static int opt_author_cols = AUTHOR_COLS;
static char opt_path[SIZEOF_STR] = "";
static char opt_file[SIZEOF_STR] = "";
static char opt_ref[SIZEOF_REF] = "";
static char opt_head[SIZEOF_REF] = "";
-static char opt_head_rev[SIZEOF_REV] = "";
static char opt_remote[SIZEOF_REF] = "";
static char opt_encoding[20] = "UTF-8";
-static bool opt_utf8 = TRUE;
-static char opt_codeset[20] = "UTF-8";
-static iconv_t opt_iconv = ICONV_NONE;
+static iconv_t opt_iconv_in = ICONV_NONE;
+static iconv_t opt_iconv_out = ICONV_NONE;
static char opt_search[SIZEOF_STR] = "";
static char opt_cdup[SIZEOF_STR] = "";
static char opt_prefix[SIZEOF_STR] = "";
static char opt_editor[SIZEOF_STR] = "";
static FILE *opt_tty = NULL;
-#define is_initial_commit() (!*opt_head_rev)
-#define is_head_commit(rev) (!strcmp((rev), "HEAD") || !strcmp(opt_head_rev, (rev)))
+#define is_initial_commit() (!get_ref_head())
+#define is_head_commit(rev) (!strcmp((rev), "HEAD") || (get_ref_head() && !strcmp(rev, get_ref_head()->id)))
/*
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), \
LINE(STAT_STAGED, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(STAT_UNSTAGED,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(STAT_UNTRACKED,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
+LINE(HELP_KEYMAP, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
+LINE(HELP_GROUP, "", COLOR_BLUE, COLOR_DEFAULT, 0), \
LINE(BLAME_ID, "", COLOR_MAGENTA, COLOR_DEFAULT, 0)
enum line_type {
enum line_type type;
for (type = 0; type < ARRAY_SIZE(line_info); type++)
- if (namelen == line_info[type].namelen &&
- !string_enum_compare(line_info[type].name, name, namelen))
+ if (enum_equals(line_info[type], name, namelen))
return &line_info[type];
return NULL;
unsigned int selected:1;
unsigned int dirty:1;
unsigned int cleareol:1;
+ unsigned int other:16;
void *data; /* User data */
};
enum request request;
};
-static const struct keybinding default_keybindings[] = {
+static struct keybinding default_keybindings[] = {
/* View switching */
{ 'm', REQ_VIEW_MAIN },
{ 'd', REQ_VIEW_DIFF },
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
return seq ? seq : "(no key)";
}
+static bool
+append_key(char *buf, size_t *pos, const struct keybinding *keybinding)
+{
+ const char *sep = *pos > 0 ? ", " : "";
+ const char *keyname = get_key_name(keybinding->alias);
+
+ return string_nformat(buf, BUFSIZ, pos, "%s%s", sep, keyname);
+}
+
+static bool
+append_keymap_request_keys(char *buf, size_t *pos, enum request request,
+ enum keymap keymap, bool all)
+{
+ int i;
+
+ for (i = 0; i < keybindings[keymap].size; i++) {
+ if (keybindings[keymap].data[i].request == request) {
+ if (!append_key(buf, pos, &keybindings[keymap].data[i]))
+ return FALSE;
+ if (!all)
+ break;
+ }
+ }
+
+ return TRUE;
+}
+
+#define get_key(keymap, request) get_keys(keymap, request, FALSE)
+
static const char *
-get_key(enum request request)
+get_keys(enum keymap keymap, enum request request, bool all)
{
static char buf[BUFSIZ];
size_t pos = 0;
- char *sep = "";
int i;
buf[pos] = 0;
- for (i = 0; i < ARRAY_SIZE(default_keybindings); i++) {
- const struct keybinding *keybinding = &default_keybindings[i];
+ if (!append_keymap_request_keys(buf, &pos, request, keymap, all))
+ return "Too many keybindings!";
+ if (pos > 0 && !all)
+ return buf;
- if (keybinding->request != request)
- continue;
+ if (keymap != KEYMAP_GENERIC) {
+ /* Only the generic keymap includes the default keybindings when
+ * listing all keys. */
+ if (all)
+ return buf;
- if (!string_format_from(buf, &pos, "%s%s", sep,
- get_key_name(keybinding->alias)))
+ if (!append_keymap_request_keys(buf, &pos, request, KEYMAP_GENERIC, all))
return "Too many keybindings!";
- sep = ", ";
+ if (pos)
+ return buf;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(default_keybindings); i++) {
+ if (default_keybindings[i].request == request) {
+ if (!append_key(buf, &pos, &default_keybindings[i]))
+ return "Too many keybindings!";
+ if (!all)
+ return buf;
+ }
}
return buf;
req->key = key;
req->argv[0] = NULL;
- if (!format_argv(req->argv, argv, FORMAT_NONE))
+ if (!argv_copy(req->argv, argv, TRUE))
return REQ_NONE;
return REQ_NONE + ++run_requests;
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 {
} reqs[] = {
{ KEYMAP_MAIN, 'C', ARRAY_SIZE(cherry_pick) - 1, cherry_pick },
{ KEYMAP_STATUS, 'C', ARRAY_SIZE(commit) - 1, commit },
+ { KEYMAP_BRANCH, 'C', ARRAY_SIZE(checkout) - 1, checkout },
{ KEYMAP_GENERIC, 'G', ARRAY_SIZE(gc) - 1, 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);
+ if (req != reqs[i].key)
+ continue;
req = add_run_request(reqs[i].keymap, reqs[i].key, reqs[i].argc, reqs[i].argv);
if (req != REQ_NONE)
add_keybinding(reqs[i].keymap, req, reqs[i].key);
{
struct line_info *info;
- if (argc != 3 && argc != 4) {
+ if (argc < 3) {
config_msg = "Wrong number of arguments given to color command";
return ERR;
}
return ERR;
}
- if (argc == 4 && !set_attribute(&info->attr, argv[3])) {
- config_msg = "Unknown attribute";
- return ERR;
+ info->attr = 0;
+ while (argc-- > 3) {
+ int attr;
+
+ if (!set_attribute(&attr, argv[argc])) {
+ config_msg = "Unknown attribute";
+ return ERR;
+ }
+ info->attr |= attr;
}
return OK;
return OK;
}
+static int parse_enum_do(unsigned int *opt, const char *arg,
+ const struct enum_map *map, size_t map_size)
+{
+ bool is_true;
+
+ assert(map_size > 1);
+
+ if (map_enum_do(map, map_size, (int *) opt, arg))
+ return OK;
+
+ if (parse_bool(&is_true, arg) != OK)
+ return ERR;
+
+ *opt = is_true ? map[1].value : map[0].value;
+ return OK;
+}
+
+#define parse_enum(opt, arg, map) \
+ parse_enum_do(opt, arg, map, ARRAY_SIZE(map))
+
static int
parse_string(char *opt, const char *arg, size_t optsize)
{
}
if (!strcmp(argv[0], "show-author"))
- return parse_bool(&opt_author, argv[2]);
+ return parse_enum(&opt_author, argv[2], author_map);
if (!strcmp(argv[0], "show-date"))
- return parse_bool(&opt_date, argv[2]);
+ return parse_enum(&opt_date, argv[2], date_map);
if (!strcmp(argv[0], "show-rev-graph"))
return parse_bool(&opt_rev_graph, argv[2]);
option_bind_command(int argc, const char *argv[])
{
enum request request;
- int keymap;
+ int keymap = -1;
int key;
if (argc < 3) {
return ERR;
}
- if (set_keymap(&keymap, argv[0]) == ERR) {
+ if (!set_keymap(&keymap, argv[0])) {
config_msg = "Unknown key map";
return ERR;
}
}
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),
return ERR;
}
}
- if (request == REQ_NONE && *argv[2]++ == '!')
+ if (request == REQ_UNKNOWN && *argv[2]++ == '!')
request = add_run_request(keymap, key, argc - 2, argv + 2);
- if (request == REQ_NONE) {
+ if (request == REQ_UNKNOWN) {
config_msg = "Unknown request name";
return ERR;
}
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;
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);
}
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;
}
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} */
/* 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 */
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;
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),
};
#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++)
#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]);
+}
-enum line_graphic {
- LINE_GRAPHIC_VLINE
-};
-static chtype line_graphics[] = {
- /* LINE_GRAPHIC_VLINE: */ '|'
-};
+/*
+ * View drawing.
+ */
static inline void
set_view_attr(struct view *view, enum line_type type)
{
if (!view->curline->selected && view->curtype != type) {
- wattrset(view->win, get_line_attr(type));
+ (void) wattrset(view->win, get_line_attr(type));
wchgat(view->win, -1, 0, type, NULL);
view->curtype = type;
}
draw_chars(struct view *view, enum line_type type, const char *string,
int max_len, bool use_tilde)
{
+ static char out_buffer[BUFSIZ * 2];
int len = 0;
int col = 0;
int trimmed = FALSE;
if (max_len <= 0)
return 0;
- if (opt_utf8) {
- len = utf8_length(&string, skip, &col, max_len, &trimmed, use_tilde);
- } else {
- col = len = strlen(string);
- if (len > max_len) {
- if (use_tilde) {
- max_len -= 1;
+ len = utf8_length(&string, skip, &col, max_len, &trimmed, use_tilde, opt_tab_size);
+
+ set_view_attr(view, type);
+ if (len > 0) {
+ if (opt_iconv_out != ICONV_NONE) {
+ ICONV_CONST char *inbuf = (ICONV_CONST char *) string;
+ size_t inlen = len + 1;
+
+ char *outbuf = out_buffer;
+ size_t outlen = sizeof(out_buffer);
+
+ size_t ret;
+
+ ret = iconv(opt_iconv_out, &inbuf, &inlen, &outbuf, &outlen);
+ if (ret != (size_t) -1) {
+ string = out_buffer;
+ len = sizeof(out_buffer) - outlen;
}
- col = len = max_len;
- trimmed = TRUE;
}
- }
- set_view_attr(view, type);
- if (len > 0)
waddnstr(view->win, string, len);
+ }
if (trimmed && use_tilde) {
set_view_attr(view, LINE_DELIMITER);
waddch(view->win, '~');
@@ -2024,35 +2452,22 @@ draw_field(struct view *view, enum line_type type, const char *text, int len, bo
}
static bool
-draw_date(struct view *view, time_t *time)
+draw_date(struct view *view, struct time *time)
{
- const char *date = mkdate(time);
+ const char *date = mkdate(time, opt_date);
+ int cols = opt_date == DATE_SHORT ? DATE_SHORT_COLS : DATE_COLS;
- return draw_field(view, LINE_DATE, date, DATE_COLS, FALSE);
+ return draw_field(view, LINE_DATE, date, cols, FALSE);
}
static bool
draw_author(struct view *view, const char *author)
{
- bool trim = opt_author_cols == 0 || opt_author_cols > 5 || !author;
-
- if (!trim) {
- static char initials[10];
- size_t pos;
+ bool trim = opt_author_cols == 0 || opt_author_cols > 5;
+ bool abbreviate = opt_author == AUTHOR_ABBREVIATED || !trim;
-#define is_initial_sep(c) (isspace(c) || ispunct(c) || (c) == '@')
-
- memset(initials, 0, sizeof(initials));
- for (pos = 0; *author && pos < opt_author_cols - 1; author++, pos++) {
- while (is_initial_sep(*author))
- author++;
- strncpy(&initials[pos], author, sizeof(initials) - 1 - pos);
- while (*author && !is_initial_sep(author[1]))
- author++;
- }
-
- author = initials;
- }
+ if (abbreviate && author)
+ author = get_author_initials(author);
return draw_field(view, LINE_AUTHOR, author, opt_author_cols, trim);
}
int digits3 = view->digits < 3 ? 3 : view->digits;
int max = MIN(view->width + view->yoffset - view->col, digits3);
char *text = NULL;
+ chtype separator = opt_line_graphics ? ACS_VLINE : '|';
lineno += view->offset + 1;
if (lineno == 1 || (lineno % opt_num_interval) == 0) {
view->col += draw_chars(view, LINE_LINE_NUMBER, text, max, TRUE);
else
view->col += draw_space(view, LINE_LINE_NUMBER, max, digits3);
- return draw_graphic(view, LINE_DEFAULT, &line_graphics[LINE_GRAPHIC_VLINE], 1);
+ return draw_graphic(view, LINE_DEFAULT, &separator, 1);
}
static bool
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
}
}
+
+/*
+ * Option management
+ */
+
+static void
+toggle_enum_option_do(unsigned int *opt, const char *help,
+ const struct enum_map *map, size_t size)
+{
+ *opt = (*opt + 1) % size;
+ redraw_display(FALSE);
+ report("Displaying %s %s", enum_name(map[*opt]), help);
+}
+
+#define toggle_enum_option(opt, help, map) \
+ toggle_enum_option_do(opt, help, map, ARRAY_SIZE(map))
+
+#define toggle_date() toggle_enum_option(&opt_date, "dates", date_map)
+#define toggle_author() toggle_enum_option(&opt_author, "author names", author_map)
+
static void
toggle_view_option(bool *option, const char *help)
{
};
int selected = 0;
- if (prompt_menu("Toggle option", menu, &selected))
- toggle_view_option(menu[selected].data, menu[selected].text);
+ if (prompt_menu("Toggle option", menu, &selected)) {
+ if (menu[selected].data == &opt_date)
+ toggle_date();
+ else if (menu[selected].data == &opt_author)
+ toggle_author();
+ else
+ toggle_view_option(menu[selected].data, menu[selected].text);
+ }
}
static void
view->update_secs = 0;
}
-static void
-free_argv(const char *argv[])
+static const char *
+format_arg(const char *name)
{
- int argc;
+ static struct {
+ const char *name;
+ size_t namelen;
+ const char *value;
+ const char *value_if_empty;
+ } vars[] = {
+#define FORMAT_VAR(name, value, value_if_empty) \
+ { name, STRING_SIZE(name), value, value_if_empty }
+ FORMAT_VAR("%(directory)", opt_path, ""),
+ FORMAT_VAR("%(file)", opt_file, ""),
+ FORMAT_VAR("%(ref)", opt_ref, "HEAD"),
+ FORMAT_VAR("%(head)", ref_head, ""),
+ FORMAT_VAR("%(commit)", ref_commit, ""),
+ FORMAT_VAR("%(blob)", ref_blob, ""),
+ FORMAT_VAR("%(branch)", ref_branch, ""),
+ };
+ int i;
- for (argc = 0; argv[argc]; argc++)
- free((void *) argv[argc]);
+ for (i = 0; i < ARRAY_SIZE(vars); i++)
+ 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
@@ -2723,7 +3185,7 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
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];
@@ -2735,32 +3197,15 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
const char *value;
if (!next || noreplace) {
- if (flags == FORMAT_DASH && !strcmp(arg, "--"))
- noreplace = TRUE;
len = strlen(arg);
value = "";
- } else if (!prefixcmp(next, "%(directory)")) {
- value = opt_path;
-
- } else if (!prefixcmp(next, "%(file)")) {
- value = opt_file;
-
- } else if (!prefixcmp(next, "%(ref)")) {
- value = *opt_ref ? opt_ref : "HEAD";
-
- } else if (!prefixcmp(next, "%(head)")) {
- value = ref_head;
-
- } else if (!prefixcmp(next, "%(commit)")) {
- value = ref_commit;
-
- } else if (!prefixcmp(next, "%(blob)")) {
- value = ref_blob;
-
} else {
- report("Unknown replacement: `%s`", next);
- return FALSE;
+ value = format_arg(next);
+
+ if (!value) {
+ return FALSE;
+ }
}
if (!string_format_from(buf, &bufpos, "%.*s%s", len, arg, value))
while (!view->ops->read(view, NULL))
if (!force)
return;
- set_nonblocking_input(FALSE);
if (force)
- kill_io(view->pipe);
- done_io(view->pipe);
+ io_kill(view->pipe);
+ io_done(view->pipe);
view->pipe = NULL;
}
static void
setup_update(struct view *view, const char *vid)
{
- set_nonblocking_input(TRUE);
reset_view(view);
string_copy_rev(view->vid, vid);
view->pipe = &view->io;
}
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)
+{
+ io_init(&view->io, dir, IO_RD);
+ return format_argv(view->io.argv, argv, replace ? FORMAT_ALL : FORMAT_NONE);
+}
+
+static bool
+prepare_update(struct view *view, const char *argv[], const char *dir)
{
if (view->pipe)
end_update(view, TRUE);
- return init_io_rd(&view->io, argv, dir, 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_start(&view->io);
}
static bool
{
if (view->pipe)
end_update(view, TRUE);
- return io_open(&view->io, name);
+ return io_open(&view->io, "%s/%s", opt_cdup[0] ? opt_cdup : ".", name);
}
static bool
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 (!prepare_io(view, NULL, view->ops->argv, TRUE)) {
return FALSE;
+ }
/* Put the current ref_* value to the view title ref
* member. This is needed by the blob view. Most other
string_copy_rev(view->ref, view->id);
}
+ if (!io_start(&view->io))
+ return FALSE;
+
setup_update(view, view->id);
return TRUE;
}
for (; (line = io_get(view->pipe, '\n', can_read)); can_read = FALSE) {
- if (opt_iconv != ICONV_NONE) {
+ if (opt_iconv_in != ICONV_NONE) {
ICONV_CONST char *inbuf = line;
size_t inlen = strlen(line) + 1;
size_t ret;
- ret = iconv(opt_iconv, &inbuf, &inlen, &outbuf, &outlen);
+ ret = iconv(opt_iconv_in, &inbuf, &inlen, &outbuf, &outlen);
if (ret != (size_t) -1)
line = out_buffer;
}
/* 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;
}
}
end_update(view, TRUE);
} else if (io_eof(view->pipe)) {
- report("");
+ if (view_is_displayed(view))
+ report("");
end_update(view, FALSE);
}
if (split) {
display[1] = view;
current_view = 1;
+ view->parent = prev;
} else if (!nomaximize) {
/* Maximize the current view. */
memset(display, 0, sizeof(display));
display[current_view] = view;
}
+ /* No prev signals that this is the first loaded view. */
+ if (prev && view != prev) {
+ 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() ||
do_scroll_view(prev, lines);
}
- if (prev && view != prev) {
- if (split) {
- /* "Blur" the previous view. */
- update_view_title(prev);
- }
-
- view->parent = prev;
+ if (prev && view != prev && split && view_is_displayed(prev)) {
+ /* "Blur" the previous view. */
+ update_view_title(prev);
}
if (view->pipe && view->lines == 0) {
{
def_prog_mode(); /* save current tty modes */
endwin(); /* restore original tty modes */
- run_io_fg(argv, dir);
+ io_run_fg(argv, dir);
fprintf(stderr, "Press Enter to continue");
getc(opt_tty);
reset_prog_mode();
}
static void
-open_editor(bool from_root, const char *file)
+open_editor(const char *file)
{
const char *editor_argv[] = { "vi", file, NULL };
const char *editor;
editor = "vi";
editor_argv[0] = editor;
- open_external_viewer(editor_argv, from_root ? opt_cdup : NULL);
+ open_external_viewer(editor_argv, opt_cdup);
}
static void
if (format_argv(argv, req->argv, FORMAT_ALL))
open_external_viewer(argv, NULL);
- free_argv(argv);
+ argv_free(argv);
}
/*
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:
case REQ_VIEW_BLAME:
if (!opt_file[0]) {
report("No file chosen, press %s to open tree view",
- get_key(REQ_VIEW_TREE));
+ get_key(view->keymap, REQ_VIEW_TREE));
break;
}
open_view(view, request, OPEN_DEFAULT);
case REQ_VIEW_BLOB:
if (!ref_blob[0]) {
report("No file chosen, press %s to open tree view",
- get_key(REQ_VIEW_TREE));
+ get_key(view->keymap, REQ_VIEW_TREE));
break;
}
open_view(view, request, OPEN_DEFAULT);
case REQ_VIEW_PAGER:
if (!VIEW(REQ_VIEW_PAGER)->pipe && !VIEW(REQ_VIEW_PAGER)->lines) {
report("No pager content, press %s to run command from prompt",
- get_key(REQ_PROMPT));
+ get_key(view->keymap, REQ_PROMPT));
break;
}
open_view(view, request, OPEN_DEFAULT);
case REQ_VIEW_STAGE:
if (!VIEW(REQ_VIEW_STAGE)->lines) {
report("No stage content, press %s to open the status view and choose file",
- get_key(REQ_VIEW_STATUS));
+ get_key(view->keymap, REQ_VIEW_STATUS));
break;
}
open_view(view, request, OPEN_DEFAULT);
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;
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);
}
break;
case REQ_TOGGLE_DATE:
- toggle_view_option(&opt_date, "date display");
+ toggle_date();
break;
case REQ_TOGGLE_AUTHOR:
- toggle_view_option(&opt_author, "author display");
+ toggle_author();
break;
case REQ_TOGGLE_REV_GRAPH:
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);
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 */
return FALSE;
default:
- report("Unknown key, press 'h' for help");
+ report("Unknown key, press %s for help",
+ get_key(view->keymap, REQ_VIEW_HELP));
return TRUE;
}
}
static void
-parse_timezone(time_t *time, const char *zone)
+parse_timesec(struct time *time, const char *sec)
+{
+ time->sec = (time_t) atol(sec);
+}
+
+static void
+parse_timezone(struct time *time, const char *zone)
{
long tz;
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;
- *time -= tz;
+ time->tz = tz;
+ time->sec -= tz;
}
/* Parse author lines where the name may be empty:
* author <email@address.tld> 1138474660 +0100
*/
static void
-parse_author_line(char *ident, const char **author, time_t *time)
+parse_author_line(char *ident, const char **author, struct time *time)
{
char *nameend = strchr(ident, '<');
char *emailend = strchr(ident, '>');
char *secs = emailend + 2;
char *zone = strchr(secs, ' ');
- *time = (time_t) atol(secs);
+ parse_timesec(time, secs);
if (zone && strlen(zone) == STRING_SIZE(" +0700"))
parse_timezone(time, zone + 1);
for (i = 0; i < *parents; i++) {
string_copy_rev(rev, &buf[SIZEOF_REV * i]);
- if (!run_io_buf(revlist_argv, text, sizeof(text)) ||
+ if (!io_run_buf(revlist_argv, text, sizeof(text)) ||
!(items[i].text = strdup(text))) {
ok = FALSE;
break;
};
int parents;
- if (!run_io_buf(revlist_argv, buf, sizeof(buf)) ||
+ if (!io_run_buf(revlist_argv, buf, sizeof(buf)) ||
(parents = strlen(buf) / 40) < 0) {
report("Failed to get parent information");
return FALSE;
return FALSE;
}
- if (parents > 1 && !open_commit_parent_menu(buf, &parents))
+ if (parents == 1)
+ parents = 0;
+ else if (!open_commit_parent_menu(buf, &parents))
return FALSE;
string_copy_rev(rev, &buf[41 * parents]);
@@ -3613,7 +4062,7 @@ add_describe_ref(char *buf, size_t *bufpos, const char *commit_id, const char *s
const char *describe_argv[] = { "git", "describe", commit_id, NULL };
char ref[SIZEOF_STR];
- if (!run_io_buf(describe_argv, ref, sizeof(ref)) || !*ref)
+ if (!io_run_buf(describe_argv, ref, sizeof(ref)) || !*ref)
return TRUE;
/* This is the only fatal call, since it can "corrupt" the buffer. */
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;
}
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))
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;
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;
}
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);
}
* Help backend
*/
+static bool help_keymap_hidden[ARRAY_SIZE(keymap_table)];
+
static bool
-help_open(struct view *view)
+help_open_keymap_title(struct view *view, enum keymap keymap)
+{
+ struct line *line;
+
+ line = add_line_format(view, LINE_HELP_KEYMAP, "[%c] %s bindings",
+ help_keymap_hidden[keymap] ? '+' : '-',
+ enum_name(keymap_table[keymap]));
+ if (line)
+ line->other = keymap;
+
+ return help_keymap_hidden[keymap];
+}
+
+static void
+help_open_keymap(struct view *view, enum keymap keymap)
{
+ const char *group = NULL;
char buf[SIZEOF_STR];
size_t bufpos;
+ bool add_title = TRUE;
int i;
- if (view->lines > 0)
- return TRUE;
-
- add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
-
for (i = 0; i < ARRAY_SIZE(req_info); i++) {
- const char *key;
+ const char *key = NULL;
if (req_info[i].request == REQ_NONE)
continue;
if (!req_info[i].request) {
- add_line_text(view, "", LINE_DEFAULT);
- add_line_text(view, req_info[i].help, LINE_DEFAULT);
+ group = req_info[i].help;
continue;
}
- key = get_key(req_info[i].request);
- if (!*key)
- key = "(no key defined)";
+ key = get_keys(keymap, req_info[i].request, TRUE);
+ if (!key || !*key)
+ continue;
+
+ if (add_title && help_open_keymap_title(view, keymap))
+ return;
+ add_title = FALSE;
- for (bufpos = 0; bufpos <= req_info[i].namelen; bufpos++) {
- buf[bufpos] = tolower(req_info[i].name[bufpos]);
- if (buf[bufpos] == '_')
- buf[bufpos] = '-';
+ if (group) {
+ add_line_text(view, group, LINE_HELP_GROUP);
+ group = NULL;
}
- add_line_format(view, LINE_DEFAULT, " %-25s %-20s %s",
- key, buf, req_info[i].help);
+ add_line_format(view, LINE_DEFAULT, " %-25s %-20s %s", key,
+ enum_name(req_info[i]), req_info[i].help);
}
- if (run_requests) {
- add_line_text(view, "", LINE_DEFAULT);
- add_line_text(view, "External commands:", LINE_DEFAULT);
- }
+ group = "External commands:";
for (i = 0; i < run_requests; i++) {
struct run_request *req = get_run_request(REQ_NONE + i + 1);
const char *key;
int argc;
- if (!req)
+ if (!req || req->keymap != keymap)
continue;
key = get_key_name(req->key);
if (!*key)
key = "(no key defined)";
+ if (add_title && help_open_keymap_title(view, keymap))
+ return;
+ if (group) {
+ add_line_text(view, group, LINE_HELP_GROUP);
+ group = NULL;
+ }
+
for (bufpos = 0, argc = 0; req->argv[argc]; argc++)
if (!string_format_from(buf, &bufpos, "%s%s",
argc ? " " : "", req->argv[argc]))
- return REQ_NONE;
+ return;
- add_line_format(view, LINE_DEFAULT, " %-10s %-14s `%s`",
- keymap_table[req->keymap].name, key, buf);
+ add_line_format(view, LINE_DEFAULT, " %-25s `%s`", key, buf);
}
+}
+
+static bool
+help_open(struct view *view)
+{
+ enum keymap keymap;
+
+ reset_view(view);
+ add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
+ add_line_text(view, "", LINE_DEFAULT);
+
+ for (keymap = 0; keymap < ARRAY_SIZE(keymap_table); keymap++)
+ help_open_keymap(view, keymap);
return TRUE;
}
+static enum request
+help_request(struct view *view, enum request request, struct line *line)
+{
+ switch (request) {
+ case REQ_ENTER:
+ 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);
+ }
+
+ return REQ_NONE;
+ default:
+ return pager_request(view, request, line);
+ }
+}
+
static struct view_ops help_ops = {
"line",
NULL,
help_open,
NULL,
pager_draw,
- pager_request,
+ help_request,
pager_grep,
pager_select,
};
struct tree_entry {
char id[SIZEOF_REV];
mode_t mode;
- time_t time; /* Date from the author ident. */
+ struct time time; /* Date from the author ident. */
const char *author; /* Author of the commit. */
char name[1];
};
switch (get_sort_field(tree_sort_state)) {
case ORDERBY_DATE:
- return sort_order(tree_sort_state, entry1->time - entry2->time);
+ return sort_order(tree_sort_state, timecmp(&entry1->time, &entry2->time));
case ORDERBY_AUTHOR:
return sort_order(tree_sort_state, strcmp(entry1->author, entry2->author));
tree_read_date(struct view *view, char *text, bool *read_date)
{
static const char *author_name;
- static time_t author_time;
+ static struct time author_time;
if (!text && *read_date) {
*read_date = FALSE;
"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);
return TRUE;
}
- if (!run_io_rd(&io, log_file, FORMAT_NONE)) {
+ if (!start_update(view, log_file, opt_cdup)) {
report("Failed to load tree data");
return TRUE;
}
- done_io(view->pipe);
- view->io = io;
*read_date = TRUE;
return FALSE;
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, '/');
}
if (annotated == view->lines)
- kill_io(view->pipe);
+ io_kill(view->pipe);
}
return TRUE;
}
if (opt_author && draw_author(view, entry->author))
return TRUE;
- if (opt_date && draw_date(view, entry->author ? &entry->time : NULL))
+ if (opt_date && draw_date(view, &entry->time))
return TRUE;
}
if (draw_text(view, line->type, entry->name, TRUE))
}
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 (!run_io_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(FALSE, file);
+ open_editor(file);
if (fd != -1)
unlink(file);
}
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:
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(TRUE, opt_file);
+ open_editor(opt_file);
}
return REQ_NONE;
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;
const char *text[] = {
entry->name,
opt_author ? entry->author : "",
- opt_date ? mkdate(&entry->time) : "",
+ mkdate(&entry->time, opt_date),
NULL
};
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 prepare_io(view, opt_cdup, view->ops->argv, TRUE);
+}
+
static const char *tree_argv[SIZEOF_ARG] = {
"git", "ls-tree", "%(commit)", "%(directory)", NULL
};
tree_request,
tree_grep,
tree_select,
+ tree_prepare,
};
static bool
{
switch (request) {
case REQ_EDIT:
- open_blob_editor();
+ open_blob_editor(view->vid);
return REQ_NONE;
default:
return pager_request(view, request, line);
* 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. */
- time_t time; /* Date from the author ident. */
+ struct time time; /* Date from the author ident. */
char filename[128]; /* Name of file. */
bool has_previous; /* Was a "previous" line detected. */
};
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->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)) {
+ 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;
}
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 || !run_io_rd(&io, argv, FORMAT_ALL)) {
+ if (view->lines == 0 || !start_update(view, blame_argv, opt_cdup)) {
report("Failed to load blame data");
return TRUE;
}
- done_io(view->pipe);
- view->io = io;
*read_file = FALSE;
return FALSE;
commit->author = get_author(line);
} else if (match_blame_header("author-time ", &line)) {
- commit->time = (time_t) atol(line);
+ parse_timesec(&commit->time, line);
} else if (match_blame_header("author-tz ", &line)) {
parse_timezone(&commit->time, line);
blame_draw(struct view *view, struct line *line, unsigned int lineno)
{
struct blame *blame = line->data;
- time_t *time = NULL;
+ struct time *time = NULL;
const char *id = NULL, *author = NULL;
char text[SIZEOF_STR];
int blamed_lineno = -1;
char *line;
- if (!run_io(&io, diff_tree_argv, NULL, IO_RD))
+ if (!io_run(&io, diff_tree_argv, NULL, IO_RD))
return;
while ((line = io_get(&io, '\n', TRUE))) {
}
}
- done_io(&io);
+ io_done(&io);
}
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) {
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;
}
commit ? commit->title : "",
commit ? commit->id : "",
commit && opt_author ? commit->author : "",
- commit && opt_date ? mkdate(&commit->time) : "",
+ commit ? mkdate(&commit->time, opt_date) : "",
NULL
};
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. */
+ struct time time; /* Date of the last activity. */
+ const struct ref *ref; /* Name and commit ID information. */
};
+static const struct ref branch_all;
+
static const enum sort_field branch_sort_fields[] = {
ORDERBY_NAME, ORDERBY_DATE, ORDERBY_AUTHOR
};
switch (get_sort_field(branch_sort_state)) {
case ORDERBY_DATE:
- return sort_order(branch_sort_state, branch1->time - branch2->time);
+ return sort_order(branch_sort_state, timecmp(&branch1->time, &branch2->time));
case ORDERBY_AUTHOR:
return sort_order(branch_sort_state, strcmp(branch1->author, branch2->author));
struct branch *branch = line->data;
enum line_type type = branch->ref->head ? LINE_MAIN_HEAD : LINE_DEFAULT;
- if (opt_date && draw_date(view, branch->author ? &branch->time : NULL))
+ if (opt_date && draw_date(view, &branch->time))
return TRUE;
if (opt_author && draw_author(view, branch->author))
return TRUE;
- draw_text(view, type, branch->ref->name, TRUE);
+ draw_text(view, type, branch->ref == &branch_all ? "All branches" : branch->ref->name, TRUE);
return TRUE;
}
static enum request
branch_request(struct view *view, enum request request, struct line *line)
{
+ struct branch *branch = line->data;
+
switch (request) {
case REQ_REFRESH:
load_refs();
return REQ_NONE;
case REQ_ENTER:
- open_view(view, REQ_VIEW_MAIN, OPEN_SPLIT);
+ 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);
+
+ if (!prepare_update(main_view, all_branches_argv, NULL)) {
+ report("Failed to load view of all branches");
+ return REQ_NONE;
+ }
+ open_view(view, REQ_VIEW_MAIN, OPEN_PREPARED | OPEN_SPLIT);
+ } else {
+ open_view(view, REQ_VIEW_MAIN, OPEN_SPLIT);
+ }
return REQ_NONE;
default:
}
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;
"--simplify-by-decoration", "--all", NULL
};
- if (!run_io_rd(&view->io, branch_log, FORMAT_NONE)) {
+ if (!start_update(view, branch_log, NULL)) {
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;
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 = {
@@ -5026,7 +5569,7 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty
char *buf;
struct io io = {};
- if (!run_io(&io, argv, NULL, IO_RD))
+ if (!io_run(&io, argv, opt_cdup, IO_RD))
return FALSE;
add_line_data(view, NULL, type);
@@ -5085,14 +5628,14 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty
if (io_error(&io)) {
error_out:
- done_io(&io);
+ io_done(&io);
return FALSE;
}
if (!view->line[view->lines - 1].data)
add_line_data(view, NULL, LINE_STAT_NONE);
- done_io(&io);
+ io_done(&io);
return TRUE;
}
};
static const char *status_list_other_argv[] = {
- "git", "ls-files", "-z", "--others", "--exclude-standard", NULL
+ "git", "ls-files", "-z", "--others", "--exclude-standard", opt_prefix, NULL
};
static const char *status_list_no_head_argv[] = {
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/"))
add_line_data(view, NULL, LINE_STAT_HEAD);
status_update_onbranch();
- run_io_bg(update_index_argv);
+ io_run_bg(update_index_argv);
if (is_initial_commit()) {
if (!status_run(view, status_list_no_head_argv, 'A', LINE_STAT_STAGED))
"--", "/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[] = {
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);
}
"-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";
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) {
switch (type) {
case LINE_STAT_STAGED:
- return run_io(io, staged_argv, opt_cdup, IO_WR);
+ return io_run(io, staged_argv, opt_cdup, IO_WR);
case LINE_STAT_UNSTAGED:
- return run_io(io, others_argv, opt_cdup, IO_WR);
-
case LINE_STAT_UNTRACKED:
- return run_io(io, others_argv, NULL, IO_WR);
+ return io_run(io, others_argv, opt_cdup, IO_WR);
default:
die("line type %d not handled in switch", type);
return FALSE;
result = status_update_write(&io, status, type);
- return done_io(&io) && result;
+ return io_done(&io) && result;
}
static bool
struct line *pos = view->line + view->lines;
int files = 0;
int file, done;
- int cursor_y, cursor_x;
+ int cursor_y = -1, cursor_x = -1;
if (!status_update_prepare(&io, line->type))
return FALSE;
}
string_copy(view->ref, buf);
- return done_io(&io) && result;
+ return io_done(&io) && result;
}
static bool
} 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,
"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 (!io_run_fg(reset_argv, opt_cdup))
+ return FALSE;
+ if (status->old.mode == 0 && status->new.mode == 0)
+ return TRUE;
+ }
+
+ return io_run_fg(checkout_argv, opt_cdup);
}
+
+ return FALSE;
}
static enum request
return REQ_NONE;
}
- open_editor(status->status != '?', status->new.name);
+ open_editor(status->new.name);
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:
if (status && status->status == 'U') {
text = "Press %s to resolve conflict in %s";
- key = get_key(REQ_STATUS_MERGE);
+ key = get_key(KEYMAP_STATUS, REQ_STATUS_MERGE);
} else {
- key = get_key(REQ_STATUS_UPDATE);
+ key = get_key(KEYMAP_STATUS, REQ_STATUS_UPDATE);
}
string_format(view->ref, text, key, file);
+ if (status)
+ string_copy(opt_file, status->new.name);
}
static bool
apply_argv[argc++] = "-R";
apply_argv[argc++] = "-";
apply_argv[argc++] = NULL;
- if (!run_io(&io, apply_argv, opt_cdup, IO_WR))
+ if (!io_run(&io, apply_argv, opt_cdup, IO_WR))
return FALSE;
if (!stage_diff_write(&io, diff_hdr, chunk) ||
!stage_diff_write(&io, chunk, view->line + view->lines))
chunk = NULL;
- done_io(&io);
- run_io_bg(update_index_argv);
+ io_done(&io);
+ io_run_bg(update_index_argv);
return chunk ? TRUE : FALSE;
}
case REQ_STAGE_NEXT:
if (stage_line_type == LINE_STAT_UNTRACKED) {
report("File is untracked; press %s to add",
- get_key(REQ_STATUS_UPDATE));
+ get_key(KEYMAP_STAGE, REQ_STATUS_UPDATE));
return REQ_NONE;
}
stage_next(view, line);
return REQ_NONE;
}
- open_editor(stage_status.status != '?', stage_status.new.name);
+ open_editor(stage_status.new.name);
break;
case REQ_REFRESH:
char id[SIZEOF_REV]; /* SHA1 ID. */
char title[128]; /* First line of the commit message. */
const char *author; /* Author of the commit. */
- time_t time; /* Date from the author ident. */
+ struct time time; /* Date from the author ident. */
struct ref_list *refs; /* Repository references. */
chtype graph[SIZEOF_REVGRAPH]; /* Ancestry chain graphics. */
size_t graph_size; /* The width of the graph array. */
struct rev_filler *filler;
size_t i;
- if (opt_line_graphics)
- fillers[DEFAULT].line = line_graphics[LINE_GRAPHIC_VLINE];
-
+ fillers[DEFAULT].line = opt_line_graphics ? ACS_VLINE : '|';
filler = &fillers[DEFAULT];
for (i = 0; i < graph->pos; i++) {
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;
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:
const char *text[] = {
commit->title,
opt_author ? commit->author : "",
- opt_date ? mkdate(&commit->time) : "",
+ mkdate(&commit->time, opt_date),
NULL
};
};
-/*
- * 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)
-{
- 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 opt_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,
-};
-
-/* 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)
-{
- 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) {
- int c = *(unsigned char *) string;
- unsigned char bytes = utf8_bytes[c];
- 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);
- 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
*/
update_view_title(view);
}
-/* Controls when nodelay should be in effect when polling user input. */
-static void
-set_nonblocking_input(bool loading)
-{
- static unsigned int loading_views;
-
- if ((loading == FALSE && loading_views-- == 1) ||
- (loading == TRUE && loading_views++ == 0))
- nodelay(status_win, loading);
-}
-
static void
init_display(void)
{
wbkgdset(status_win, get_line_attr(LINE_STATUS));
TABSIZE = opt_tab_size;
- if (opt_line_graphics) {
- line_graphics[LINE_GRAPHIC_VLINE] = ACS_VLINE;
- }
term = getenv("XTERM_VERSION") ? NULL : getenv("COLORTERM");
if (term && !strcmp(term, "gnome-terminal")) {
{
struct view *view;
int i, key, cursor_y, cursor_x;
+ bool loading = FALSE;
if (prompt_position)
input_mode = TRUE;
use_scroll_redrawwin)
redrawwin(view->win);
view->has_scrolled = FALSE;
+ if (view->pipe)
+ loading = TRUE;
}
/* Update the cursor position. */
/* Refresh, accept single keystroke of input */
doupdate();
+ nodelay(status_win, loading);
key = wgetch(status_win);
/* wgetch() with nodelay() enabled returns ERR when
@@ -6907,6 +7294,7 @@ static bool prompt_menu(const char *prompt, const struct menu_item *items, int *
static struct ref **refs = NULL;
static size_t refs_size = 0;
+static struct ref *refs_head = NULL;
static struct ref_list **ref_lists = NULL;
static size_t ref_lists_size = 0;
}
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;
break;
}
+static struct ref *
+get_ref_head()
+{
+ return refs_head;
+}
+
static struct ref_list *
get_ref_list(const char *id)
{
} else if (!prefixcmp(name, "refs/heads/")) {
namelen -= STRING_SIZE("refs/heads/");
name += STRING_SIZE("refs/heads/");
- head = !strncmp(opt_head, name, namelen);
+ if (!strncmp(opt_head, name, namelen))
+ return OK;
} else if (!strcmp(name, "HEAD")) {
- string_ncopy(opt_head_rev, id, idlen);
- return OK;
+ head = TRUE;
+ if (*opt_head) {
+ namelen = strlen(opt_head);
+ name = opt_head;
+ }
}
/* If we are reloading or it's an annotated tag, replace the
ref->tracked = tracked;
string_copy_rev(ref->id, id);
+ if (head)
+ refs_head = ref;
return OK;
}
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;
}
if (!*opt_git_dir)
return OK;
- if (run_io_buf(head_argv, opt_head, sizeof(opt_head)) &&
+ if (io_run_buf(head_argv, opt_head, sizeof(opt_head)) &&
!prefixcmp(opt_head, "refs/heads/")) {
char *offset = opt_head + STRING_SIZE("refs/heads/");
memmove(opt_head, offset, strlen(offset) + 1);
}
+ refs_head = NULL;
for (i = 0; i < refs_size; i++)
refs[i]->id[0] = 0;
- if (run_io_load(ls_remote_argv, "\t", read_ref) == ERR)
+ if (io_run_load(ls_remote_argv, "\t", read_ref) == ERR)
return ERR;
/* Update the ref lists to reflect changes. */
@@ -7206,9 +7608,9 @@ 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);
+ return io_run_load(config_list_argv, "=", read_repo_config_option);
}
static int
"--show-cdup", "--show-prefix", NULL
};
- return run_io_load(rev_parse_argv, "=", read_repo_info);
+ return io_run_load(rev_parse_argv, "=", read_repo_info);
}
die("command too long");
}
- if (!prepare_update(VIEW(request), custom_argv, NULL, FORMAT_NONE))
- die("Failed to format arguments");
+ if (!prepare_update(VIEW(request), custom_argv, NULL))
+ die("Failed to format arguments");
return request;
}
int
main(int argc, const char *argv[])
{
+ const char *codeset = "UTF-8";
enum request request = parse_options(argc, argv);
struct view *view;
size_t i;
signal(SIGPIPE, SIG_IGN);
if (setlocale(LC_ALL, "")) {
- char *codeset = nl_langinfo(CODESET);
-
- string_ncopy(opt_codeset, codeset, strlen(codeset));
+ codeset = nl_langinfo(CODESET);
}
if (load_repo_info() == ERR)
if (!opt_git_dir[0] && request != REQ_VIEW_PAGER)
die("Not a git repository");
- if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
- opt_utf8 = FALSE;
+ if (*opt_encoding && strcmp(codeset, "UTF-8")) {
+ opt_iconv_in = iconv_open("UTF-8", opt_encoding);
+ if (opt_iconv_in == ICONV_NONE)
+ die("Failed to initialize character set conversion");
+ }
- if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) {
- opt_iconv = iconv_open(opt_codeset, opt_encoding);
- if (opt_iconv == ICONV_NONE)
+ if (codeset && strcmp(codeset, "UTF-8")) {
+ opt_iconv_out = iconv_open(codeset, "UTF-8");
+ if (opt_iconv_out == ICONV_NONE)
die("Failed to initialize character set conversion");
}
die("Failed to load refs.");
foreach_view (view, i)
- argv_from_env(view->ops->argv, 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();
/* 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(":");
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);