X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tig.c;h=ad77c95d038b61993a21f514549aa966748105e7;hb=c2c2839e98eb79c86012845c063680c3b8c8ecf0;hp=b4e4b596078919afdb620efb922590ab9f0e3620;hpb=eb4bb8906cf89c541dd754879e5742931c979689;p=tig.git diff --git a/tig.c b/tig.c index b4e4b59..c963977 100644 --- a/tig.c +++ b/tig.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2009 Jonas Fonseca +/* Copyright (c) 2006-2010 Jonas Fonseca * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -67,12 +68,10 @@ 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, int *width, size_t max_width, int *trimmed, bool reserve); -static int load_refs(void); #define ABS(x) ((x) >= 0 ? (x) : -(x)) #define MIN(x, y) ((x) < (y) ? (x) : (y)) +#define MAX(x, y) ((x) > (y) ? (x) : (y)) #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #define STRING_SIZE(x) (sizeof(x) - 1) @@ -103,72 +102,43 @@ static int load_refs(void); /* 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(height) ((height) * 2 / 3) +#define MIN_VIEW_HEIGHT 4 #define NULL_ID "0000000000000000000000000000000000000000" -#ifndef GIT_CONFIG -#define GIT_CONFIG "config" -#endif +#define S_ISGITLINK(mode) (((mode) & S_IFMT) == 0160000) -/* Some ascii-shorthands fitted into the ncurses namespace. */ +/* Some ASCII-shorthands fitted into the ncurses namespace. */ #define KEY_TAB '\t' #define KEY_RETURN '\r' #define KEY_ESC 27 struct ref { - char *name; /* Ref name; tag or head names are shortened. */ char id[SIZEOF_REV]; /* Commit SHA1 ID */ unsigned int head:1; /* Is it the current HEAD? */ unsigned int tag:1; /* Is it a tag? */ unsigned int ltag:1; /* If so, is the tag local? */ unsigned int remote:1; /* Is it a remote ref? */ unsigned int tracked:1; /* Is it the remote for the current HEAD? */ - unsigned int next:1; /* For ref lists: are there more refs? */ + char name[1]; /* Ref name; tag or head names are shortened. */ }; -static struct ref **get_refs(const char *id); - -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); - -struct int_map { - const char *name; - int namelen; - int value; +struct ref_list { + char id[SIZEOF_REV]; /* Commit SHA1 ID */ + size_t size; /* Number of refs. */ + struct ref **refs; /* References for this ID. */ }; -static int -set_from_int_map(struct int_map *map, size_t map_size, - int *value, const char *name, int namelen) -{ - - int i; - - for (i = 0; i < map_size; i++) - if (namelen == map[i].namelen && - !strncasecmp(name, map[i].name, namelen)) { - *value = map[i].value; - return OK; - } - - return ERR; -} +static struct ref *get_ref_head(); +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 input_status { INPUT_OK, @@ -182,6 +152,35 @@ typedef enum input_status (*input_handler)(void *data, char *buf, int c); static char *prompt_input(const char *prompt, input_handler handler, void *data); static bool prompt_yesno(const char *prompt); +struct menu_item { + int hotkey; + const char *text; + void *data; +}; + +static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected); + +/* + * Allocation helpers ... Entering macro hell to never be seen again. + */ + +#define DEFINE_ALLOCATOR(name, type, chunk_size) \ +static type * \ +name(type **mem, size_t size, size_t increase) \ +{ \ + size_t num_chunks = (size + chunk_size - 1) / chunk_size; \ + size_t num_chunks_new = (size + increase + chunk_size - 1) / chunk_size;\ + type *tmp = *mem; \ + \ + if (mem == NULL || num_chunks != num_chunks_new) { \ + tmp = realloc(tmp, num_chunks_new * chunk_size * sizeof(type)); \ + if (tmp) \ + *mem = tmp; \ + } \ + \ + return tmp; \ +} + /* * String helpers */ @@ -210,6 +209,27 @@ 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 +string_expand(char *dst, size_t dstlen, const char *src, int tabsize) +{ + size_t size, pos; + + for (size = pos = 0; size < dstlen - 1 && src[pos]; pos++) { + if (src[pos] == '\t') { + size_t expanded = tabsize - (size % tabsize); + + if (expanded + size >= dstlen - 1) + expanded = dstlen - size - 1; + memcpy(dst + size, " ", expanded); + size += expanded; + } else { + dst[size++] = src[pos]; + } + } + + dst[size] = 0; +} + static char * chomp_string(char *name) { @@ -269,6 +289,53 @@ string_enum_compare(const char *str1, const char *str2, int len) 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; + int value; +}; + +#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) +{ + size_t namelen = strlen(name); + int i; + + for (i = 0; i < map_size; i++) + if (enum_equals(map[i], name, namelen)) { + *value = map[i].value; + return TRUE; + } + + return FALSE; +} + +#define map_enum(attr, map, name) \ + map_enum_do(map, ARRAY_SIZE(map), attr, name) + #define prefixcmp(str1, str2) \ strncmp(str1, str2, STRING_SIZE(str2)) @@ -282,6 +349,299 @@ 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 . 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 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; + + 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) { @@ -300,7 +660,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; @@ -308,8 +668,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; } @@ -327,12 +738,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; /* Pipe for reading or writing. */ 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. */ @@ -341,55 +749,50 @@ struct io { }; static void -reset_io(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 -init_io(struct io *io, const char *dir, enum io_type type) -{ - reset_io(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) +io_open(struct io *io, const char *fmt, ...) { - init_io(io, dir, IO_RD); - return format_argv(io->argv, argv, flags); -} + char name[SIZEOF_STR] = ""; + bool fits; + va_list args; -static bool -io_open(struct io *io, const char *name) -{ - init_io(io, NULL, IO_FD); + io_init(io); + + 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; return io->pipe != -1; } 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_init(io); while (pid > 0) { int status; @@ -398,7 +801,7 @@ done_io(struct io *io) if (waiting < 0) { if (errno == EINTR) continue; - report("waitpid failed (%s)", strerror(errno)); + io->error = errno; return FALSE; } @@ -412,32 +815,37 @@ done_io(struct io *io) } static bool -start_io(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 (pipefds[!(io->type == IO_WR)] != -1) - close(pipefds[!(io->type == IO_WR)]); + if (io->pid == -1) + io->error = errno; + 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); @@ -451,72 +859,42 @@ start_io(struct io *io) close(pipefds[1]); } - if (io->dir && *io->dir && chdir(io->dir) == -1) - die("Failed to change directory: %s", strerror(errno)); + if (dir && *dir && chdir(dir) == -1) + exit(errno); - execvp(io->argv[0], (char *const*) io->argv); - die("Failed to execute program: %s", strerror(errno)); + 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 -run_io(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) { - init_io(io, dir, type); - if (!format_argv(io->argv, argv, FORMAT_NONE)) - return FALSE; - return start_io(io); -} - -static int -run_io_do(struct io *io) -{ - return start_io(io) && done_io(io); -} - -static int -run_io_bg(const char **argv) -{ - struct io io = {}; + struct io io; - init_io(&io, NULL, IO_BG); - if (!format_argv(io.argv, argv, FORMAT_NONE)) - return FALSE; - return run_io_do(&io); + return io_run(&io, type, dir, argv, fd) && 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, fd); } static bool @@ -531,7 +909,7 @@ io_error(struct io *io) return io->error; } -static bool +static char * io_strerror(struct io *io) { return strerror(io->error); @@ -565,20 +943,14 @@ io_read(struct io *io, void *buf, size_t bufsize) } while (1); } +DEFINE_ALLOCATOR(io_realloc_buf, char, BUFSIZ) + static char * io_get(struct io *io, int c, bool can_read) { char *eol; ssize_t readsize; - if (!io->buf) { - io->buf = io->bufpos = malloc(BUFSIZ); - if (!io->buf) - return NULL; - io->bufalloc = BUFSIZ; - io->bufsize = 0; - } - while (TRUE) { if (io->bufsize > 0) { eol = memchr(io->bufpos, c, io->bufsize); @@ -607,6 +979,12 @@ io_get(struct io *io, int c, bool can_read) if (io->bufsize > 0 && io->bufpos > io->buf) memmove(io->buf, io->bufpos, io->bufsize); + if (io->bufalloc == io->bufsize) { + if (!io_realloc_buf(&io->buf, io->bufalloc, BUFSIZ)) + return NULL; + io->bufalloc += BUFSIZ; + } + io->bufpos = io->buf; readsize = io_read(io, io->buf + io->bufsize, io->bufalloc - io->bufsize); if (io_error(io)) @@ -636,23 +1014,72 @@ io_write(struct io *io, const void *buf, size_t bufsize) } static bool -run_io_buf(const char **argv, char buf[], size_t bufsize) +io_read_buf(struct io *io, char buf[], size_t bufsize) { - struct io io = {}; - bool error; + char *result = io_get(io, '\n', TRUE); - if (!run_io_rd(&io, argv, FORMAT_NONE)) - return FALSE; + if (result) { + result = chomp_string(result); + string_ncopy_do(buf, bufsize, result, strlen(result)); + } + + return io_done(io) && result; +} + +static bool +io_run_buf(const char **argv, char buf[], size_t bufsize) +{ + struct io io; + + return io_run(&io, IO_RD, NULL, argv) && io_read_buf(&io, buf, bufsize); +} + +static int +io_load(struct io *io, const char *separators, + int (*read_property)(char *, size_t, char *, size_t)) +{ + char *name; + int state = OK; + + while (state == OK && (name = io_get(io, '\n', TRUE))) { + char *value; + size_t namelen; + size_t valuelen; + + name = chomp_string(name); + namelen = strcspn(name, separators); - io.buf = io.bufpos = buf; - io.bufalloc = bufsize; - error = !io_get(&io, '\n', TRUE) && io_error(&io); - io.buf = NULL; + if (name[namelen]) { + name[namelen] = 0; + value = chomp_string(name + namelen + 1); + valuelen = strlen(value); + + } else { + value = ""; + valuelen = 0; + } + + state = read_property(name, namelen, value, valuelen); + } - return done_io(&io) || error; + if (state != ERR && io_error(io)) + state = ERR; + io_done(io); + + return state; +} + +static int +io_run_load(const char **argv, const char *separators, + int (*read_property)(char *, size_t, char *, size_t)) +{ + struct io io; + + if (!io_run(&io, IO_RD, NULL, argv)) + return ERR; + return io_load(&io, separators, read_property); } -static int read_properties(struct io *io, const char *separators, int (*read)(char *, size_t, char *, size_t)); /* * User requests @@ -667,6 +1094,7 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch REQ_(VIEW_TREE, "Show tree view"), \ REQ_(VIEW_BLOB, "Show blob view"), \ REQ_(VIEW_BLAME, "Show blame view"), \ + REQ_(VIEW_BRANCH, "Show branch view"), \ REQ_(VIEW_HELP, "Show help page"), \ REQ_(VIEW_PAGER, "Show pager view"), \ REQ_(VIEW_STATUS, "Show status view"), \ @@ -698,6 +1126,8 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch REQ_(MOVE_LAST_LINE, "Move cursor to last line"), \ \ REQ_GROUP("Scrolling") \ + REQ_(SCROLL_LEFT, "Scroll two columns left"), \ + REQ_(SCROLL_RIGHT, "Scroll two columns right"), \ REQ_(SCROLL_LINE_UP, "Scroll one line up"), \ REQ_(SCROLL_LINE_DOWN, "Scroll one line down"), \ REQ_(SCROLL_PAGE_UP, "Scroll one page up"), \ @@ -710,11 +1140,15 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch REQ_(FIND_PREV, "Find previous search match"), \ \ REQ_GROUP("Option manipulation") \ + 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)"), \ + REQ_(TOGGLE_SORT_ORDER, "Toggle ascending/descending sort order"), \ + REQ_(TOGGLE_SORT_FIELD, "Toggle field to sort by"), \ \ REQ_GROUP("Misc") \ REQ_(PROMPT, "Bring up the prompt"), \ @@ -731,173 +1165,80 @@ 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 #undef REQ_ }; -struct request_info { - enum request request; - const char *name; - int namelen; - const char *help; -}; - -static struct request_info req_info[] = { -#define REQ_GROUP(help) { 0, NULL, 0, (help) }, -#define REQ_(req, help) { REQ_##req, (#req), STRING_SIZE(#req), (help) } - REQ_INFO -#undef REQ_GROUP -#undef REQ_ -}; - -static enum request -get_request(const char *name) -{ - int namelen = strlen(name); - 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)) - return req_info[i].request; - - return REQ_NONE; -} - - -/* - * Options - */ - -static const char usage[] = -"tig " TIG_VERSION " (" __DATE__ ")\n" -"\n" -"Usage: tig [options] [revs] [--] [paths]\n" -" or: tig show [options] [revs] [--] [paths]\n" -" or: tig blame [rev] path\n" -" or: tig status\n" -" or: tig < [git command output]\n" -"\n" -"Options:\n" -" -v, --version Show version and exit\n" -" -h, --help Show help message and exit"; - -/* Option and state variables. */ -static bool opt_date = TRUE; -static bool opt_author = TRUE; -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_tab_size = TAB_SIZE; -static int opt_author_cols = AUTHOR_COLS-1; -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 char opt_search[SIZEOF_STR] = ""; -static char opt_cdup[SIZEOF_STR] = ""; -static char opt_prefix[SIZEOF_STR] = ""; -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; - -#define is_initial_commit() (!*opt_head_rev) -#define is_head_commit(rev) (!strcmp((rev), "HEAD") || !strcmp(opt_head_rev, (rev))) - -static enum request -parse_options(int argc, const char *argv[], const char ***run_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. */ - static const char *custom_argv[SIZEOF_ARG] = { - "git", "log", "--no-color", "--pretty=raw", "--parents", - "--topo-order", NULL - }; - int i, j = 6; - - if (!isatty(STDIN_FILENO)) - return REQ_VIEW_PAGER; - - if (argc <= 1) - return REQ_VIEW_MAIN; - - subcommand = argv[1]; - if (!strcmp(subcommand, "status") || !strcmp(subcommand, "-S")) { - if (!strcmp(subcommand, "-S")) - warn("`-S' has been deprecated; use `tig status' instead"); - if (argc > 2) - warn("ignoring arguments after `%s'", subcommand); - return REQ_VIEW_STATUS; - - } else if (!strcmp(subcommand, "blame")) { - if (argc <= 2 || argc > 4) - die("invalid number of options to blame\n\n%s", usage); - - i = 2; - if (argc == 4) { - string_ncopy(opt_ref, argv[i], strlen(argv[i])); - i++; - } - - string_ncopy(opt_file, argv[i], strlen(argv[i])); - return REQ_VIEW_BLAME; - - } else if (!strcmp(subcommand, "show")) { - request = REQ_VIEW_DIFF; - - } else if (!strcmp(subcommand, "log") || !strcmp(subcommand, "diff")) { - request = subcommand[0] == 'l' ? REQ_VIEW_LOG : REQ_VIEW_DIFF; - warn("`tig %s' has been deprecated", subcommand); - - } else { - subcommand = NULL; - } +struct request_info { + enum request request; + const char *name; + int namelen; + const char *help; +}; - if (subcommand) { - custom_argv[1] = subcommand; - j = 2; - } +static const struct request_info req_info[] = { +#define REQ_GROUP(help) { 0, NULL, 0, (help) }, +#define REQ_(req, help) { REQ_##req, (#req), STRING_SIZE(#req), (help) } + REQ_INFO +#undef REQ_GROUP +#undef REQ_ +}; - for (i = 1 + !!subcommand; i < argc; i++) { - const char *opt = argv[i]; +static enum request +get_request(const char *name) +{ + int namelen = strlen(name); + int i; - if (seen_dashdash || !strcmp(opt, "--")) { - seen_dashdash = TRUE; + for (i = 0; i < ARRAY_SIZE(req_info); i++) + if (enum_equals(req_info[i], name, namelen)) + return req_info[i].request; - } else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) { - printf("tig version %s\n", TIG_VERSION); - return REQ_NONE; + return REQ_UNKNOWN; +} - } else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) { - printf("%s\n", usage); - return REQ_NONE; - } - custom_argv[j++] = opt; - if (j >= ARRAY_SIZE(custom_argv)) - die("command too long"); - } +/* + * Options + */ - custom_argv[j] = NULL; - *run_argv = custom_argv; +/* Option and state variables. */ +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 = 5; +static double opt_hscroll = 0.50; +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_remote[SIZEOF_REF] = ""; +static char opt_encoding[20] = "UTF-8"; +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_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; - return request; -} +#define is_initial_commit() (!get_ref_head()) +#define is_head_commit(rev) (!strcmp((rev), "HEAD") || (get_ref_head() && !strcmp(rev, get_ref_head()->id))) /* @@ -929,19 +1270,21 @@ LINE(PP_REFS, "Refs: ", COLOR_RED, COLOR_DEFAULT, 0), \ LINE(COMMIT, "commit ", COLOR_GREEN, COLOR_DEFAULT, 0), \ LINE(PARENT, "parent ", COLOR_BLUE, COLOR_DEFAULT, 0), \ LINE(TREE, "tree ", COLOR_BLUE, COLOR_DEFAULT, 0), \ -LINE(AUTHOR, "author ", COLOR_CYAN, COLOR_DEFAULT, 0), \ +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), \ LINE(DELIMITER, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(DATE, "", COLOR_BLUE, COLOR_DEFAULT, 0), \ +LINE(MODE, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(LINE_NUMBER, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(TITLE_BLUR, "", COLOR_WHITE, COLOR_BLUE, 0), \ LINE(TITLE_FOCUS, "", COLOR_WHITE, COLOR_BLUE, A_BOLD), \ -LINE(MAIN_AUTHOR, "", COLOR_GREEN, COLOR_DEFAULT, 0), \ LINE(MAIN_COMMIT, "", COLOR_DEFAULT, COLOR_DEFAULT, 0), \ LINE(MAIN_TAG, "", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_LOCAL_TAG,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ @@ -950,8 +1293,7 @@ LINE(MAIN_TRACKED, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(MAIN_HEAD, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REVGRAPH,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ -LINE(TREE_PARENT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_BOLD), \ -LINE(TREE_MODE, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ +LINE(TREE_HEAD, "", COLOR_DEFAULT, COLOR_DEFAULT, A_BOLD), \ LINE(TREE_DIR, "", COLOR_YELLOW, COLOR_DEFAULT, A_NORMAL), \ LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(STAT_HEAD, "", COLOR_YELLOW, COLOR_DEFAULT, 0), \ @@ -960,6 +1302,8 @@ LINE(STAT_NONE, "", COLOR_DEFAULT, 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 { @@ -1014,8 +1358,7 @@ get_line_info(const char *name) 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; @@ -1051,6 +1394,7 @@ struct line { unsigned int selected:1; unsigned int dirty:1; unsigned int cleareol:1; + unsigned int other:16; void *data; /* User data */ }; @@ -1073,6 +1417,7 @@ static struct keybinding default_keybindings[] = { { 't', REQ_VIEW_TREE }, { 'f', REQ_VIEW_BLOB }, { 'B', REQ_VIEW_BLAME }, + { 'H', REQ_VIEW_BRANCH }, { 'p', REQ_VIEW_PAGER }, { 'h', REQ_VIEW_HELP }, { 'S', REQ_VIEW_STATUS }, @@ -1100,6 +1445,8 @@ static struct keybinding default_keybindings[] = { { '-', REQ_MOVE_PAGE_UP }, /* Scrolling */ + { KEY_LEFT, REQ_SCROLL_LEFT }, + { KEY_RIGHT, REQ_SCROLL_RIGHT }, { KEY_IC, REQ_SCROLL_LINE_UP }, { KEY_DC, REQ_SCROLL_LINE_DOWN }, { 'w', REQ_SCROLL_PAGE_UP }, @@ -1116,11 +1463,14 @@ static struct keybinding default_keybindings[] = { { 'z', REQ_STOP_LOADING }, { 'v', REQ_SHOW_VERSION }, { 'r', REQ_SCREEN_REDRAW }, + { 'o', REQ_OPTIONS }, { '.', REQ_TOGGLE_LINENO }, { 'D', REQ_TOGGLE_DATE }, { 'A', REQ_TOGGLE_AUTHOR }, { 'g', REQ_TOGGLE_REV_GRAPH }, { 'F', REQ_TOGGLE_REFS }, + { 'I', REQ_TOGGLE_SORT_ORDER }, + { 'i', REQ_TOGGLE_SORT_FIELD }, { ':', REQ_PROMPT }, { 'u', REQ_STATUS_UPDATE }, { '!', REQ_STATUS_REVERT }, @@ -1138,6 +1488,7 @@ static struct keybinding default_keybindings[] = { KEYMAP_(TREE), \ KEYMAP_(BLOB), \ KEYMAP_(BLAME), \ + KEYMAP_(BRANCH), \ KEYMAP_(PAGER), \ KEYMAP_(HELP), \ KEYMAP_(STATUS), \ @@ -1149,14 +1500,13 @@ enum keymap { #undef KEYMAP_ }; -static struct int_map keymap_table[] = { -#define KEYMAP_(name) { #name, STRING_SIZE(#name), KEYMAP_##name } +static const struct enum_map keymap_table[] = { +#define KEYMAP_(name) ENUM_MAP(#name, KEYMAP_##name) KEYMAP_INFO #undef KEYMAP_ }; -#define set_keymap(map, name) \ - set_from_int_map(keymap_table, ARRAY_SIZE(keymap_table), map, name, strlen(name)) +#define set_keymap(map, name) map_enum(map, keymap_table, name) struct keybinding_table { struct keybinding *data; @@ -1169,12 +1519,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 @@ -1205,7 +1571,7 @@ struct key { int value; }; -static struct key key_table[] = { +static const struct key key_table[] = { { "Enter", KEY_RETURN }, { "Space", ' ' }, { "Backspace", KEY_BACKSPACE }, @@ -1272,26 +1638,68 @@ get_key_name(int key_value) 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++) { - 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; @@ -1300,31 +1708,28 @@ get_key(enum request request) struct run_request { enum keymap keymap; int key; - const char *argv[SIZEOF_ARG]; + const char **argv; }; static struct run_request *run_request; 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; - - req = realloc(run_request, (run_requests + 1) * sizeof(*run_request)); - if (!req) + if (!realloc_run_requests(&run_request, run_requests, 1)) return REQ_NONE; - run_request = req; 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; @@ -1342,22 +1747,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_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); } @@ -1367,8 +1773,12 @@ add_builtin_run_requests(void) * User config file handling. */ -static struct int_map color_map[] = { -#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name } +static int config_lineno; +static bool config_errors; +static const char *config_msg; + +static const struct enum_map color_map[] = { +#define COLOR_MAP(name) ENUM_MAP(#name, COLOR_##name) COLOR_MAP(DEFAULT), COLOR_MAP(BLACK), COLOR_MAP(BLUE), @@ -1380,11 +1790,8 @@ static struct int_map color_map[] = { COLOR_MAP(YELLOW), }; -#define set_color(color, name) \ - set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, strlen(name)) - -static struct int_map attr_map[] = { -#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name } +static const struct enum_map attr_map[] = { +#define ATTR_MAP(name) ENUM_MAP(#name, A_##name) ATTR_MAP(NORMAL), ATTR_MAP(BLINK), ATTR_MAP(BOLD), @@ -1394,64 +1801,144 @@ static struct int_map attr_map[] = { ATTR_MAP(UNDERLINE), }; -#define set_attribute(attr, name) \ - set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, strlen(name)) +#define set_attribute(attr, name) map_enum(attr, attr_map, name) -static int config_lineno; -static bool config_errors; -static const char *config_msg; +static int parse_step(double *opt, const char *arg) +{ + *opt = atoi(arg); + if (!strchr(arg, '%')) + return OK; + + /* "Shift down" so 100% and 1 does not conflict. */ + *opt = (*opt - 1) / 100; + if (*opt >= 1.0) { + *opt = 0.99; + config_msg = "Step value larger than 100%"; + return ERR; + } + if (*opt < 0.0) { + *opt = 1; + config_msg = "Invalid step value"; + return ERR; + } + return OK; +} + +static int +parse_int(int *opt, const char *arg, int min, int max) +{ + int value = atoi(arg); + + if (min <= value && value <= max) { + *opt = value; + return OK; + } + + config_msg = "Integer value out of bound"; + return ERR; +} + +static bool +set_color(int *color, const char *name) +{ + if (map_enum(color, color_map, name)) + return TRUE; + if (!prefixcmp(name, "color")) + return parse_int(color, name + 5, 0, 255) == OK; + return FALSE; +} -/* Wants: object fgcolor bgcolor [attr] */ +/* Wants: object fgcolor bgcolor [attribute] */ static int option_color_command(int argc, const char *argv[]) { struct line_info *info; - if (argc != 3 && argc != 4) { + if (argc < 3) { config_msg = "Wrong number of arguments given to color command"; return ERR; } info = get_line_info(argv[0]); if (!info) { - if (!string_enum_compare(argv[0], "main-delim", strlen("main-delim"))) { - info = get_line_info("delimiter"); - - } else if (!string_enum_compare(argv[0], "main-date", strlen("main-date"))) { - info = get_line_info("date"); + static const struct enum_map obsolete[] = { + ENUM_MAP("main-delim", LINE_DELIMITER), + ENUM_MAP("main-date", LINE_DATE), + ENUM_MAP("main-author", LINE_AUTHOR), + }; + int index; - } else { + if (!map_enum(&index, obsolete, argv[0])) { config_msg = "Unknown color name"; return ERR; } + info = &line_info[index]; } - if (set_color(&info->fg, argv[1]) == ERR || - set_color(&info->bg, argv[2]) == ERR) { + if (!set_color(&info->fg, argv[1]) || + !set_color(&info->bg, argv[2])) { config_msg = "Unknown color"; return ERR; } - if (argc == 4 && set_attribute(&info->attr, argv[3]) == ERR) { - 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; } -static bool parse_bool(const char *s) +static int parse_bool(bool *opt, const char *arg) +{ + *opt = (!strcmp(arg, "1") || !strcmp(arg, "true") || !strcmp(arg, "yes")) + ? TRUE : FALSE; + return OK; +} + +static int parse_enum_do(unsigned int *opt, const char *arg, + const struct enum_map *map, size_t map_size) { - return (!strcmp(s, "1") || !strcmp(s, "true") || - !strcmp(s, "yes")) ? TRUE : FALSE; + 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_int(const char *s, int default_value, int min, int max) +parse_string(char *opt, const char *arg, size_t optsize) { - int value = atoi(s); + int arglen = strlen(arg); - return (value < min || value > max) ? default_value : value; + switch (arg[0]) { + case '\"': + case '\'': + if (arglen == 1 || arg[arglen - 1] != arg[0]) { + config_msg = "Unmatched quotation"; + return ERR; + } + arg += 1; arglen -= 2; + default: + string_ncopy_do(opt, optsize, arg, arglen); + return OK; + } } /* Wants: name = value */ @@ -1468,68 +1955,41 @@ option_set_command(int argc, const char *argv[]) return ERR; } - if (!strcmp(argv[0], "show-author")) { - opt_author = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "show-author")) + return parse_enum(&opt_author, argv[2], author_map); - if (!strcmp(argv[0], "show-date")) { - opt_date = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "show-date")) + return parse_enum(&opt_date, argv[2], date_map); - if (!strcmp(argv[0], "show-rev-graph")) { - opt_rev_graph = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "show-rev-graph")) + return parse_bool(&opt_rev_graph, argv[2]); - if (!strcmp(argv[0], "show-refs")) { - opt_show_refs = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "show-refs")) + return parse_bool(&opt_show_refs, argv[2]); - if (!strcmp(argv[0], "show-line-numbers")) { - opt_line_number = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "show-line-numbers")) + return parse_bool(&opt_line_number, argv[2]); - if (!strcmp(argv[0], "line-graphics")) { - opt_line_graphics = parse_bool(argv[2]); - return OK; - } + if (!strcmp(argv[0], "line-graphics")) + return parse_bool(&opt_line_graphics, argv[2]); - if (!strcmp(argv[0], "line-number-interval")) { - opt_num_interval = parse_int(argv[2], opt_num_interval, 1, 1024); - return OK; - } + if (!strcmp(argv[0], "line-number-interval")) + return parse_int(&opt_num_interval, argv[2], 1, 1024); - if (!strcmp(argv[0], "author-width")) { - opt_author_cols = parse_int(argv[2], opt_author_cols, 0, 1024); - return OK; - } + if (!strcmp(argv[0], "author-width")) + return parse_int(&opt_author_cols, argv[2], 0, 1024); - if (!strcmp(argv[0], "tab-size")) { - opt_tab_size = parse_int(argv[2], opt_tab_size, 1, 1024); - return OK; - } + if (!strcmp(argv[0], "horizontal-scroll")) + return parse_step(&opt_hscroll, argv[2]); - if (!strcmp(argv[0], "commit-encoding")) { - const char *arg = argv[2]; - int arglen = strlen(arg); + if (!strcmp(argv[0], "split-view-height")) + return parse_step(&opt_scale_split_view, argv[2]); - switch (arg[0]) { - case '"': - case '\'': - if (arglen == 1 || arg[arglen - 1] != arg[0]) { - config_msg = "Unmatched quotation"; - return ERR; - } - arg += 1; arglen -= 2; - default: - string_ncopy(opt_encoding, arg, strlen(arg)); - return OK; - } - } + if (!strcmp(argv[0], "tab-size")) + return parse_int(&opt_tab_size, argv[2], 1, 1024); + + if (!strcmp(argv[0], "commit-encoding")) + return parse_string(opt_encoding, argv[2], sizeof(opt_encoding)); config_msg = "Unknown variable name"; return ERR; @@ -1540,7 +2000,7 @@ static int option_bind_command(int argc, const char *argv[]) { enum request request; - int keymap; + int keymap = -1; int key; if (argc < 3) { @@ -1548,7 +2008,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; } @@ -1560,31 +2020,24 @@ option_bind_command(int argc, const char *argv[]) } request = get_request(argv[2]); - if (request == REQ_NONE) { - struct { - const char *name; - enum request request; - } obsolete[] = { - { "cherry-pick", REQ_NONE }, - { "screen-resize", REQ_NONE }, - { "tree-parent", REQ_PARENT }, + if (request == REQ_UNKNOWN) { + static const struct enum_map obsolete[] = { + ENUM_MAP("cherry-pick", REQ_NONE), + ENUM_MAP("screen-resize", REQ_NONE), + ENUM_MAP("tree-parent", REQ_PARENT), }; - size_t namelen = strlen(argv[2]); - int i; + int alias; - for (i = 0; i < ARRAY_SIZE(obsolete); i++) { - if (namelen != strlen(obsolete[i].name) || - string_enum_compare(obsolete[i].name, argv[2], namelen)) - continue; - if (obsolete[i].request != REQ_NONE) - add_keybinding(keymap, obsolete[i].request, key); + if (map_enum(&alias, obsolete, argv[2])) { + if (alias != REQ_NONE) + add_keybinding(keymap, alias, key); config_msg = "Obsolete request name"; 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; } @@ -1649,8 +2102,8 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen) } if (status == ERR) { - fprintf(stderr, "Error on line %d, near '%.*s': %s\n", - config_lineno, (int) optlen, opt, config_msg); + warn("Error on line %d, near '%.*s': %s", + config_lineno, (int) optlen, opt, config_msg); config_errors = TRUE; } @@ -1661,18 +2114,18 @@ 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, path)) + /* It's OK that the file doesn't exist. */ + if (!io_open(&io, "%s", path)) return; config_lineno = 0; config_errors = FALSE; - if (read_properties(&io, " \t", read_option) == ERR || + if (io_load(&io, " \t", read_option) == ERR || config_errors == TRUE) - fprintf(stderr, "Errors while loading %s.\n", path); + warn("Errors while loading %s.", path); } static int @@ -1683,13 +2136,8 @@ load_options(void) const char *tigrc_system = getenv("TIGRC_SYSTEM"); char buf[SIZEOF_STR]; - add_builtin_run_requests(); - - if (!tigrc_system) { - if (!string_format(buf, "%s/tigrc", SYSCONFDIR)) - return ERR; - tigrc_system = buf; - } + if (!tigrc_system) + tigrc_system = SYSCONFDIR "/tigrc"; load_option_file(tigrc_system); if (!tigrc_user) { @@ -1699,6 +2147,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; } @@ -1723,8 +2175,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} */ @@ -1743,31 +2211,36 @@ struct view { /* Navigation */ unsigned long offset; /* Offset of the window top */ + unsigned long yoffset; /* Offset from the window side. */ unsigned long lineno; /* Current line number */ unsigned long p_offset; /* Previous offset of the window top */ + unsigned long p_yoffset;/* Previous offset from the window side */ unsigned long p_lineno; /* Previous current line number */ bool p_restore; /* Should the previous position be restored. */ /* Searching */ char grep[SIZEOF_STR]; /* Search string */ - regex_t *regex; /* Pre-compiled regex */ + regex_t *regex; /* Pre-compiled regexp */ /* 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 */ struct line *line; /* Line index */ - size_t line_alloc; /* Total number of allocated lines */ unsigned int digits; /* Number of digits in the lines member. */ /* Drawing */ struct line *curline; /* Line currently being drawn. */ enum line_type curtype; /* Attribute currently used for drawing. */ unsigned long col; /* Column when drawing. */ + 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; @@ -1787,10 +2260,12 @@ struct view_ops { bool (*draw)(struct view *view, struct line *line, unsigned int lineno); /* Depending on view handle a special requests. */ enum request (*request)(struct view *view, enum request request, struct line *line); - /* Search for regex in a line. */ + /* Search for regexp in a line. */ 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; @@ -1803,13 +2278,13 @@ static struct view_ops pager_ops; static struct view_ops stage_ops; 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), @@ -1818,6 +2293,7 @@ static struct view views[] = { VIEW_(TREE, "tree", &tree_ops, TRUE, ref_commit), VIEW_(BLOB, "blob", &blob_ops, TRUE, ref_blob), VIEW_(BLAME, "blame", &blame_ops, TRUE, ref_commit), + VIEW_(BRANCH, "branch", &branch_ops, TRUE, ref_head), VIEW_(HELP, "help", &help_ops, FALSE, ""), VIEW_(PAGER, "pager", &pager_ops, FALSE, "stdin"), VIEW_(STATUS, "status", &status_ops, TRUE, ""), @@ -1825,7 +2301,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++) @@ -1833,20 +2308,24 @@ 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]); +} -enum line_graphic { - LINE_GRAPHIC_VLINE -}; -static int 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; } @@ -1856,28 +2335,37 @@ static int 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; + size_t skip = view->yoffset > view->col ? view->yoffset - view->col : 0; if (max_len <= 0) return 0; - if (opt_utf8) { - len = utf8_length(string, &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); - waddnstr(view->win, string, len); + waddnstr(view->win, string, len); + } if (trimmed && use_tilde) { set_view_attr(view, LINE_DELIMITER); waddch(view->win, '~'); @@ -1898,63 +2386,25 @@ draw_space(struct view *view, enum line_type type, int max, int spaces) while (spaces > 0) { int len = MIN(spaces, sizeof(space) - 1); - col += draw_chars(view, type, space, spaces, FALSE); + col += draw_chars(view, type, space, len, FALSE); spaces -= len; } return col; } -static bool -draw_lineno(struct view *view, unsigned int lineno) -{ - char number[10]; - int digits3 = view->digits < 3 ? 3 : view->digits; - int max_number = MIN(digits3, STRING_SIZE(number)); - int max = view->width - view->col; - int col; - - if (max < max_number) - max_number = max; - - lineno += view->offset + 1; - if (lineno == 1 || (lineno % opt_num_interval) == 0) { - static char fmt[] = "%1ld"; - - if (view->digits <= 9) - fmt[1] = '0' + digits3; - - if (!string_format(number, fmt, lineno)) - number[0] = 0; - col = draw_chars(view, LINE_LINE_NUMBER, number, max_number, TRUE); - } else { - col = draw_space(view, LINE_LINE_NUMBER, max_number, max_number); - } - - if (col < max) { - set_view_attr(view, LINE_DEFAULT); - waddch(view->win, line_graphics[LINE_GRAPHIC_VLINE]); - col++; - } - - if (col < max) - col += draw_space(view, LINE_DEFAULT, max - col, 1); - view->col += col; - - return view->width - view->col <= 0; -} - 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->col, trim); - return view->width - view->col <= 0; + view->col += draw_chars(view, type, string, view->width + view->yoffset - view->col, trim); + return view->width + view->yoffset <= view->col; } static bool draw_graphic(struct view *view, enum line_type type, chtype graphic[], size_t size) { - int max = view->width - view->col; + size_t skip = view->yoffset > view->col ? view->yoffset - view->col : 0; + int max = view->width + view->yoffset - view->col; int i; if (max < size) @@ -1963,22 +2413,21 @@ draw_graphic(struct view *view, enum line_type type, chtype graphic[], size_t si set_view_attr(view, type); /* Using waddch() instead of waddnstr() ensures that * they'll be rendered correctly for the cursor line. */ - for (i = 0; i < size; i++) + for (i = skip; i < size; i++) waddch(view->win, graphic[i]); view->col += size; - if (size < max) { + if (size < max && skip <= size) waddch(view->win, ' '); - view->col++; - } + view->col++; - return view->width - view->col <= 0; + return view->width + view->yoffset <= view->col; } static bool draw_field(struct view *view, enum line_type type, const char *text, int len, bool trim) { - int max = MIN(view->width - view->col, len); + int max = MIN(view->width + view->yoffset - view->col, len); int col; if (text) @@ -1986,48 +2435,75 @@ draw_field(struct view *view, enum line_type type, const char *text, int len, bo else col = draw_space(view, type, max - 1, max - 1); - view->col += col + draw_space(view, LINE_DEFAULT, max - col, max - col); - return view->width - view->col <= 0; + view->col += col; + view->col += draw_space(view, LINE_DEFAULT, max - col, max - col); + return view->width + view->yoffset <= view->col; } static bool -draw_date(struct view *view, struct tm *time) +draw_date(struct view *view, struct time *time) { - char buf[DATE_COLS]; - char *date; - int timelen = 0; + const char *date = mkdate(time, opt_date); + int cols = opt_date == DATE_SHORT ? DATE_SHORT_COLS : DATE_COLS; - if (time) - timelen = strftime(buf, sizeof(buf), DATE_FORMAT, time); - date = timelen ? buf : NULL; - - 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; + bool trim = opt_author_cols == 0 || opt_author_cols > 5; + bool abbreviate = opt_author == AUTHOR_ABBREVIATED || !trim; + + if (abbreviate && author) + author = get_author_initials(author); - if (!trim) { - static char initials[10]; - size_t pos; + return draw_field(view, LINE_AUTHOR, author, opt_author_cols, trim); +} -#define is_initial_sep(c) (isspace(c) || ispunct(c) || (c) == '@') +static bool +draw_mode(struct view *view, mode_t mode) +{ + const char *str; + + if (S_ISDIR(mode)) + str = "drwxr-xr-x"; + else if (S_ISLNK(mode)) + str = "lrwxrwxrwx"; + else if (S_ISGITLINK(mode)) + str = "m---------"; + else if (S_ISREG(mode) && mode & S_IXUSR) + str = "-rwxr-xr-x"; + else if (S_ISREG(mode)) + str = "-rw-r--r--"; + else + str = "----------"; - 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++; - } + return draw_field(view, LINE_MODE, str, STRING_SIZE("-rw-r--r-- "), FALSE); +} - author = initials; - } +static bool +draw_lineno(struct view *view, unsigned int lineno) +{ + char number[10]; + 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) { + static char fmt[] = "%1ld"; - return draw_field(view, LINE_MAIN_AUTHOR, author, opt_author_cols, trim); + fmt[1] = '0' + (view->digits <= 9 ? digits3 : 1); + if (string_format(number, fmt, lineno)) + text = number; + } + if (text) + 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, &separator, 1); } static bool @@ -2112,7 +2588,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 @@ -2158,6 +2634,15 @@ update_view_title(struct view *view) wnoutrefresh(view->title); } +static int +apply_step(double step, int value) +{ + if (step >= 1) + return (int) step; + value *= step + 0.01; + return value ? value : 1; +} + static void resize_display(void) { @@ -2175,7 +2660,9 @@ resize_display(void) if (view != base) { /* Horizontal split. */ view->width = base->width; - view->height = SCALE_SPLIT_VIEW(base->height); + view->height = apply_step(opt_scale_split_view, base->height); + view->height = MAX(view->height, MIN_VIEW_HEIGHT); + view->height = MIN(view->height, base->height - MIN_VIEW_HEIGHT); base->height -= view->height; /* Make room for the title bar. */ @@ -2223,6 +2710,26 @@ 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) +{ + *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) { @@ -2231,10 +2738,69 @@ toggle_view_option(bool *option, const char *help) report("%sabling %s", *option ? "En" : "Dis", help); } +static void +open_option_menu(void) +{ + const struct menu_item menu[] = { + { '.', "line numbers", &opt_line_number }, + { 'D', "date display", &opt_date }, + { 'A', "author display", &opt_author }, + { 'g', "revision graph display", &opt_rev_graph }, + { 'F', "reference display", &opt_show_refs }, + { 0 } + }; + int selected = 0; + + 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 +maximize_view(struct view *view) +{ + memset(display, 0, sizeof(display)); + current_view = 0; + display[current_view] = view; + resize_display(); + redraw_display(FALSE); + report(""); +} + + /* * Navigation */ +static bool +goto_view_line(struct view *view, unsigned long offset, unsigned long lineno) +{ + if (lineno >= view->lines) + lineno = view->lines > 0 ? view->lines - 1 : 0; + + if (offset > lineno || offset + view->height <= lineno) { + unsigned long half = view->height / 2; + + if (lineno > half) + offset = lineno - half; + else + offset = 0; + } + + if (offset != view->offset || lineno != view->lineno) { + view->offset = offset; + view->lineno = lineno; + return TRUE; + } + + return FALSE; +} + /* Scrolling backend */ static void do_scroll_view(struct view *view, int lines) @@ -2278,6 +2844,7 @@ do_scroll_view(struct view *view, int lines) wnoutrefresh(view->win); } + view->has_scrolled = TRUE; report(""); } @@ -2290,6 +2857,23 @@ scroll_view(struct view *view, enum request request) assert(view_is_displayed(view)); switch (request) { + case REQ_SCROLL_LEFT: + if (view->yoffset == 0) { + report("Cannot scroll beyond the first column"); + return; + } + if (view->yoffset <= apply_step(opt_hscroll, view->width)) + view->yoffset = 0; + else + view->yoffset -= apply_step(opt_hscroll, view->width); + redraw_view_from(view, 0); + report(""); + return; + case REQ_SCROLL_RIGHT: + view->yoffset += apply_step(opt_hscroll, view->width); + redraw_view(view); + report(""); + return; case REQ_SCROLL_PAGE_DOWN: lines = view->height; case REQ_SCROLL_LINE_DOWN: @@ -2421,23 +3005,34 @@ move_view(struct view *view, enum request request) static void search_view(struct view *view, enum request request); +static bool +grep_text(struct view *view, const char *text[]) +{ + regmatch_t pmatch; + size_t i; + + for (i = 0; text[i]; i++) + if (*text[i] && + regexec(view->regex, text[i], 1, &pmatch, 0) != REG_NOMATCH) + return TRUE; + return FALSE; +} + static void select_view_line(struct view *view, unsigned long lineno) { - if (lineno - view->offset >= view->height) { - view->offset = lineno; - view->lineno = lineno; - if (view_is_displayed(view)) - redraw_view(view); - - } else { - unsigned long old_lineno = view->lineno - view->offset; + unsigned long old_lineno = view->lineno; + unsigned long old_offset = view->offset; - view->lineno = lineno; + if (goto_view_line(view, view->offset, lineno)) { if (view_is_displayed(view)) { - draw_view_line(view, old_lineno); - draw_view_line(view, view->lineno - view->offset); - wnoutrefresh(view->win); + if (old_offset != view->offset) { + redraw_view(view); + } else { + draw_view_line(view, old_lineno - view->offset); + draw_view_line(view, view->lineno - view->offset); + wnoutrefresh(view->win); + } } else { view->ops->select(view, &view->line[view->lineno]); } @@ -2531,86 +3126,102 @@ reset_view(struct view *view) free(view->line); view->p_offset = view->offset; + view->p_yoffset = view->yoffset; view->p_lineno = view->lineno; view->line = NULL; view->offset = 0; + view->yoffset = 0; view->lines = 0; view->lineno = 0; - view->line_alloc = 0; view->vid[0] = 0; 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 -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 = ""; - } 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)) 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; } @@ -2627,25 +3238,11 @@ restore_view_position(struct view *view) return FALSE; } - if (view->p_lineno >= view->lines) { - view->p_lineno = view->lines > 0 ? view->lines - 1 : 0; - if (view->p_offset >= view->p_lineno) { - unsigned long half = view->height / 2; - - if (view->p_lineno > half) - view->p_offset = view->p_lineno - half; - else - view->p_offset = 0; - } - } - - if (view_is_displayed(view) && - view->offset != view->p_offset && - view->lineno != view->p_lineno) + if (goto_view_line(view, view->p_offset, view->p_lineno) && + view_is_displayed(view)) werase(view->win); - view->offset = view->p_offset; - view->lineno = view->p_lineno; + view->yoffset = view->p_yoffset; view->p_restore = FALSE; return TRUE; @@ -2659,17 +3256,15 @@ end_update(struct view *view, bool force) 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; @@ -2677,12 +3272,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 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_run(&view->io, IO_RD, dir, view->argv); } static bool @@ -2690,7 +3300,8 @@ prepare_update_file(struct view *view, const char *name) { if (view->pipe) end_update(view, TRUE); - return io_open(&view->io, name); + argv_free(view->argv); + return io_open(&view->io, "%s/%s", opt_cdup[0] ? opt_cdup : ".", name); } static bool @@ -2699,16 +3310,13 @@ begin_update(struct view *view, bool refresh) if (view->pipe) end_update(view, TRUE); - if (refresh) { - if (!start_io(&view->io)) - return FALSE; - - } else { - if (view == VIEW(REQ_VIEW_TREE) && strcmp(view->vid, view->id)) - opt_path[0] = 0; - - if (!run_io_rd(&view->io, view->ops->argv, FORMAT_ALL)) + if (!refresh) { + if (view->ops->prepare) { + if (!view->ops->prepare(view)) + return FALSE; + } else if (!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 @@ -2717,41 +3325,15 @@ begin_update(struct view *view, bool refresh) string_copy_rev(view->ref, view->id); } + if (view->argv && view->argv[0] && + !io_run(&view->io, IO_RD, view->dir, view->argv)) + return FALSE; + setup_update(view, view->id); return TRUE; } -#define ITEM_CHUNK_SIZE 256 -static void * -realloc_items(void *mem, size_t *size, size_t new_size, size_t item_size) -{ - size_t num_chunks = *size / ITEM_CHUNK_SIZE; - size_t num_chunks_new = (new_size + ITEM_CHUNK_SIZE - 1) / ITEM_CHUNK_SIZE; - - if (mem == NULL || num_chunks != num_chunks_new) { - *size = num_chunks_new * ITEM_CHUNK_SIZE; - mem = realloc(mem, *size * item_size); - } - - return mem; -} - -static struct line * -realloc_lines(struct view *view, size_t line_size) -{ - size_t alloc = view->line_alloc; - struct line *tmp = realloc_items(view->line, &alloc, line_size, - sizeof(*view->line)); - - if (!tmp) - return NULL; - - view->line = tmp; - view->line_alloc = alloc; - return view->line; -} - static bool update_view(struct view *view) { @@ -2766,7 +3348,7 @@ update_view(struct view *view) return TRUE; if (!io_can_read(view->pipe)) { - if (view->lines == 0) { + if (view->lines == 0 && view_is_displayed(view)) { time_t secs = time(NULL) - view->start_time; if (secs > 1 && secs > view->update_secs) { @@ -2780,7 +3362,7 @@ update_view(struct view *view) } 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; @@ -2789,7 +3371,7 @@ update_view(struct view *view) 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; } @@ -2811,7 +3393,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; } } @@ -2821,7 +3403,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); } @@ -2842,12 +3425,14 @@ update_view(struct view *view) return TRUE; } +DEFINE_ALLOCATOR(realloc_lines, struct line, 256) + static struct line * add_line_data(struct view *view, void *data, enum line_type type) { struct line *line; - if (!realloc_lines(view, view->lines + 1)) + if (!realloc_lines(&view->line, view->lines, 1)) return NULL; line = &view->line[view->lines++]; @@ -2888,9 +3473,7 @@ add_line_format(struct view *view, enum line_type type, const char *fmt, ...) enum open_flags { OPEN_DEFAULT = 0, /* Use default view switching. */ OPEN_SPLIT = 1, /* Split current view. */ - OPEN_BACKGROUNDED = 2, /* Backgrounded. */ OPEN_RELOAD = 4, /* Reload view even if it is the current. */ - OPEN_NOMAXIMIZE = 8, /* Do not maximize the current view. */ OPEN_REFRESH = 16, /* Refresh view using previous command. */ OPEN_PREPARED = 32, /* Open already prepared command. */ }; @@ -2898,10 +3481,9 @@ enum open_flags { static void open_view(struct view *prev, enum request request, enum open_flags flags) { - bool backgrounded = !!(flags & OPEN_BACKGROUNDED); bool split = !!(flags & OPEN_SPLIT); bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED)); - bool nomaximize = !!(flags & (OPEN_NOMAXIMIZE | OPEN_REFRESH)); + bool nomaximize = !!(flags & OPEN_REFRESH); struct view *view = VIEW(request); int nviews = displayed_views(); struct view *base_view = display[0]; @@ -2918,8 +3500,8 @@ open_view(struct view *prev, enum request request, enum open_flags flags) if (split) { display[1] = view; - if (!backgrounded) - current_view = 1; + current_view = 1; + view->parent = prev; } else if (!nomaximize) { /* Maximize the current view. */ memset(display, 0, sizeof(display)); @@ -2927,6 +3509,11 @@ open_view(struct view *prev, enum request request, enum open_flags flags) 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() || @@ -2957,13 +3544,9 @@ open_view(struct view *prev, enum request request, enum open_flags flags) do_scroll_view(prev, lines); } - if (prev && view != prev) { - if (split && !backgrounded) { - /* "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) { @@ -2976,11 +3559,6 @@ open_view(struct view *prev, enum request request, enum open_flags flags) redraw_view(view); report(""); } - - /* If the view is backgrounded the above calls to report() - * won't redraw the view title. */ - if (backgrounded) - update_view_title(view); } static void @@ -2988,7 +3566,7 @@ open_external_viewer(const char *argv[], const char *dir) { 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(); @@ -3004,7 +3582,7 @@ open_mergetool(const char *file) } 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; @@ -3020,23 +3598,25 @@ open_editor(bool from_root, const char *file) 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 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); } /* @@ -3048,28 +3628,18 @@ view_driver(struct view *view, enum request request) { int i; - if (request == REQ_NONE) { - doupdate(); + if (request == REQ_NONE) return TRUE; - } 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_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: @@ -3081,6 +3651,8 @@ view_driver(struct view *view, enum request request) move_view(view, request); break; + case REQ_SCROLL_LEFT: + case REQ_SCROLL_RIGHT: case REQ_SCROLL_LINE_DOWN: case REQ_SCROLL_LINE_UP: case REQ_SCROLL_PAGE_DOWN: @@ -3091,7 +3663,7 @@ view_driver(struct view *view, enum request request) 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); @@ -3100,7 +3672,7 @@ view_driver(struct view *view, enum request request) 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); @@ -3109,7 +3681,7 @@ view_driver(struct view *view, enum request request) 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); @@ -3118,7 +3690,7 @@ view_driver(struct view *view, enum request request) 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); @@ -3137,6 +3709,7 @@ view_driver(struct view *view, enum request request) case REQ_VIEW_LOG: case REQ_VIEW_TREE: case REQ_VIEW_HELP: + case REQ_VIEW_BRANCH: open_view(view, request, OPEN_DEFAULT); break; @@ -3144,14 +3717,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))) { + if (view->parent) { int line; view = view->parent; @@ -3160,9 +3726,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); } @@ -3190,7 +3754,11 @@ view_driver(struct view *view, enum request request) case REQ_MAXIMIZE: if (displayed_views() == 2) - open_view(view, VIEW_REQ(view), OPEN_DEFAULT); + maximize_view(view); + break; + + case REQ_OPTIONS: + open_option_menu(); break; case REQ_TOGGLE_LINENO: @@ -3198,11 +3766,11 @@ view_driver(struct view *view, enum request 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: @@ -3213,6 +3781,11 @@ view_driver(struct view *view, enum request request) toggle_view_option(&opt_show_refs, "reference display"); break; + case REQ_TOGGLE_SORT_FIELD: + case REQ_TOGGLE_SORT_ORDER: + report("Sorting is not yet supported for the %s view", view->name); + break; + case REQ_SEARCH: case REQ_SEARCH_BACK: search_view(view, request); @@ -3224,8 +3797,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); @@ -3249,18 +3821,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) { - memset(display, 0, sizeof(display)); - current_view = 0; - display[current_view] = view->parent; - view->parent = view; - resize_display(); - redraw_display(FALSE); - report(""); + if (view->prev && view->prev != view) { + maximize_view(view->prev); + view->prev = view; break; } /* Fall-through */ @@ -3268,7 +3834,8 @@ view_driver(struct view *view, enum request request) 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; } @@ -3280,11 +3847,108 @@ view_driver(struct view *view, enum request request) * View backend utilities */ +enum sort_field { + ORDERBY_NAME, + ORDERBY_DATE, + ORDERBY_AUTHOR, +}; + +struct sort_state { + const enum sort_field *fields; + size_t size, current; + bool reverse; +}; + +#define SORT_STATE(fields) { fields, ARRAY_SIZE(fields), 0 } +#define get_sort_field(state) ((state).fields[(state).current]) +#define sort_order(state, result) ((state).reverse ? -(result) : (result)) + +static void +sort_view(struct view *view, enum request request, struct sort_state *state, + int (*compare)(const void *, const void *)) +{ + switch (request) { + case REQ_TOGGLE_SORT_FIELD: + state->current = (state->current + 1) % state->size; + break; + + case REQ_TOGGLE_SORT_ORDER: + state->reverse = !state->reverse; + break; + default: + die("Not a sort request"); + } + + qsort(view->line, view->lines, sizeof(*view->line), compare); + redraw_view(view); +} + +DEFINE_ALLOCATOR(realloc_authors, const char *, 256) + +/* Small author cache to reduce memory consumption. It uses binary + * search to lookup or find place to position new entries. No entries + * are ever freed. */ +static const char * +get_author(const char *name) +{ + static const char **authors; + static size_t authors_size; + int from = 0, to = authors_size - 1; + + while (from <= to) { + size_t pos = (to + from) / 2; + int cmp = strcmp(name, authors[pos]); + + if (!cmp) + return authors[pos]; + + if (cmp < 0) + to = pos - 1; + else + from = pos + 1; + } + + if (!realloc_authors(&authors, authors_size, 1)) + return NULL; + name = strdup(name); + if (!name) + return NULL; + + memmove(authors + from + 1, authors + from, (authors_size - from) * sizeof(*authors)); + authors[from] = name; + authors_size++; + + return name; +} + +static void +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 * 10; + tz += ('0' - zone[4]) * 60; + + if (zone[0] == '-') + tz = -tz; + + time->tz = tz; + time->sec -= tz; +} + /* Parse author lines where the name may be empty: * author 1138474660 +0100 */ static void -parse_author_line(char *ident, char *author, size_t authorsize, struct tm *tm) +parse_author_line(char *ident, const char **author, struct time *time) { char *nameend = strchr(ident, '<'); char *emailend = strchr(ident, '>'); @@ -3299,82 +3963,82 @@ parse_author_line(char *ident, char *author, size_t authorsize, struct tm *tm) ident = "Unknown"; } - string_ncopy_do(author, authorsize, ident, strlen(ident)); + *author = get_author(ident); /* Parse epoch and timezone */ if (emailend && emailend[1] == ' ') { char *secs = emailend + 2; char *zone = strchr(secs, ' '); - time_t time = (time_t) atol(secs); - - if (zone && strlen(zone) == STRING_SIZE(" +0700")) { - long tz; - - zone++; - tz = ('0' - zone[1]) * 60 * 60 * 10; - tz += ('0' - zone[2]) * 60 * 60; - tz += ('0' - zone[3]) * 60; - tz += ('0' - zone[4]) * 60; - if (zone[0] == '-') - tz = -tz; + parse_timesec(time, secs); - time -= tz; - } - - gmtime_r(&time, tm); + if (zone && strlen(zone) == STRING_SIZE(" +0700")) + parse_timezone(time, zone + 1); } } -static enum input_status -select_commit_parent_handler(void *data, char *buf, int c) +static bool +open_commit_parent_menu(char buf[SIZEOF_STR], int *parents) { - size_t parents = *(size_t *) data; - int parent = 0; + 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; - if (!isdigit(c)) - return INPUT_SKIP; + items = calloc(*parents + 1, sizeof(*items)); + if (!items) + return FALSE; - if (*buf) - parent = atoi(buf) * 10; - parent += c - '0'; + 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 (parent > parents) - return INPUT_SKIP; - return INPUT_OK; + 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; } static bool -select_commit_parent(const char *id, char rev[SIZEOF_REV]) +select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path) { char buf[SIZEOF_STR * 4]; const char *revlist_argv[] = { - "git", "rev-list", "-1", "--parents", id, NULL + "git", "log", "--no-color", "-1", + "--pretty=format:%P", id, "--", path, NULL }; int parents; - if (!run_io_buf(revlist_argv, buf, sizeof(buf)) || - !*chomp_string(buf) || - (parents = (strlen(buf) / 40) - 1) < 0) { + if (!io_run_buf(revlist_argv, buf, sizeof(buf)) || + (parents = strlen(buf) / 40) < 0) { report("Failed to get parent information"); return FALSE; } else if (parents == 0) { - report("The selected commit has no parents"); + if (path) + report("Path '%s' does not exist in the parent", path); + else + report("The selected commit has no parents"); return FALSE; } - if (parents > 1) { - char prompt[SIZEOF_STR]; - char *result; - - if (!string_format(prompt, "Which parent? [1..%d] ", parents)) - return FALSE; - result = prompt_input(prompt, select_commit_parent_handler, &parents); - if (!result) - return FALSE; - parents = atoi(result); - } + if (parents == 1) + parents = 0; + else if (!open_commit_parent_menu(buf, &parents)) + return FALSE; string_copy_rev(rev, &buf[41 * parents]); return TRUE; @@ -3387,11 +4051,12 @@ select_commit_parent(const char *id, char rev[SIZEOF_REV]) static bool pager_draw(struct view *view, struct line *line, unsigned int lineno) { - char *text = line->data; + 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); return TRUE; } @@ -3400,13 +4065,9 @@ static bool add_describe_ref(char *buf, size_t *bufpos, const char *commit_id, const char *sep) { const char *describe_argv[] = { "git", "describe", commit_id, NULL }; - char refbuf[SIZEOF_STR]; - char *ref = NULL; + char ref[SIZEOF_STR]; - if (run_io_buf(describe_argv, refbuf, sizeof(refbuf))) - ref = chomp_string(refbuf); - - if (!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. */ @@ -3421,22 +4082,22 @@ add_pager_refs(struct view *view, struct line *line) { char buf[SIZEOF_STR]; char *commit_id = (char *)line->data + STRING_SIZE("commit "); - struct ref **refs; - size_t bufpos = 0, refpos = 0; + struct ref_list *list; + size_t bufpos = 0, i; const char *sep = "Refs: "; bool is_tag = FALSE; assert(line->type == LINE_COMMIT); - refs = get_refs(commit_id); - if (!refs) { - if (view == VIEW(REQ_VIEW_DIFF)) + list = get_ref_list(commit_id); + if (!list) { + if (view->type == VIEW_DIFF) goto try_add_describe_ref; return; } - do { - struct ref *ref = refs[refpos]; + for (i = 0; i < list->size; i++) { + struct ref *ref = list->refs[i]; const char *fmt = ref->tag ? "%s[%s]" : ref->remote ? "%s<%s>" : "%s%s"; @@ -3445,9 +4106,9 @@ add_pager_refs(struct view *view, struct line *line) sep = ", "; if (ref->tag) is_tag = TRUE; - } while (refs[refpos++]->next); + } - if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) { + if (!is_tag && view->type == VIEW_DIFF) { try_add_describe_ref: /* Add -g "fake" reference. */ if (!add_describe_ref(buf, &bufpos, commit_id, sep)) @@ -3473,8 +4134,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; @@ -3489,8 +4150,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; } @@ -3512,16 +4173,9 @@ pager_request(struct view *view, enum request request, struct line *line) static bool pager_grep(struct view *view, struct line *line) { - regmatch_t pmatch; - char *text = line->data; - - if (!*text) - return FALSE; + const char *text[] = { line->data, NULL }; - if (regexec(view->regex, text, 1, &pmatch, 0) == REG_NOMATCH) - return FALSE; - - return TRUE; + return grep_text(view, text); } static void @@ -3530,7 +4184,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); } @@ -3577,7 +4231,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 = { @@ -3595,80 +4250,129 @@ static struct view_ops diff_ops = { * 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; - for (bufpos = 0; bufpos <= req_info[i].namelen; bufpos++) { - buf[bufpos] = tolower(req_info[i].name[bufpos]); - if (buf[bufpos] == '_') - buf[bufpos] = '-'; + if (add_title && help_open_keymap_title(view, keymap)) + return; + add_title = FALSE; + + 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, }; @@ -3724,14 +4428,11 @@ push_tree_stack_entry(const char *name, unsigned long lineno) /* Parse output from git-ls-tree(1): * - * 100644 blob fb0e31ea6cc679b7379631188190e975f5789c26 Makefile - * 100644 blob 5304ca4260aaddaee6498f9630e7d471b8591ea6 README * 100644 blob f931e1d229c3e185caad4449bf5b66ed72462657 tig.c - * 100644 blob ed09fe897f3c7c9af90bcf80cae92558ea88ae38 web.conf */ #define SIZEOF_TREE_ATTR \ - STRING_SIZE("100644 blob ed09fe897f3c7c9af90bcf80cae92558ea88ae38\t") + STRING_SIZE("100644 blob f931e1d229c3e185caad4449bf5b66ed72462657\t") #define SIZEOF_TREE_MODE \ STRING_SIZE("100644 ") @@ -3742,26 +4443,57 @@ push_tree_stack_entry(const char *name, unsigned long lineno) struct tree_entry { char id[SIZEOF_REV]; mode_t mode; - struct tm time; /* Date from the author ident. */ - char author[75]; /* Author of the commit. */ + struct time time; /* Date from the author ident. */ + const char *author; /* Author of the commit. */ char name[1]; }; static const char * -tree_path(struct line *line) +tree_path(const struct line *line) { return ((struct tree_entry *) line->data)->name; } - static int -tree_compare_entry(struct line *line1, struct line *line2) +tree_compare_entry(const struct line *line1, const struct line *line2) { if (line1->type != line2->type) return line1->type == LINE_TREE_DIR ? -1 : 1; return strcmp(tree_path(line1), tree_path(line2)); } +static const enum sort_field tree_sort_fields[] = { + ORDERBY_NAME, ORDERBY_DATE, ORDERBY_AUTHOR +}; +static struct sort_state tree_sort_state = SORT_STATE(tree_sort_fields); + +static int +tree_compare(const void *l1, const void *l2) +{ + const struct line *line1 = (const struct line *) l1; + const struct line *line2 = (const struct line *) l2; + const struct tree_entry *entry1 = ((const struct line *) l1)->data; + const struct tree_entry *entry2 = ((const struct line *) l2)->data; + + if (line1->type == LINE_TREE_HEAD) + return -1; + if (line2->type == LINE_TREE_HEAD) + return 1; + + switch (get_sort_field(tree_sort_state)) { + case ORDERBY_DATE: + 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)); + + case ORDERBY_NAME: + default: + return sort_order(tree_sort_state, tree_compare_entry(line1, line2)); + } +} + + static struct line * tree_entry(struct view *view, enum line_type type, const char *path, const char *mode, const char *id) @@ -3786,8 +4518,8 @@ tree_entry(struct view *view, enum line_type type, const char *path, static bool tree_read_date(struct view *view, char *text, bool *read_date) { - static char author_name[SIZEOF_STR]; - static struct tm author_time; + static const char *author_name; + static struct time author_time; if (!text && *read_date) { *read_date = FALSE; @@ -3800,21 +4532,24 @@ 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 (!run_io_rd(&io, log_file, FORMAT_NONE)) { + if (!view->lines) { + tree_entry(view, LINE_TREE_HEAD, opt_path, NULL, NULL); + report("Tree is empty"); + return TRUE; + } + + 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; } else if (*text == 'a' && get_line_type(text) == LINE_AUTHOR) { parse_author_line(text + STRING_SIZE("author "), - author_name, sizeof(author_name), &author_time); + &author_name, &author_time); } else if (*text == ':') { char *pos; @@ -3825,8 +4560,6 @@ tree_read_date(struct view *view, char *text, bool *read_date) if (!pos) return TRUE; text = pos + 1; - if (*opt_prefix && !strncmp(text, opt_prefix, strlen(opt_prefix))) - text += strlen(opt_prefix); if (*opt_path && !strncmp(text, opt_path, strlen(opt_path))) text += strlen(opt_path); pos = strchr(text, '/'); @@ -3837,18 +4570,18 @@ tree_read_date(struct view *view, char *text, bool *read_date) struct line *line = &view->line[i]; struct tree_entry *entry = line->data; - annotated += !!*entry->author; - if (*entry->author || strcmp(entry->name, text)) + annotated += !!entry->author; + if (entry->author || strcmp(entry->name, text)) continue; - string_copy(entry->author, author_name); - memcpy(&entry->time, &author_time, sizeof(entry->time)); + entry->author = author_name; + entry->time = author_time; line->dirty = 1; break; } if (annotated == view->lines) - kill_io(view->pipe); + io_kill(view->pipe); } return TRUE; } @@ -3869,7 +4602,7 @@ tree_read(struct view *view, char *text) if (textlen <= SIZEOF_TREE_ATTR) return FALSE; if (view->lines == 0 && - !tree_entry(view, LINE_TREE_PARENT, opt_path, NULL, NULL)) + !tree_entry(view, LINE_TREE_HEAD, opt_path, NULL, NULL)) return FALSE; /* Strip the path part ... */ @@ -3920,33 +4653,17 @@ tree_draw(struct view *view, struct line *line, unsigned int lineno) { struct tree_entry *entry = line->data; - if (line->type == LINE_TREE_PARENT) { + if (line->type == LINE_TREE_HEAD) { if (draw_text(view, line->type, "Directory path /", TRUE)) return TRUE; } else { - char mode[11] = "-r--r--r--"; - - if (S_ISDIR(entry->mode)) { - mode[3] = mode[6] = mode[9] = 'x'; - mode[0] = 'd'; - } - if (S_ISLNK(entry->mode)) - mode[0] = 'l'; - if (entry->mode & S_IWUSR) - mode[2] = 'w'; - if (entry->mode & S_IXUSR) - mode[3] = 'x'; - if (entry->mode & S_IXGRP) - mode[6] = 'x'; - if (entry->mode & S_IXOTH) - mode[9] = 'x'; - if (draw_field(view, LINE_TREE_MODE, mode, 11, TRUE)) + if (draw_mode(view, entry->mode)) 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)) @@ -3955,17 +4672,18 @@ 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 (!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); } @@ -3974,6 +4692,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: @@ -3989,12 +4708,17 @@ 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(TRUE, opt_file); + open_editor(opt_file); } return REQ_NONE; + case REQ_TOGGLE_SORT_FIELD: + case REQ_TOGGLE_SORT_ORDER: + sort_view(view, request, &tree_sort_state, tree_compare); + return REQ_NONE; + case REQ_PARENT: if (!*opt_path) { /* quit view if at top of tree */ @@ -4017,7 +4741,7 @@ tree_request(struct view *view, enum request request, struct line *line) switch (line->type) { case LINE_TREE_DIR: - /* Depending on whether it is a subdir or parent (updir?) link + /* Depending on whether it is a subdirectory or parent link * mangle the path buffer. */ if (line == &view->line[1] && *opt_path) { pop_tree_stack_entry(); @@ -4035,7 +4759,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; @@ -4050,6 +4774,20 @@ tree_request(struct view *view, enum request request, struct line *line) return REQ_NONE; } +static bool +tree_grep(struct view *view, struct line *line) +{ + struct tree_entry *entry = line->data; + const char *text[] = { + entry->name, + opt_author ? entry->author : "", + mkdate(&entry->time, opt_date), + NULL + }; + + return grep_text(view, text); +} + static void tree_select(struct view *view, struct line *line) { @@ -4066,6 +4804,32 @@ tree_select(struct view *view, struct line *line) string_copy_rev(view->ref, entry->id); } +static bool +tree_prepare(struct view *view) +{ + if (view->lines == 0 && opt_prefix[0]) { + char *pos = opt_prefix; + + while (pos && *pos) { + char *end = strchr(pos, '/'); + + if (end) + *end = 0; + push_tree_stack_entry(pos, 0); + pos = end; + if (end) { + *end = '/'; + pos++; + } + } + + } else if (strcmp(view->vid, view->id)) { + opt_path[0] = 0; + } + + return prepare_io(view, opt_cdup, view->ops->argv, TRUE); +} + static const char *tree_argv[SIZEOF_ARG] = { "git", "ls-tree", "%(commit)", "%(directory)", NULL }; @@ -4077,8 +4841,9 @@ static struct view_ops tree_ops = { tree_read, tree_draw, tree_request, - pager_grep, + tree_grep, tree_select, + tree_prepare, }; static bool @@ -4094,7 +4859,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); @@ -4127,37 +4892,39 @@ 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. */ - char author[75]; /* Author of the commit. */ - struct tm time; /* Date from the author ident. */ + 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. */ }; struct blame { struct blame_commit *commit; + unsigned long lineno; char text[1]; }; 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; } @@ -4213,14 +4980,16 @@ parse_blame_commit(struct view *view, const char *text, int *blamed) { struct blame_commit *commit; struct blame *blame; - const char *pos = text + SIZEOF_REV - 1; + const char *pos = text + SIZEOF_REV - 2; + size_t orig_lineno = 0; size_t lineno; size_t group; - if (strlen(text) <= SIZEOF_REV || *pos != ' ') + if (strlen(text) <= SIZEOF_REV || pos[1] != ' ') return NULL; - if (!parse_number(&pos, &lineno, 1, view->lines) || + if (!parse_number(&pos, &orig_lineno, 1, 9999999) || + !parse_number(&pos, &lineno, 1, view->lines) || !parse_number(&pos, &group, 1, view->lines - lineno + 1)) return NULL; @@ -4234,6 +5003,7 @@ parse_blame_commit(struct view *view, const char *text, int *blamed) blame = line->data; blame->commit = commit; + blame->lineno = orig_lineno + group - 1; line->dirty = 1; } @@ -4244,19 +5014,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 || !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; @@ -4264,6 +5034,9 @@ blame_read_file(struct view *view, const char *line, bool *read_file) size_t linelen = strlen(line); struct blame *blame = malloc(sizeof(*blame) + linelen); + if (!blame) + return FALSE; + blame->commit = NULL; strncpy(blame->text, line, linelen); blame->text[linelen] = 0; @@ -4288,7 +5061,6 @@ blame_read(struct view *view, char *line) { static struct blame_commit *commit = NULL; static int blamed = 0; - static time_t author_time; static bool read_file = TRUE; if (read_file) @@ -4313,24 +5085,13 @@ blame_read(struct view *view, char *line) view->lines ? blamed * 100 / view->lines : 0); } else if (match_blame_header("author ", &line)) { - string_ncopy(commit->author, line, strlen(line)); + commit->author = get_author(line); } else if (match_blame_header("author-time ", &line)) { - author_time = (time_t) atol(line); + parse_timesec(&commit->time, line); } else if (match_blame_header("author-tz ", &line)) { - long tz; - - tz = ('0' - line[1]) * 60 * 60 * 10; - tz += ('0' - line[2]) * 60 * 60; - tz += ('0' - line[3]) * 60; - tz += ('0' - line[4]) * 60; - - if (line[0] == '-') - tz = -tz; - - author_time -= tz; - gmtime_r(&author_time, &commit->time); + parse_timezone(&commit->time, line); } else if (match_blame_header("summary ", &line)) { string_ncopy(commit->title, line, strlen(line)); @@ -4350,8 +5111,9 @@ static bool blame_draw(struct view *view, struct line *line, unsigned int lineno) { struct blame *blame = line->data; - struct tm *time = NULL; + struct time *time = NULL; const char *id = NULL, *author = NULL; + char text[SIZEOF_STR]; if (blame->commit && *blame->commit->filename) { id = blame->commit->id; @@ -4371,47 +5133,89 @@ blame_draw(struct view *view, struct line *line, unsigned int lineno) if (draw_lineno(view, lineno)) return TRUE; - draw_text(view, LINE_DEFAULT, blame->text, TRUE); + string_expand(text, sizeof(text), blame->text, opt_tab_size); + draw_text(view, LINE_DEFAULT, text, TRUE); return TRUE; } static bool -check_blame_commit(struct blame *blame) +check_blame_commit(struct blame *blame, bool check_null_id) { if (!blame->commit) report("Commit data not loaded yet"); - else if (!strcmp(blame->commit->id, NULL_ID)) + else if (check_null_id && !strcmp(blame->commit->id, NULL_ID)) report("No commit exist for the selected line"); else return TRUE; return FALSE; } +static void +setup_blame_parent_line(struct view *view, struct blame *blame) +{ + const char *diff_tree_argv[] = { + "git", "diff-tree", "-U0", blame->commit->id, + "--", blame->commit->filename, NULL + }; + struct io io; + int parent_lineno = -1; + int blamed_lineno = -1; + char *line; + + if (!io_run(&io, IO_RD, NULL, diff_tree_argv)) + return; + + while ((line = io_get(&io, '\n', TRUE))) { + if (*line == '@') { + char *pos = strchr(line, '+'); + + parent_lineno = atoi(line + 4); + if (pos) + blamed_lineno = atoi(pos + 1); + + } else if (*line == '+' && parent_lineno != -1) { + if (blame->lineno == blamed_lineno - 1 && + !strcmp(blame->text, line + 1)) { + view->lineno = parent_lineno ? parent_lineno - 1 : 0; + break; + } + blamed_lineno++; + } + } + + 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) { case REQ_VIEW_BLAME: - if (check_blame_commit(blame)) { + if (check_blame_commit(blame, TRUE)) { string_copy(opt_ref, blame->commit->id); + string_copy(opt_file, blame->commit->filename); + if (blame->lineno) + view->lineno = blame->lineno; open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH); } break; case REQ_PARENT: - if (check_blame_commit(blame) && - select_commit_parent(blame->commit->id, opt_ref)) + if (check_blame_commit(blame, TRUE) && + select_commit_parent(blame->commit->id, opt_ref, + blame->commit->filename)) { + string_copy(opt_file, blame->commit->filename); + setup_blame_parent_line(view, blame); open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH); + } break; case REQ_ENTER: - if (!blame->commit) { - report("No commit loaded yet"); + if (!check_blame_commit(blame, FALSE)) break; - } if (view_is_displayed(VIEW(REQ_VIEW_DIFF)) && !strcmp(blame->commit->id, VIEW(REQ_VIEW_DIFF)->ref)) @@ -4431,7 +5235,7 @@ blame_request(struct view *view, enum request request, struct line *line) 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; } @@ -4455,27 +5259,16 @@ blame_grep(struct view *view, struct line *line) { struct blame *blame = line->data; struct blame_commit *commit = blame->commit; - regmatch_t pmatch; - -#define MATCH(text, on) \ - (on && *text && regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH) - - if (commit) { - char buf[DATE_COLS + 1]; - - if (MATCH(commit->title, 1) || - MATCH(commit->author, opt_author) || - MATCH(commit->id, opt_date)) - return TRUE; - - if (strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time) && - MATCH(buf, 1)) - return TRUE; - } - - return MATCH(blame->text, 1); + const char *text[] = { + blame->text, + commit ? commit->title : "", + commit ? commit->id : "", + commit && opt_author ? commit->author : "", + commit ? mkdate(&commit->time, opt_date) : "", + NULL + }; -#undef MATCH + return grep_text(view, text); } static void @@ -4504,6 +5297,209 @@ static struct view_ops blame_ops = { blame_select, }; +/* + * Branch backend + */ + +struct branch { + const char *author; /* Author of the last commit. */ + 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 +}; +static struct sort_state branch_sort_state = SORT_STATE(branch_sort_fields); + +static int +branch_compare(const void *l1, const void *l2) +{ + const struct branch *branch1 = ((const struct line *) l1)->data; + const struct branch *branch2 = ((const struct line *) l2)->data; + + switch (get_sort_field(branch_sort_state)) { + case ORDERBY_DATE: + 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)); + + case ORDERBY_NAME: + default: + return sort_order(branch_sort_state, strcmp(branch1->ref->name, branch2->ref->name)); + } +} + +static bool +branch_draw(struct view *view, struct line *line, unsigned int lineno) +{ + struct branch *branch = line->data; + enum line_type type = branch->ref->head ? LINE_MAIN_HEAD : LINE_DEFAULT; + + 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 == &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(); + open_view(view, REQ_VIEW_BRANCH, OPEN_REFRESH); + return REQ_NONE; + + case REQ_TOGGLE_SORT_FIELD: + case REQ_TOGGLE_SORT_ORDER: + sort_view(view, request, &branch_sort_state, branch_compare); + return REQ_NONE; + + case REQ_ENTER: + { + 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)) + report("Failed to load view of all branches"); + else + open_view(view, REQ_VIEW_MAIN, OPEN_PREPARED | OPEN_SPLIT); + return REQ_NONE; + } + default: + return request; + } +} + +static bool +branch_read(struct view *view, char *line) +{ + static char id[SIZEOF_REV]; + struct branch *reference; + size_t i; + + if (!line) + return TRUE; + + switch (get_line_type(line)) { + case LINE_COMMIT: + string_copy_rev(id, line + STRING_SIZE("commit ")); + return TRUE; + + case LINE_AUTHOR: + for (i = 0, reference = NULL; i < view->lines; i++) { + struct branch *branch = view->line[i].data; + + if (strcmp(branch->ref->id, id)) + continue; + + view->line[i].dirty = TRUE; + if (reference) { + branch->author = reference->author; + branch->time = reference->time; + continue; + } + + parse_author_line(line + STRING_SIZE("author "), + &branch->author, &branch->time); + reference = branch; + } + return TRUE; + + default: + return TRUE; + } + +} + +static bool +branch_open_visitor(void *data, const struct ref *ref) +{ + struct view *view = data; + struct branch *branch; + + if (ref->tag || ref->ltag || ref->remote) + return TRUE; + + branch = calloc(1, sizeof(*branch)); + if (!branch) + return FALSE; + + branch->ref = ref; + return !!add_line_data(view, branch, LINE_DEFAULT); +} + +static bool +branch_open(struct view *view) +{ + const char *branch_log[] = { + "git", "log", "--no-color", "--pretty=raw", + "--simplify-by-decoration", "--all", NULL + }; + + 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; + + return TRUE; +} + +static bool +branch_grep(struct view *view, struct line *line) +{ + struct branch *branch = line->data; + const char *text[] = { + branch->ref->name, + branch->author, + NULL + }; + + return grep_text(view, text); +} + +static void +branch_select(struct view *view, struct line *line) +{ + struct branch *branch = line->data; + + 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 = { + "branch", + NULL, + branch_open, + branch_read, + branch_draw, + branch_request, + branch_grep, + branch_select, +}; + /* * Status backend */ @@ -4528,6 +5524,8 @@ static enum line_type stage_line_type; static size_t stage_chunks; static int *stage_chunk; +DEFINE_ALLOCATOR(realloc_ints, int, 32) + /* This should work even for the "On branch" line. */ static inline bool status_has_none(struct view *view, struct line *line) @@ -4571,17 +5569,18 @@ status_get_diff(struct status *file, const char *buf, size_t bufsize) static bool status_run(struct view *view, const char *argv[], char status, enum line_type type) { - struct status *file = NULL; struct status *unmerged = NULL; char *buf; - struct io io = {}; + struct io io; - if (!run_io(&io, argv, NULL, IO_RD)) + if (!io_run(&io, IO_RD, opt_cdup, argv)) return FALSE; add_line_data(view, NULL, type); while ((buf = io_get(&io, 0, TRUE))) { + struct status *file = unmerged; + if (!file) { file = calloc(1, sizeof(*file)); if (!file || !add_line_data(view, file, type)) @@ -4594,7 +5593,7 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty if (status == 'A') string_copy(file->old.rev, NULL_ID); - } else if (!file->status) { + } else if (!file->status || file == unmerged) { if (!status_get_diff(file, buf, strlen(buf))) goto error_out; @@ -4602,21 +5601,13 @@ status_run(struct view *view, const char *argv[], char status, enum line_type ty if (!buf) break; - /* Collapse all 'M'odified entries that follow a - * associated 'U'nmerged entry. */ - if (file->status == 'U') { - unmerged = file; - - } else if (unmerged) { - int collapse = !strcmp(buf, unmerged->new.name); - + /* Collapse all modified entries that follow an + * associated unmerged entry. */ + if (unmerged == file) { + unmerged->status = 'U'; unmerged = NULL; - if (collapse) { - free(file); - file = NULL; - view->lines--; - continue; - } + } else if (file->status == 'U') { + unmerged = file; } } @@ -4641,14 +5632,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; } @@ -4663,7 +5654,7 @@ static const char *status_diff_files_argv[] = { }; 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[] = { @@ -4697,7 +5688,55 @@ status_restore(struct view *view) else if (view->offset + view->height <= view->lineno) view->offset = view->lineno - view->height + 1; - view->p_restore = FALSE; + view->p_restore = FALSE; +} + +static void +status_update_onbranch(void) +{ + static const char *paths[][2] = { + { "rebase-apply/rebasing", "Rebasing" }, + { "rebase-apply/applying", "Applying mailbox" }, + { "rebase-apply/", "Rebasing mailbox" }, + { "rebase-merge/interactive", "Interactive rebase" }, + { "rebase-merge/", "Rebase merge" }, + { "MERGE_HEAD", "Merging" }, + { "BISECT_LOG", "Bisecting" }, + { "HEAD", "On branch" }, + }; + char buf[SIZEOF_STR]; + struct stat stat; + int i; + + if (is_initial_commit()) { + string_copy(status_onbranch, "Initial commit"); + return; + } + + for (i = 0; i < ARRAY_SIZE(paths); i++) { + char *head = opt_head; + + if (!string_format(buf, "%s/%s", opt_git_dir, paths[i][0]) || + lstat(buf, &stat) < 0) + continue; + + if (!*opt_head) { + struct io io; + + 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/")) + head += STRING_SIZE("refs/heads/"); + } + } + + if (!string_format(status_onbranch, "%s %s", paths[i][1], head)) + string_copy(status_onbranch, opt_head); + return; + } + + string_copy(status_onbranch, "Not currently on any branch"); } /* First parse staged info using git-diff-index(1), then parse unstaged @@ -4709,14 +5748,9 @@ status_open(struct view *view) reset_view(view); add_line_data(view, NULL, LINE_STAT_HEAD); - if (is_initial_commit()) - string_copy(status_onbranch, "Initial commit"); - else if (!*opt_head) - string_copy(status_onbranch, "Not currently on any branch"); - else if (!string_format(status_onbranch, "On branch %s", opt_head)) - return FALSE; + 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)) @@ -4762,7 +5796,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno) case LINE_STAT_NONE: type = LINE_DEFAULT; - text = " (no files)"; + text = " (no files)"; break; case LINE_STAT_HEAD: @@ -4787,6 +5821,15 @@ status_draw(struct view *view, struct line *line, unsigned int lineno) return TRUE; } +static enum request +status_load_error(struct view *view, struct view *stage, const char *path) +{ + if (displayed_views() == 2 || display[current_view] != view) + maximize_view(view); + report("Failed to load '%s': %s", path, io_strerror(&stage->io)); + return REQ_NONE; +} + static enum request status_enter(struct view *view, struct line *line) { @@ -4813,8 +5856,8 @@ status_enter(struct view *view, struct line *line) "--", "/dev/null", newpath, NULL }; - if (!prepare_update(stage, no_head_diff_argv, opt_cdup, FORMAT_DASH)) - return REQ_QUIT; + if (!prepare_update(stage, no_head_diff_argv, opt_cdup)) + return status_load_error(view, stage, newpath); } else { const char *index_show_argv[] = { "git", "diff-index", "--root", "--patch-with-stat", @@ -4822,8 +5865,8 @@ status_enter(struct view *view, struct line *line) oldpath, newpath, NULL }; - if (!prepare_update(stage, index_show_argv, opt_cdup, FORMAT_DASH)) - return REQ_QUIT; + if (!prepare_update(stage, index_show_argv, opt_cdup)) + return status_load_error(view, stage, newpath); } if (status) @@ -4839,8 +5882,8 @@ status_enter(struct view *view, struct line *line) "-C", "-M", "--", oldpath, newpath, NULL }; - if (!prepare_update(stage, files_show_argv, opt_cdup, FORMAT_DASH)) - return REQ_QUIT; + if (!prepare_update(stage, files_show_argv, opt_cdup)) + return status_load_error(view, stage, newpath); if (status) info = "Unstaged changes to %s"; else @@ -4859,7 +5902,7 @@ status_enter(struct view *view, struct line *line) } if (!prepare_update_file(stage, newpath)) - return REQ_QUIT; + return status_load_error(view, stage, newpath); info = "Untracked file %s"; break; @@ -4870,7 +5913,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) { @@ -4925,13 +5968,11 @@ status_update_prepare(struct io *io, enum line_type type) switch (type) { case LINE_STAT_STAGED: - return run_io(io, staged_argv, opt_cdup, IO_WR); + return io_run(io, IO_WR, opt_cdup, staged_argv); 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, IO_WR, opt_cdup, others_argv); default: die("line type %d not handled in switch", type); @@ -4970,25 +6011,26 @@ 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)) return FALSE; result = status_update_write(&io, status, type); - done_io(&io); - return result; + return io_done(&io) && result; } static bool status_update_files(struct view *view, struct line *line) { - struct io io = {}; + char buf[sizeof(view->ref)]; + struct io io; bool result = TRUE; struct line *pos = view->line + view->lines; int files = 0; int file, done; + int cursor_y = -1, cursor_x = -1; if (!status_update_prepare(&io, line->type)) return FALSE; @@ -4996,7 +6038,9 @@ status_update_files(struct view *view, struct line *line) for (pos = line; pos < view->line + view->lines && pos->data; pos++) files++; - for (file = 0, done = 0; result && file < files; line++, file++) { + string_copy(buf, view->ref); + getsyx(cursor_y, cursor_x); + for (file = 0, done = 5; result && file < files; line++, file++) { int almost_done = file * 100 / files; if (almost_done > done) { @@ -5004,12 +6048,14 @@ status_update_files(struct view *view, struct line *line) string_format(view->ref, "updating file %u of %u (%d%% done)", file, files, done); update_view_title(view); + setsyx(cursor_y, cursor_x); + doupdate(); } result = status_update_write(&io, line->data, line->type); } + string_copy(view->ref, buf); - done_io(&io); - return result; + return io_done(&io) && result; } static bool @@ -5052,17 +6098,36 @@ status_revert(struct status *status, enum line_type type, bool has_none) } else { report("Cannot revert changes to multiple files"); } - return FALSE; - } else { + } else if (prompt_yesno("Are you sure you want to revert changes?")) { + char mode[10] = "100644"; + const char *reset_argv[] = { + "git", "update-index", "--cacheinfo", mode, + status->old.rev, status->old.name, NULL + }; const char *checkout_argv[] = { "git", "checkout", "--", status->old.name, NULL }; - if (!prompt_yesno("Are you sure you want to overwrite any changes?")) - return FALSE; - return 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 @@ -5097,22 +6162,19 @@ status_request(struct view *view, enum request request, struct line *line) 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: /* After returning the status view has been split to * show the stage view. No further reloading is * necessary. */ - status_enter(view, line); - return REQ_NONE; + return status_enter(view, line); case REQ_REFRESH: /* Simply reload the view. */ @@ -5165,42 +6227,27 @@ status_select(struct view *view, struct line *line) 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 status_grep(struct view *view, struct line *line) { struct status *status = line->data; - enum { S_STATUS, S_NAME, S_END } state; - char buf[2] = "?"; - regmatch_t pmatch; - if (!status) - return FALSE; - - for (state = S_STATUS; state < S_END; state++) { - const char *text; - - switch (state) { - case S_NAME: text = status->new.name; break; - case S_STATUS: - buf[0] = status->status; - text = buf; - break; - - default: - return FALSE; - } + if (status) { + const char buf[2] = { status->status, 0 }; + const char *text[] = { status->new.name, buf, NULL }; - if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH) - return TRUE; + return grep_text(view, text); } return FALSE; @@ -5251,7 +6298,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); @@ -5264,15 +6311,15 @@ stage_apply_chunk(struct view *view, struct line *chunk, bool revert) 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, IO_WR, opt_cdup, apply_argv)) 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; } @@ -5342,21 +6389,15 @@ stage_next(struct view *view, struct line *line) int i; if (!stage_chunks) { - static size_t alloc = 0; - int *tmp; - for (line = view->line; line < view->line + view->lines; line++) { if (line->type != LINE_DIFF_CHUNK) continue; - tmp = realloc_items(stage_chunk, &alloc, - stage_chunks, sizeof(*tmp)); - if (!tmp) { + if (!realloc_ints(&stage_chunk, stage_chunks, 1)) { report("Allocation failure"); return; } - stage_chunk = tmp; stage_chunk[stage_chunks++] = line - view->line; } } @@ -5389,7 +6430,7 @@ stage_request(struct view *view, enum request request, struct line *line) 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); @@ -5403,7 +6444,7 @@ stage_request(struct view *view, enum request request, struct line *line) return REQ_NONE; } - open_editor(stage_status.status != '?', stage_status.new.name); + open_editor(stage_status.new.name); break; case REQ_REFRESH: @@ -5425,7 +6466,7 @@ stage_request(struct view *view, enum request request, struct line *line) } VIEW(REQ_VIEW_STATUS)->p_restore = TRUE; - open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD | OPEN_NOMAXIMIZE); + open_view(view, REQ_VIEW_STATUS, OPEN_REFRESH); /* Check whether the staged entry still exists, and close the * stage view if it doesn't. */ @@ -5469,9 +6510,9 @@ static struct view_ops stage_ops = { struct commit { char id[SIZEOF_REV]; /* SHA1 ID. */ char title[128]; /* First line of the commit message. */ - char author[75]; /* Author of the commit. */ - struct tm time; /* Date from the author ident. */ - struct ref **refs; /* Repository references. */ + const char *author; /* Author of the commit. */ + 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. */ bool has_parents; /* Rewritten --parents seen. */ @@ -5597,9 +6638,7 @@ draw_rev_graph(struct rev_graph *graph) 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++) { @@ -5688,7 +6727,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 @@ -5696,7 +6736,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno) { struct commit *commit = line->data; - if (!*commit->author) + if (!commit->author) return FALSE; if (opt_date && draw_date(view, &commit->time)) @@ -5710,32 +6750,33 @@ main_draw(struct view *view, struct line *line, unsigned int lineno) return TRUE; if (opt_show_refs && commit->refs) { - size_t i = 0; + size_t i; - do { + for (i = 0; i < commit->refs->size; i++) { + struct ref *ref = commit->refs->refs[i]; enum line_type type; - if (commit->refs[i]->head) + if (ref->head) type = LINE_MAIN_HEAD; - else if (commit->refs[i]->ltag) + else if (ref->ltag) type = LINE_MAIN_LOCAL_TAG; - else if (commit->refs[i]->tag) + else if (ref->tag) type = LINE_MAIN_TAG; - else if (commit->refs[i]->tracked) + else if (ref->tracked) type = LINE_MAIN_TRACKED; - else if (commit->refs[i]->remote) + else if (ref->remote) type = LINE_MAIN_REMOTE; else type = LINE_MAIN_REF; if (draw_text(view, type, "[", TRUE) || - draw_text(view, type, commit->refs[i]->name, TRUE) || + draw_text(view, type, ref->name, TRUE) || draw_text(view, type, "]", TRUE)) return TRUE; if (draw_text(view, LINE_DEFAULT, " ", TRUE)) return TRUE; - } while (commit->refs[i++]->next); + } } draw_text(view, LINE_DEFAULT, commit->title, TRUE); @@ -5753,12 +6794,12 @@ 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; view->line[view->lines - 1].dirty = 1; - if (!*commit->author) { + if (!commit->author) { view->lines--; free(commit); graph->commit = NULL; @@ -5784,7 +6825,7 @@ main_read(struct view *view, char *line) } string_copy_rev(commit->id, line); - commit->refs = get_refs(commit->id); + commit->refs = get_ref_list(commit->id); graph->commit = commit; add_line_data(view, commit, LINE_MAIN_COMMIT); @@ -5809,8 +6850,7 @@ main_read(struct view *view, char *line) case LINE_AUTHOR: parse_author_line(line + STRING_SIZE("author "), - commit->author, sizeof(commit->author), - &commit->time); + &commit->author, &commit->time); update_rev_graph(view, graph); graph = graph->next; break; @@ -5834,7 +6874,7 @@ main_read(struct view *view, char *line) /* FIXME: More graceful handling of titles; append "..." to * shortened titles, etc. */ - string_ncopy(commit->title, line, strlen(line)); + string_expand(commit->title, sizeof(commit->title), line, 1); view->line[view->lines - 1].dirty = 1; } @@ -5844,7 +6884,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: @@ -5862,17 +6902,18 @@ main_request(struct view *view, enum request request, struct line *line) } static bool -grep_refs(struct ref **refs, regex_t *regex) +grep_refs(struct ref_list *list, regex_t *regex) { regmatch_t pmatch; - size_t i = 0; + size_t i; - if (!refs) + if (!opt_show_refs || !list) return FALSE; - do { - if (regexec(regex, refs[i]->name, 1, &pmatch, 0) != REG_NOMATCH) + + for (i = 0; i < list->size; i++) { + if (regexec(regex, list->refs[i]->name, 1, &pmatch, 0) != REG_NOMATCH) return TRUE; - } while (refs[i++]->next); + } return FALSE; } @@ -5881,42 +6922,14 @@ static bool main_grep(struct view *view, struct line *line) { struct commit *commit = line->data; - enum { S_TITLE, S_AUTHOR, S_DATE, S_REFS, S_END } state; - char buf[DATE_COLS + 1]; - regmatch_t pmatch; - - for (state = S_TITLE; state < S_END; state++) { - char *text; - - switch (state) { - case S_TITLE: text = commit->title; break; - case S_AUTHOR: - if (!opt_author) - continue; - text = commit->author; - break; - case S_DATE: - if (!opt_date) - continue; - if (!strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time)) - continue; - text = buf; - break; - case S_REFS: - if (!opt_show_refs) - continue; - if (grep_refs(commit->refs, view->regex) == TRUE) - return TRUE; - continue; - default: - return FALSE; - } - - if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH) - return TRUE; - } + const char *text[] = { + commit->title, + opt_author ? commit->author : "", + mkdate(&commit->time, opt_date), + NULL + }; - return FALSE; + return grep_text(view, text) || grep_refs(commit->refs, view->regex); } static void @@ -5940,159 +6953,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 . Origin file is - * src/intl/charset.c from the utf8 branch commit elinks-0.11.0-g31f2c28. - */ - -/* I've (over)annotated a lot of code snippets because I am not entirely - * confident that the approach taken by this small UTF-8 interface is correct. - * --jonas */ - -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 *string, int *width, size_t max_width, int *trimmed, bool reserve) -{ - const char *start = string; - 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); - *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 = bytes; - last_ucwidth = ucwidth; - } - - return string - start; -} - - /* * Status management */ @@ -6100,6 +6960,10 @@ utf8_length(const char *string, int *width, size_t max_width, int *trimmed, bool /* Whether or not the curses interface has been initialized. */ static bool cursed = FALSE; +/* Terminal hacks and workarounds. */ +static bool use_scroll_redrawwin; +static bool use_scroll_status_wclear; + /* The status window is used for polling keystrokes. */ static WINDOW *status_win; @@ -6138,6 +7002,8 @@ report(const char *msg, ...) va_start(args, msg); wmove(status_win, 0, 0); + if (view->has_scrolled && use_scroll_status_wclear) + wclear(status_win); if (*msg) { vwprintw(status_win, msg, args); status_empty = FALSE; @@ -6153,20 +7019,10 @@ report(const char *msg, ...) 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) { + const char *term; int x, y; /* Initialize the curses library */ @@ -6184,7 +7040,7 @@ init_display(void) if (!cursed) die("Failed to initialize curses"); - nonl(); /* Tell curses not to do NL->CR/NL on output */ + nonl(); /* Disable conversion and detect newlines from input. */ cbreak(); /* Take input chars one at a time, no wait for \n */ noecho(); /* Don't echo input */ leaveok(stdscr, FALSE); @@ -6202,8 +7058,26 @@ 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")) { + /* In the gnome-terminal-emulator, the message from + * scrolling up one line when impossible followed by + * scrolling down one line causes corruption of the + * status line. This is fixed by calling wclear. */ + use_scroll_status_wclear = TRUE; + use_scroll_redrawwin = FALSE; + + } else if (term && !strcmp(term, "xrvt-xpm")) { + /* No problems with full optimizations in xrvt-(unicode) + * and aterm. */ + use_scroll_status_wclear = use_scroll_redrawwin = FALSE; + + } else { + /* When scrolling in (u)xterm the last line in the + * scrolling direction will update slowly. */ + use_scroll_redrawwin = TRUE; + use_scroll_status_wclear = FALSE; } } @@ -6217,8 +7091,17 @@ get_input(int prompt_position) input_mode = TRUE; while (TRUE) { - foreach_view (view, i) + bool loading = FALSE; + + foreach_view (view, i) { update_view(view); + if (view_is_displayed(view) && view->has_scrolled && + use_scroll_redrawwin) + redrawwin(view->win); + view->has_scrolled = FALSE; + if (view->pipe) + loading = TRUE; + } /* Update the cursor position. */ if (prompt_position) { @@ -6234,6 +7117,7 @@ get_input(int prompt_position) /* Refresh, accept single keystroke of input */ doupdate(); + nodelay(status_win, loading); key = wgetch(status_win); /* wgetch() with nodelay() enabled returns ERR when @@ -6334,44 +7218,96 @@ prompt_yesno(const char *prompt) if (!string_format(prompt2, "%s [Yy/Nn]", prompt)) return FALSE; - return !!prompt_input(prompt2, prompt_yesno_handler, NULL); -} + return !!prompt_input(prompt2, prompt_yesno_handler, NULL); +} + +static enum input_status +read_prompt_handler(void *data, char *buf, int c) +{ + return isprint(c) ? INPUT_OK : INPUT_SKIP; +} + +static char * +read_prompt(const char *prompt) +{ + return prompt_input(prompt, read_prompt_handler, NULL); +} + +static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected) +{ + enum input_status status = INPUT_OK; + int size = 0; + + while (items[size].text) + size++; + + while (status == INPUT_OK) { + const struct menu_item *item = &items[*selected]; + int key; + int i; + + mvwprintw(status_win, 0, 0, "%s (%d of %d) ", + prompt, *selected + 1, size); + if (item->hotkey) + wprintw(status_win, "[%c] ", (char) item->hotkey); + wprintw(status_win, "%s", item->text); + wclrtoeol(status_win); + + key = get_input(COLS - 1); + switch (key) { + case KEY_RETURN: + case KEY_ENTER: + case '\n': + status = INPUT_STOP; + break; + + case KEY_LEFT: + case KEY_UP: + *selected = *selected - 1; + if (*selected < 0) + *selected = size - 1; + break; + + case KEY_RIGHT: + case KEY_DOWN: + *selected = (*selected + 1) % size; + break; + + case KEY_ESC: + status = INPUT_CANCEL; + break; + + default: + for (i = 0; items[i].text; i++) + if (items[i].hotkey == key) { + *selected = i; + status = INPUT_STOP; + break; + } + } + } -static enum input_status -read_prompt_handler(void *data, char *buf, int c) -{ - return isprint(c) ? INPUT_OK : INPUT_SKIP; -} + /* Clear the status window */ + status_empty = FALSE; + report(""); -static char * -read_prompt(const char *prompt) -{ - return prompt_input(prompt, read_prompt_handler, NULL); + return status != INPUT_CANCEL; } /* * Repository properties */ -static int -git_properties(const char **argv, const char *separators, - int (*read_property)(char *, size_t, char *, size_t)) -{ - struct io io = {}; - - if (init_io_rd(&io, argv, NULL, FORMAT_NONE)) - return read_properties(&io, separators, read_property); - return ERR; -} - -static struct ref *refs = NULL; -static size_t refs_alloc = 0; +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; -/* Id <-> ref store */ -static struct ref ***id_refs = NULL; -static size_t id_refs_alloc = 0; -static size_t id_refs_size = 0; +DEFINE_ALLOCATOR(realloc_refs, struct ref *, 256) +DEFINE_ALLOCATOR(realloc_refs_list, struct ref *, 8) +DEFINE_ALLOCATOR(realloc_ref_lists, struct ref_list *, 8) static int compare_refs(const void *ref1_, const void *ref2_) @@ -6392,76 +7328,69 @@ compare_refs(const void *ref1_, const void *ref2_) return strcmp(ref1->name, ref2->name); } -static struct ref ** -get_refs(const char *id) +static void +foreach_ref(bool (*visitor)(void *data, const struct ref *ref), void *data) { - struct ref ***tmp_id_refs; - struct ref **ref_list = NULL; - size_t ref_list_alloc = 0; - size_t ref_list_size = 0; size_t i; - for (i = 0; i < id_refs_size; i++) - if (!strcmp(id, id_refs[i][0]->id)) - return id_refs[i]; - - tmp_id_refs = realloc_items(id_refs, &id_refs_alloc, id_refs_size + 1, - sizeof(*id_refs)); - if (!tmp_id_refs) - return NULL; - - id_refs = tmp_id_refs; + for (i = 0; i < refs_size; i++) + if (!visitor(data, refs[i])) + break; +} - for (i = 0; i < refs_size; i++) { - struct ref **tmp; +static struct ref * +get_ref_head() +{ + return refs_head; +} - if (strcmp(id, refs[i].id)) - continue; +static struct ref_list * +get_ref_list(const char *id) +{ + struct ref_list *list; + size_t i; - tmp = realloc_items(ref_list, &ref_list_alloc, - ref_list_size + 1, sizeof(*ref_list)); - if (!tmp) { - if (ref_list) - free(ref_list); - return NULL; - } + for (i = 0; i < ref_lists_size; i++) + if (!strcmp(id, ref_lists[i]->id)) + return ref_lists[i]; - ref_list = tmp; - ref_list[ref_list_size] = &refs[i]; - /* XXX: The properties of the commit chains ensures that we can - * safely modify the shared ref. The repo references will - * always be similar for the same id. */ - ref_list[ref_list_size]->next = 1; + if (!realloc_ref_lists(&ref_lists, ref_lists_size, 1)) + return NULL; + list = calloc(1, sizeof(*list)); + if (!list) + return NULL; - ref_list_size++; + for (i = 0; i < refs_size; i++) { + if (!strcmp(id, refs[i]->id) && + realloc_refs_list(&list->refs, list->size, 1)) + list->refs[list->size++] = refs[i]; } - if (ref_list) { - qsort(ref_list, ref_list_size, sizeof(*ref_list), compare_refs); - ref_list[ref_list_size - 1]->next = 0; - id_refs[id_refs_size++] = ref_list; + if (!list->refs) { + free(list); + return NULL; } - return ref_list; + qsort(list->refs, list->size, sizeof(*list->refs), compare_refs); + ref_lists[ref_lists_size++] = list; + return list; } static int read_ref(char *id, size_t idlen, char *name, size_t namelen) { - struct ref *ref; + struct ref *ref = NULL; bool tag = FALSE; bool ltag = FALSE; bool remote = FALSE; bool tracked = FALSE; - bool check_replace = FALSE; bool head = FALSE; + int from = 0, to = refs_size - 1; if (!prefixcmp(name, "refs/tags/")) { if (!suffixcmp(name, namelen, "^{}")) { namelen -= 3; name[namelen] = 0; - if (refs_size > 0 && refs[refs_size - 1].ltag == TRUE) - check_replace = TRUE; } else { ltag = TRUE; } @@ -6479,34 +7408,49 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) } 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 (check_replace && !strcmp(name, refs[refs_size - 1].name)) { - /* it's an annotated tag, replace the previous sha1 with the - * resolved commit id; relies on the fact git-ls-remote lists - * the commit id of an annotated tag right before the commit id - * it points to. */ - refs[refs_size - 1].ltag = ltag; - string_copy_rev(refs[refs_size - 1].id, id); + /* If we are reloading or it's an annotated tag, replace the + * previous SHA1 with the resolved commit id; relies on the fact + * git-ls-remote lists the commit id of an annotated tag right + * before the commit id it points to. */ + while (from <= to) { + size_t pos = (to + from) / 2; + int cmp = strcmp(name, refs[pos]->name); - return OK; + if (!cmp) { + ref = refs[pos]; + break; + } + + if (cmp < 0) + to = pos - 1; + else + from = pos + 1; } - refs = realloc_items(refs, &refs_alloc, refs_size + 1, sizeof(*refs)); - if (!refs) - return ERR; - ref = &refs[refs_size++]; - ref->name = malloc(namelen + 1); - if (!ref->name) - return ERR; + if (!ref) { + if (!realloc_refs(&refs, refs_size, 1)) + return ERR; + ref = calloc(1, sizeof(*ref) + namelen); + if (!ref) + return ERR; + memmove(refs + from + 1, refs + from, + (refs_size - from) * sizeof(*refs)); + refs[from] = ref; + strncpy(ref->name, name, namelen); + refs_size++; + } - strncpy(ref->name, name, namelen); - ref->name[namelen] = 0; ref->head = head; ref->tag = tag; ref->ltag = ltag; @@ -6514,31 +7458,129 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) ref->tracked = tracked; string_copy_rev(ref->id, id); + if (head) + refs_head = ref; return OK; } static int load_refs(void) { + const char *head_argv[] = { + "git", "symbolic-ref", "HEAD", NULL + }; static const char *ls_remote_argv[SIZEOF_ARG] = { - "git", "ls-remote", ".", NULL + "git", "ls-remote", opt_git_dir, NULL }; static bool init = FALSE; + 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; - while (refs_size > 0) - free(refs[--refs_size].name); - while (id_refs_size > 0) - free(id_refs[--id_refs_size]); + 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 (io_run_load(ls_remote_argv, "\t", read_ref) == ERR) + return ERR; + + /* Update the ref lists to reflect changes. */ + for (i = 0; i < ref_lists_size; i++) { + struct ref_list *list = ref_lists[i]; + size_t old, new; + + for (old = new = 0; old < list->size; old++) + if (!strcmp(list->id, list->refs[old]->id)) + list->refs[new++] = list->refs[old]; + list->size = new; + } + + return OK; +} + +static void +set_remote_branch(const char *name, const char *value, size_t valuelen) +{ + if (!strcmp(name, ".remote")) { + string_ncopy(opt_remote, value, valuelen); + + } else if (*opt_remote && !strcmp(name, ".merge")) { + size_t from = strlen(opt_remote); + + if (!prefixcmp(value, "refs/heads/")) + value += STRING_SIZE("refs/heads/"); + + if (!string_format_from(opt_remote, &from, "/%s", value)) + opt_remote[0] = 0; + } +} + +static void +set_repo_config_option(char *name, char *value, int (*cmd)(int, const char **)) +{ + const char *argv[SIZEOF_ARG] = { name, "=" }; + int argc = 1 + (cmd == option_set_command); + int error = ERR; + + if (!argv_from_string(argv, &argc, value)) + config_msg = "Too many option arguments"; + else + error = cmd(argc, argv); + + if (error == ERR) + warn("Option 'tig.%s': %s", name, config_msg); +} + +static bool +set_environment_variable(const char *name, const char *value) +{ + size_t len = strlen(name) + 1 + strlen(value) + 1; + char *env = malloc(len); + + if (env && + string_nformat(env, len, NULL, "%s=%s", name, value) && + putenv(env) == 0) + return TRUE; + free(env); + return FALSE; +} - return git_properties(ls_remote_argv, "\t", read_ref); +static void +set_work_tree(const char *value) +{ + char cwd[SIZEOF_STR]; + + if (!getcwd(cwd, sizeof(cwd))) + die("Failed to get cwd path: %s", strerror(errno)); + if (chdir(opt_git_dir) < 0) + die("Failed to chdir(%s): %s", strerror(errno)); + if (!getcwd(opt_git_dir, sizeof(opt_git_dir))) + die("Failed to get git path: %s", strerror(errno)); + if (chdir(cwd) < 0) + die("Failed to chdir(%s): %s", cwd, strerror(errno)); + if (chdir(value) < 0) + die("Failed to chdir(%s): %s", value, strerror(errno)); + if (!getcwd(cwd, sizeof(cwd))) + die("Failed to get cwd path: %s", strerror(errno)); + if (!set_environment_variable("GIT_WORK_TREE", cwd)) + die("Failed to set GIT_WORK_TREE to '%s'", cwd); + if (!set_environment_variable("GIT_DIR", opt_git_dir)) + die("Failed to set GIT_DIR to '%s'", opt_git_dir); + opt_is_inside_work_tree = TRUE; } static int @@ -6547,30 +7589,24 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen if (!strcmp(name, "i18n.commitencoding")) string_ncopy(opt_encoding, value, valuelen); - if (!strcmp(name, "core.editor")) + else if (!strcmp(name, "core.editor")) string_ncopy(opt_editor, value, valuelen); - /* branch..remote */ - if (*opt_head && - !strncmp(name, "branch.", 7) && - !strncmp(name + 7, opt_head, strlen(opt_head)) && - !strcmp(name + 7 + strlen(opt_head), ".remote")) - string_ncopy(opt_remote, value, valuelen); + else if (!strcmp(name, "core.worktree")) + set_work_tree(value); - if (*opt_head && *opt_remote && - !strncmp(name, "branch.", 7) && - !strncmp(name + 7, opt_head, strlen(opt_head)) && - !strcmp(name + 7 + strlen(opt_head), ".merge")) { - size_t from = strlen(opt_remote); + else if (!prefixcmp(name, "tig.color.")) + set_repo_config_option(name + 10, value, option_color_command); - if (!prefixcmp(value, "refs/heads/")) { - value += STRING_SIZE("refs/heads/"); - valuelen -= STRING_SIZE("refs/heads/"); - } + else if (!prefixcmp(name, "tig.bind.")) + set_repo_config_option(name + 9, value, option_bind_command); - if (!string_format_from(opt_remote, &from, "/%s", value)) - opt_remote[0] = 0; - } + else if (!prefixcmp(name, "tig.")) + set_repo_config_option(name + 4, value, option_set_command); + + else if (*opt_head && !prefixcmp(name, "branch.") && + !strncmp(name + 7, opt_head, strlen(opt_head))) + set_remote_branch(name + 7 + strlen(opt_head), value, valuelen); return OK; } @@ -6578,9 +7614,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 git_properties(config_list_argv, "=", read_repo_config_option); + return io_run_load(config_list_argv, "=", read_repo_config_option); } static int @@ -6610,62 +7646,12 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen) static int load_repo_info(void) { - const char *head_argv[] = { - "git", "symbolic-ref", "HEAD", NULL - }; const char *rev_parse_argv[] = { "git", "rev-parse", "--git-dir", "--is-inside-work-tree", "--show-cdup", "--show-prefix", NULL }; - if (run_io_buf(head_argv, opt_head, sizeof(opt_head))) { - chomp_string(opt_head); - if (!prefixcmp(opt_head, "refs/heads/")) { - char *offset = opt_head + STRING_SIZE("refs/heads/"); - - memmove(opt_head, offset, strlen(offset) + 1); - } - } - - return git_properties(rev_parse_argv, "=", read_repo_info); -} - -static int -read_properties(struct io *io, const char *separators, - int (*read_property)(char *, size_t, char *, size_t)) -{ - char *name; - int state = OK; - - if (!start_io(io)) - return ERR; - - while (state == OK && (name = io_get(io, '\n', TRUE))) { - char *value; - size_t namelen; - size_t valuelen; - - name = chomp_string(name); - namelen = strcspn(name, separators); - - if (name[namelen]) { - name[namelen] = 0; - value = chomp_string(name + namelen + 1); - valuelen = strlen(value); - - } else { - value = ""; - valuelen = 0; - } - - state = read_property(name, namelen, value, valuelen); - } - - if (state != ERR && io_error(io)) - state = ERR; - done_io(io); - - return state; + return io_run_load(rev_parse_argv, "=", read_repo_info); } @@ -6673,6 +7659,19 @@ read_properties(struct io *io, const char *separators, * Main */ +static const char usage[] = +"tig " TIG_VERSION " (" __DATE__ ")\n" +"\n" +"Usage: tig [options] [revs] [--] [paths]\n" +" or: tig show [options] [revs] [--] [paths]\n" +" or: tig blame [rev] path\n" +" or: tig status\n" +" or: tig < [git command output]\n" +"\n" +"Options:\n" +" -v, --version Show version and exit\n" +" -h, --help Show help message and exit"; + static void __NORETURN quit(int sig) { @@ -6710,20 +7709,127 @@ 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; + const char **filter_argv = NULL; + int i; + + if (!isatty(STDIN_FILENO)) { + io_open(&VIEW(REQ_VIEW_PAGER)->io, ""); + return REQ_VIEW_PAGER; + } + + if (argc <= 1) + return REQ_VIEW_MAIN; + + subcommand = argv[1]; + if (!strcmp(subcommand, "status")) { + if (argc > 2) + warn("ignoring arguments after `%s'", subcommand); + return REQ_VIEW_STATUS; + + } else if (!strcmp(subcommand, "blame")) { + if (argc <= 2 || argc > 4) + die("invalid number of options to blame\n\n%s", usage); + + i = 2; + if (argc == 4) { + string_ncopy(opt_ref, argv[i], strlen(argv[i])); + i++; + } + + string_ncopy(opt_file, argv[i], strlen(argv[i])); + return REQ_VIEW_BLAME; + + } else if (!strcmp(subcommand, "show")) { + request = REQ_VIEW_DIFF; + + } else { + subcommand = NULL; + } + + for (i = 1 + !!subcommand; i < argc; i++) { + const char *opt = argv[i]; + + 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); + quit(0); + + } 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; + } + + if (!argv_append(&filter_argv, opt)) + die("command too long"); + } + + if (filter_argv) + filter_options(filter_argv); + + return request; +} + int main(int argc, const char *argv[]) { - const char **run_argv = NULL; + const char *codeset = "UTF-8"; + enum request request = parse_options(argc, argv); struct view *view; - enum request request; size_t i; signal(SIGINT, quit); + 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) @@ -6735,40 +7841,37 @@ main(int argc, const char *argv[]) if (load_git_config() == ERR) die("Failed to load repo config."); - request = parse_options(argc, argv, &run_argv); - if (request == REQ_NONE) - return 0; - /* Require a git repository unless when running in pager mode. */ 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"); } 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_VIEW_PAGER || run_argv) { - if (request == REQ_VIEW_PAGER) - io_open(&VIEW(request)->io, ""); - else if (!prepare_update(VIEW(request), run_argv, NULL, FORMAT_NONE)) - die("Failed to format arguments"); - open_view(NULL, request, OPEN_PREPARED); - request = REQ_NONE; - } - while (view_driver(display[current_view], request)) { int key = get_input(0); @@ -6778,11 +7881,25 @@ 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(":"); - if (cmd) { + if (cmd && isdigit(*cmd)) { + int lineno = view->lineno + 1; + + if (parse_int(&lineno, cmd, 1, view->lines + 1) == OK) { + select_view_line(view, lineno - 1); + report(""); + } else { + report("Unable to parse '%s' as a line number", cmd); + } + + } else if (cmd) { struct view *next = VIEW(REQ_VIEW_PAGER); const char *argv[SIZEOF_ARG] = { "git" }; int argc = 1; @@ -6794,7 +7911,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); @@ -6812,6 +7929,10 @@ main(int argc, const char *argv[]) if (search) string_ncopy(opt_search, search, strlen(search)); + else if (*opt_search) + request = request == REQ_SEARCH ? + REQ_FIND_NEXT : + REQ_FIND_PREV; else request = REQ_NONE; break;