* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-/**
- * TIG(1)
- * ======
- *
- * NAME
- * ----
- * tig - text-mode interface for git
- *
- * SYNOPSIS
- * --------
- * [verse]
- * tig [options]
- * tig [options] [--] [git log options]
- * tig [options] log [git log options]
- * tig [options] diff [git diff options]
- * tig [options] show [git show options]
- * tig [options] < [git command output]
- *
- * DESCRIPTION
- * -----------
- * Browse changes in a git repository. Additionally, tig(1) can also act
- * as a pager for output of various git commands.
- *
- * When browsing repositories, tig(1) uses the underlying git commands
- * to present the user with various views, such as summarized commit log
- * and showing the commit with the log message, diffstat, and the diff.
- *
- * Using tig(1) as a pager, it will display input from stdin and try
- * to colorize it.
- **/
#ifndef VERSION
-#define VERSION "tig-0.3"
+#define VERSION "tig-0.5.git"
#endif
#ifndef DEBUG
#include <unistd.h>
#include <time.h>
+#include <sys/types.h>
+#include <regex.h>
+
+#include <locale.h>
+#include <langinfo.h>
+#include <iconv.h>
+
#include <curses.h>
-static void die(const char *err, ...);
+#if __GNUC__ >= 3
+#define __NORETURN __attribute__((__noreturn__))
+#else
+#define __NORETURN
+#endif
+
+static void __NORETURN die(const char *err, ...);
static void report(const char *msg, ...);
static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, int, char *, int));
static void set_nonblocking_input(bool loading);
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define STRING_SIZE(x) (sizeof(x) - 1)
+#define SIZEOF_STR 1024 /* Default string size. */
#define SIZEOF_REF 256 /* Size of symbolic or SHA1 ID. */
-#define SIZEOF_CMD 1024 /* Size of command buffer. */
+#define SIZEOF_REV 41 /* Holds a SHA-1 and an ending NUL */
+#define SIZEOF_REVGRAPH 19 /* Size of revision ancestry graphics. */
/* This color name can be used to refer to the default term colors. */
#define COLOR_DEFAULT (-1)
-#define TIG_HELP "(d)iff, (l)og, (m)ain, (q)uit, (h)elp"
+#define ICONV_NONE ((iconv_t) -1)
/* The format and size of the date column in the main view. */
#define DATE_FORMAT "%Y-%m-%d %H:%M"
#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#define TIG_LS_REMOTE \
+ "git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
+
+#define TIG_DIFF_CMD \
+ "git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null"
+
+#define TIG_LOG_CMD \
+ "git log --cc --stat -n100 %s 2>/dev/null"
+
+#define TIG_MAIN_CMD \
+ "git log --topo-order --pretty=raw %s 2>/dev/null"
+
+#define TIG_TREE_CMD \
+ "git ls-tree %s %s"
+
+#define TIG_BLOB_CMD \
+ "git cat-file blob %s"
+
+/* XXX: Needs to be defined to the empty string. */
+#define TIG_HELP_CMD ""
+#define TIG_PAGER_CMD ""
+
/* Some ascii-shorthands fitted into the ncurses namespace. */
#define KEY_TAB '\t'
#define KEY_RETURN '\r'
#define KEY_ESC 27
-/* User action requests. */
-enum request {
- /* Offset all requests to avoid conflicts with ncurses getch values. */
- REQ_OFFSET = KEY_MAX + 1,
-
- /* XXX: Keep the view request first and in sync with views[]. */
- REQ_VIEW_MAIN,
- REQ_VIEW_DIFF,
- REQ_VIEW_LOG,
- REQ_VIEW_HELP,
- REQ_VIEW_PAGER,
-
- REQ_ENTER,
- REQ_QUIT,
- REQ_PROMPT,
- REQ_SCREEN_REDRAW,
- REQ_SCREEN_RESIZE,
- REQ_SCREEN_UPDATE,
- REQ_SHOW_VERSION,
- REQ_STOP_LOADING,
- REQ_TOGGLE_LINE_NUMBERS,
- REQ_VIEW_NEXT,
- REQ_VIEW_CLOSE,
- REQ_NEXT,
- REQ_PREVIOUS,
-
- REQ_MOVE_UP,
- REQ_MOVE_DOWN,
- REQ_MOVE_PAGE_UP,
- REQ_MOVE_PAGE_DOWN,
- REQ_MOVE_FIRST_LINE,
- REQ_MOVE_LAST_LINE,
-
- REQ_SCROLL_LINE_UP,
- REQ_SCROLL_LINE_DOWN,
- REQ_SCROLL_PAGE_UP,
- REQ_SCROLL_PAGE_DOWN,
-};
-
struct ref {
char *name; /* Ref name; tag or head names are shortened. */
- char id[41]; /* Commit SHA1 ID */
+ char id[SIZEOF_REV]; /* Commit SHA1 ID */
unsigned int tag:1; /* Is it a tag? */
unsigned int next:1; /* For ref lists: are there more refs? */
};
*/
static inline void
-string_ncopy(char *dst, const char *src, int dstlen)
+string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen)
{
- strncpy(dst, src, dstlen - 1);
- dst[dstlen - 1] = 0;
+ if (srclen > dstlen - 1)
+ srclen = dstlen - 1;
+ strncpy(dst, src, srclen);
+ dst[srclen] = 0;
}
-/* Shorthand for safely copying into a fixed buffer. */
+/* Shorthands for safely copying into a fixed buffer. */
+
#define string_copy(dst, src) \
- string_ncopy(dst, src, sizeof(dst))
+ string_ncopy_do(dst, sizeof(dst), src, sizeof(dst))
+
+#define string_ncopy(dst, src, srclen) \
+ string_ncopy_do(dst, sizeof(dst), src, srclen)
static char *
chomp_string(char *name)
return name;
}
+static bool
+string_nformat(char *buf, size_t bufsize, size_t *bufpos, const char *fmt, ...)
+{
+ va_list args;
+ size_t pos = bufpos ? *bufpos : 0;
+
+ va_start(args, fmt);
+ pos += vsnprintf(buf + pos, bufsize - pos, fmt, args);
+ va_end(args);
+
+ if (bufpos)
+ *bufpos = pos;
+
+ return pos >= bufsize ? FALSE : TRUE;
+}
+
+#define string_format(buf, fmt, args...) \
+ string_nformat(buf, sizeof(buf), NULL, fmt, args)
+
+#define string_format_from(buf, from, fmt, args...) \
+ string_nformat(buf, sizeof(buf), from, fmt, args)
+
+static int
+string_enum_compare(const char *str1, const char *str2, int len)
+{
+ size_t i;
+
+#define string_enum_sep(x) ((x) == '-' || (x) == '_' || (x) == '.')
+
+ /* Diff-Header == DIFF_HEADER */
+ for (i = 0; i < len; i++) {
+ if (toupper(str1[i]) == toupper(str2[i]))
+ continue;
+
+ if (string_enum_sep(str1[i]) &&
+ string_enum_sep(str2[i]))
+ continue;
+
+ return str1[i] - str2[i];
+ }
+
+ return 0;
+}
/* Shell quoting
*
*/
static size_t
-sq_quote(char buf[SIZEOF_CMD], size_t bufsize, const char *src)
+sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
{
char c;
-#define BUFPUT(x) do { if (bufsize < SIZEOF_CMD) buf[bufsize++] = (x); } while (0)
+#define BUFPUT(x) do { if (bufsize < SIZEOF_STR) buf[bufsize++] = (x); } while (0)
BUFPUT('\'');
while ((c = *src++)) {
}
-/**
- * OPTIONS
- * -------
- **/
+/*
+ * User requests
+ */
+
+#define REQ_INFO \
+ /* XXX: Keep the view request first and in sync with views[]. */ \
+ REQ_GROUP("View switching") \
+ REQ_(VIEW_MAIN, "Show main view"), \
+ REQ_(VIEW_DIFF, "Show diff view"), \
+ REQ_(VIEW_LOG, "Show log view"), \
+ REQ_(VIEW_TREE, "Show tree view"), \
+ REQ_(VIEW_BLOB, "Show blob view"), \
+ REQ_(VIEW_HELP, "Show help page"), \
+ REQ_(VIEW_PAGER, "Show pager view"), \
+ \
+ REQ_GROUP("View manipulation") \
+ REQ_(ENTER, "Enter current line and scroll"), \
+ REQ_(NEXT, "Move to next"), \
+ REQ_(PREVIOUS, "Move to previous"), \
+ REQ_(VIEW_NEXT, "Move focus to next view"), \
+ REQ_(VIEW_CLOSE, "Close the current view"), \
+ REQ_(QUIT, "Close all views and quit"), \
+ \
+ REQ_GROUP("Cursor navigation") \
+ REQ_(MOVE_UP, "Move cursor one line up"), \
+ REQ_(MOVE_DOWN, "Move cursor one line down"), \
+ REQ_(MOVE_PAGE_DOWN, "Move cursor one page down"), \
+ REQ_(MOVE_PAGE_UP, "Move cursor one page up"), \
+ REQ_(MOVE_FIRST_LINE, "Move cursor to first line"), \
+ REQ_(MOVE_LAST_LINE, "Move cursor to last line"), \
+ \
+ REQ_GROUP("Scrolling") \
+ REQ_(SCROLL_LINE_UP, "Scroll one line up"), \
+ REQ_(SCROLL_LINE_DOWN, "Scroll one line down"), \
+ REQ_(SCROLL_PAGE_UP, "Scroll one page up"), \
+ REQ_(SCROLL_PAGE_DOWN, "Scroll one page down"), \
+ \
+ REQ_GROUP("Searching") \
+ REQ_(SEARCH, "Search the view"), \
+ REQ_(SEARCH_BACK, "Search backwards in the view"), \
+ REQ_(FIND_NEXT, "Find next search match"), \
+ REQ_(FIND_PREV, "Find previous search match"), \
+ \
+ REQ_GROUP("Misc") \
+ REQ_(NONE, "Do nothing"), \
+ REQ_(PROMPT, "Bring up the prompt"), \
+ REQ_(SCREEN_REDRAW, "Redraw the screen"), \
+ REQ_(SCREEN_RESIZE, "Resize the screen"), \
+ REQ_(SHOW_VERSION, "Show version information"), \
+ REQ_(STOP_LOADING, "Stop all loading views"), \
+ REQ_(TOGGLE_LINENO, "Toggle line numbers"), \
+ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization")
+
+
+/* User action requests. */
+enum request {
+#define REQ_GROUP(help)
+#define REQ_(req, help) REQ_##req
+
+ /* Offset all requests to avoid conflicts with ncurses getch values. */
+ REQ_OFFSET = KEY_MAX + 1,
+ REQ_INFO,
+ REQ_UNKNOWN,
+
+#undef REQ_GROUP
+#undef REQ_
+};
+
+struct request_info {
+ enum request request;
+ char *name;
+ int namelen;
+ 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_UNKNOWN;
+}
+
+
+/*
+ * Options
+ */
static const char usage[] =
VERSION " (" __DATE__ ")\n"
" -h, --help Show help message and exit\n";
/* Option and state variables. */
-static bool opt_line_number = FALSE;
-static int opt_num_interval = NUMBER_INTERVAL;
-static int opt_tab_size = TABSIZE;
-static enum request opt_request = REQ_VIEW_MAIN;
-static char opt_cmd[SIZEOF_CMD] = "";
-static char opt_encoding[20] = "";
-static bool opt_utf8 = TRUE;
-static FILE *opt_pipe = NULL;
+static bool opt_line_number = FALSE;
+static bool opt_rev_graph = TRUE;
+static int opt_num_interval = NUMBER_INTERVAL;
+static int opt_tab_size = TABSIZE;
+static enum request opt_request = REQ_VIEW_MAIN;
+static char opt_cmd[SIZEOF_STR] = "";
+static char opt_path[SIZEOF_STR] = "";
+static FILE *opt_pipe = NULL;
+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] = "";
+
+enum option_type {
+ OPT_NONE,
+ OPT_INT,
+};
+
+static bool
+check_option(char *opt, char short_name, char *name, enum option_type type, ...)
+{
+ va_list args;
+ char *value = "";
+ int *number;
+
+ if (opt[0] != '-')
+ return FALSE;
+
+ if (opt[1] == '-') {
+ int namelen = strlen(name);
+
+ opt += 2;
+
+ if (strncmp(opt, name, namelen))
+ return FALSE;
+
+ if (opt[namelen] == '=')
+ value = opt + namelen + 1;
+
+ } else {
+ if (!short_name || opt[1] != short_name)
+ return FALSE;
+ value = opt + 2;
+ }
+
+ va_start(args, type);
+ if (type == OPT_INT) {
+ number = va_arg(args, int *);
+ if (isdigit(*value))
+ *number = atoi(value);
+ }
+ va_end(args);
+
+ return TRUE;
+}
/* Returns the index of log or diff command or -1 to exit. */
static bool
for (i = 1; i < argc; i++) {
char *opt = argv[i];
- /**
- * -l::
- * Start up in log view using the internal log command.
- **/
+ if (!strcmp(opt, "log") ||
+ !strcmp(opt, "diff") ||
+ !strcmp(opt, "show")) {
+ opt_request = opt[0] == 'l'
+ ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+ break;
+ }
+
+ if (opt[0] && opt[0] != '-')
+ break;
+
if (!strcmp(opt, "-l")) {
opt_request = REQ_VIEW_LOG;
continue;
}
- /**
- * -d::
- * Start up in diff view using the internal diff command.
- **/
if (!strcmp(opt, "-d")) {
opt_request = REQ_VIEW_DIFF;
continue;
}
- /**
- * -n[INTERVAL], --line-number[=INTERVAL]::
- * Prefix line numbers in log and diff view.
- * Optionally, with interval different than each line.
- **/
- if (!strncmp(opt, "-n", 2) ||
- !strncmp(opt, "--line-number", 13)) {
- char *num = opt;
-
- if (opt[1] == 'n') {
- num = opt + 2;
-
- } else if (opt[STRING_SIZE("--line-number")] == '=') {
- num = opt + STRING_SIZE("--line-number=");
- }
-
- if (isdigit(*num))
- opt_num_interval = atoi(num);
-
+ if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
opt_line_number = TRUE;
continue;
}
- /**
- * -b[NSPACES], --tab-size[=NSPACES]::
- * Set the number of spaces tabs should be expanded to.
- **/
- if (!strncmp(opt, "-b", 2) ||
- !strncmp(opt, "--tab-size", 10)) {
- char *num = opt;
-
- if (opt[1] == 'b') {
- num = opt + 2;
-
- } else if (opt[STRING_SIZE("--tab-size")] == '=') {
- num = opt + STRING_SIZE("--tab-size=");
- }
-
- if (isdigit(*num))
- opt_tab_size = MIN(atoi(num), TABSIZE);
+ if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) {
+ opt_tab_size = MIN(opt_tab_size, TABSIZE);
continue;
}
- /**
- * -v, --version::
- * Show version and exit.
- **/
- if (!strcmp(opt, "-v") ||
- !strcmp(opt, "--version")) {
+ if (check_option(opt, 'v', "version", OPT_NONE)) {
printf("tig version %s\n", VERSION);
return FALSE;
}
- /**
- * -h, --help::
- * Show help message and exit.
- **/
- if (!strcmp(opt, "-h") ||
- !strcmp(opt, "--help")) {
+ if (check_option(opt, 'h', "help", OPT_NONE)) {
printf(usage);
return FALSE;
}
- /**
- * \--::
- * End of tig(1) options. Useful when specifying command
- * options for the main view. Example:
- *
- * $ tig -- --since=1.month
- **/
if (!strcmp(opt, "--")) {
i++;
break;
}
- /**
- * log [git log options]::
- * Open log view using the given git log options.
- *
- * diff [git diff options]::
- * Open diff view using the given git diff options.
- *
- * show [git show options]::
- * Open diff view using the given git show options.
- **/
- if (!strcmp(opt, "log") ||
- !strcmp(opt, "diff") ||
- !strcmp(opt, "show")) {
- opt_request = opt[0] == 'l'
- ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
- break;
- }
-
- /**
- * [git log options]::
- * tig(1) will stop the option parsing when the first
- * command line parameter not starting with "-" is
- * encountered. All options including this one will be
- * passed to git log when loading the main view.
- * This makes it possible to say:
- *
- * $ tig tag-1.0..HEAD
- **/
- if (opt[0] && opt[0] != '-')
- break;
-
- die("unknown command '%s'", opt);
+ die("unknown option '%s'\n\n%s", opt, usage);
}
if (!isatty(STDIN_FILENO)) {
- /**
- * Pager mode
- * ~~~~~~~~~~
- * If stdin is a pipe, any log or diff options will be ignored and the
- * pager view will be opened loading data from stdin. The pager mode
- * can be used for colorizing output from various git commands.
- *
- * Example on how to colorize the output of git-show(1):
- *
- * $ git show | tig
- **/
opt_request = REQ_VIEW_PAGER;
opt_pipe = stdin;
} else if (i < argc) {
size_t buf_size;
- /**
- * Git command options
- * ~~~~~~~~~~~~~~~~~~~
- * All git command options specified on the command line will
- * be passed to the given command and all will be shell quoted
- * before they are passed to the shell.
- *
- * NOTE: If you specify options for the main view, you should
- * not use the `--pretty` option as this option will be set
- * automatically to the format expected by the main view.
- *
- * Example on how to open the log view and show both author and
- * committer information:
- *
- * $ tig log --pretty=fuller
- *
- * See the <<refspec, "Specifying revisions">> section below
- * for an introduction to revision options supported by the git
- * commands. For details on specific git command options, refer
- * to the man page of the command in question.
- **/
-
if (opt_request == REQ_VIEW_MAIN)
/* XXX: This is vulnerable to the user overriding
* options required for the main view parser. */
- string_copy(opt_cmd, "git log --stat --pretty=raw");
+ string_copy(opt_cmd, "git log --pretty=raw");
else
string_copy(opt_cmd, "git");
buf_size = strlen(opt_cmd);
die("command too long");
opt_cmd[buf_size] = 0;
-
}
if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
}
-/**
- * ENVIRONMENT VARIABLES
- * ---------------------
- * Several options related to the interface with git can be configured
- * via environment options.
- *
- * Repository references
- * ~~~~~~~~~~~~~~~~~~~~~
- * Commits that are referenced by tags and branch heads will be marked
- * by the reference name surrounded by '[' and ']':
- *
- * 2006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1
- *
- * If you want to filter out certain directories under `.git/refs/`, say
- * `tmp` you can do it by setting the following variable:
- *
- * $ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig
- *
- * Or set the variable permanently in your environment.
- *
- * TIG_LS_REMOTE::
- * Set command for retrieving all repository references. The command
- * should output data in the same format as git-ls-remote(1).
- **/
-
-#define TIG_LS_REMOTE \
- "git ls-remote . 2>/dev/null"
-
-/**
- * [[history-commands]]
- * History commands
- * ~~~~~~~~~~~~~~~~
- * It is possible to alter which commands are used for the different views.
- * If for example you prefer commits in the main view to be sorted by date
- * and only show 500 commits, use:
- *
- * $ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig
- *
- * Or set the variable permanently in your environment.
- *
- * Notice, how `%s` is used to specify the commit reference. There can
- * be a maximum of 5 `%s` ref specifications.
- *
- * TIG_DIFF_CMD::
- * The command used for the diff view. By default, git show is used
- * as a backend.
- *
- * TIG_LOG_CMD::
- * The command used for the log view. If you prefer to have both
- * author and committer shown in the log view be sure to pass
- * `--pretty=fuller` to git log.
- *
- * TIG_MAIN_CMD::
- * The command used for the main view. Note, you must always specify
- * the option: `--pretty=raw` since the main view parser expects to
- * read that format.
- **/
-
-#define TIG_DIFF_CMD \
- "git show --patch-with-stat --find-copies-harder -B -C %s"
-
-#define TIG_LOG_CMD \
- "git log --cc --stat -n100 %s"
-
-#define TIG_MAIN_CMD \
- "git log --topo-order --stat --pretty=raw %s"
-
-/* ... silently ignore that the following are also exported. */
-
-#define TIG_HELP_CMD \
- "man tig 2>/dev/null"
-
-#define TIG_PAGER_CMD \
- ""
-
-
-/**
- * FILES
- * -----
- * '~/.tigrc'::
- * User configuration file. See tigrc(5) for examples.
- *
- * '.git/config'::
- * Repository config file. Read on startup with the help of
- * git-repo-config(1).
- **/
-
-static struct int_map color_map[] = {
-#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
- COLOR_MAP(DEFAULT),
- COLOR_MAP(BLACK),
- COLOR_MAP(BLUE),
- COLOR_MAP(CYAN),
- COLOR_MAP(GREEN),
- COLOR_MAP(MAGENTA),
- COLOR_MAP(RED),
- COLOR_MAP(WHITE),
- COLOR_MAP(YELLOW),
-};
-
-static struct int_map attr_map[] = {
-#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name }
- ATTR_MAP(NORMAL),
- ATTR_MAP(BLINK),
- ATTR_MAP(BOLD),
- ATTR_MAP(DIM),
- ATTR_MAP(REVERSE),
- ATTR_MAP(STANDOUT),
- ATTR_MAP(UNDERLINE),
-};
+/*
+ * Line-oriented content detection.
+ */
#define LINE_INFO \
LINE(DIFF_HEADER, "diff --git ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
LINE(PP_DATE, "Date: ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
LINE(PP_ADATE, "AuthorDate: ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
LINE(PP_CDATE, "CommitDate: ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+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(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(DEFAULT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
LINE(CURSOR, "", COLOR_WHITE, COLOR_GREEN, A_BOLD), \
LINE(STATUS, "", COLOR_GREEN, COLOR_DEFAULT, 0), \
LINE(MAIN_DELIM, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(MAIN_TAG, "", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \
LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \
-
-
-/*
- * Line-oriented content detection.
- */
+LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
+LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL)
enum line_type {
#define LINE(type, line, fg, bg, attr) \
get_line_info(char *name, int namelen)
{
enum line_type type;
- int i;
-
- /* Diff-Header -> DIFF_HEADER */
- for (i = 0; i < namelen; i++) {
- if (name[i] == '-')
- name[i] = '_';
- else if (name[i] == '.')
- name[i] = '_';
- }
for (type = 0; type < ARRAY_SIZE(line_info); type++)
if (namelen == line_info[type].namelen &&
- !strncasecmp(line_info[type].name, name, namelen))
+ !string_enum_compare(line_info[type].name, name, namelen))
return &line_info[type];
return NULL;
struct line {
enum line_type type;
+
+ /* State flags */
+ unsigned int selected:1;
+
void *data; /* User data */
};
/*
- * User config file handling.
+ * Keys
*/
-#define set_color(color, name, namelen) \
- set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, namelen)
+struct keybinding {
+ int alias;
+ enum request request;
+ struct keybinding *next;
+};
-#define set_attribute(attr, name, namelen) \
- set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, namelen)
+static struct keybinding default_keybindings[] = {
+ /* View switching */
+ { 'm', REQ_VIEW_MAIN },
+ { 'd', REQ_VIEW_DIFF },
+ { 'l', REQ_VIEW_LOG },
+ { 't', REQ_VIEW_TREE },
+ { 'f', REQ_VIEW_BLOB },
+ { 'p', REQ_VIEW_PAGER },
+ { 'h', REQ_VIEW_HELP },
-static int config_lineno;
-static bool config_errors;
-static char *config_msg;
+ /* View manipulation */
+ { 'q', REQ_VIEW_CLOSE },
+ { KEY_TAB, REQ_VIEW_NEXT },
+ { KEY_RETURN, REQ_ENTER },
+ { KEY_UP, REQ_PREVIOUS },
+ { KEY_DOWN, REQ_NEXT },
-static int
-set_option(char *opt, int optlen, char *value, int valuelen)
-{
- /* Reads: "color" object fgcolor bgcolor [attr] */
- if (!strcmp(opt, "color")) {
- struct line_info *info;
-
- value = chomp_string(value);
- valuelen = strcspn(value, " \t");
- info = get_line_info(value, valuelen);
- if (!info) {
- config_msg = "Unknown color name";
- return ERR;
- }
+ /* Cursor navigation */
+ { 'k', REQ_MOVE_UP },
+ { 'j', REQ_MOVE_DOWN },
+ { KEY_HOME, REQ_MOVE_FIRST_LINE },
+ { KEY_END, REQ_MOVE_LAST_LINE },
+ { KEY_NPAGE, REQ_MOVE_PAGE_DOWN },
+ { ' ', REQ_MOVE_PAGE_DOWN },
+ { KEY_PPAGE, REQ_MOVE_PAGE_UP },
+ { 'b', REQ_MOVE_PAGE_UP },
+ { '-', REQ_MOVE_PAGE_UP },
- value = chomp_string(value + valuelen);
- valuelen = strcspn(value, " \t");
- if (set_color(&info->fg, value, valuelen) == ERR) {
- config_msg = "Unknown color";
- return ERR;
- }
+ /* Scrolling */
+ { KEY_IC, REQ_SCROLL_LINE_UP },
+ { KEY_DC, REQ_SCROLL_LINE_DOWN },
+ { 'w', REQ_SCROLL_PAGE_UP },
+ { 's', REQ_SCROLL_PAGE_DOWN },
- value = chomp_string(value + valuelen);
- valuelen = strcspn(value, " \t");
- if (set_color(&info->bg, value, valuelen) == ERR) {
- config_msg = "Unknown color";
- return ERR;
- }
+ /* Searching */
+ { '/', REQ_SEARCH },
+ { '?', REQ_SEARCH_BACK },
+ { 'n', REQ_FIND_NEXT },
+ { 'N', REQ_FIND_PREV },
- value = chomp_string(value + valuelen);
- if (*value &&
- set_attribute(&info->attr, value, strlen(value)) == ERR) {
- config_msg = "Unknown attribute";
- return ERR;
- }
+ /* Misc */
+ { 'Q', REQ_QUIT },
+ { 'z', REQ_STOP_LOADING },
+ { 'v', REQ_SHOW_VERSION },
+ { 'r', REQ_SCREEN_REDRAW },
+ { '.', REQ_TOGGLE_LINENO },
+ { 'g', REQ_TOGGLE_REV_GRAPH },
+ { ':', REQ_PROMPT },
+ /* Using the ncurses SIGWINCH handler. */
+ { KEY_RESIZE, REQ_SCREEN_RESIZE },
+};
+
+#define KEYMAP_INFO \
+ KEYMAP_(GENERIC), \
+ KEYMAP_(MAIN), \
+ KEYMAP_(DIFF), \
+ KEYMAP_(LOG), \
+ KEYMAP_(TREE), \
+ KEYMAP_(BLOB), \
+ KEYMAP_(PAGER), \
+ KEYMAP_(HELP) \
+
+enum keymap {
+#define KEYMAP_(name) KEYMAP_##name
+ KEYMAP_INFO
+#undef KEYMAP_
+};
+
+static struct int_map keymap_table[] = {
+#define KEYMAP_(name) { #name, STRING_SIZE(#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))
+
+static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
+
+static void
+add_keybinding(enum keymap keymap, enum request request, int key)
+{
+ struct keybinding *keybinding;
+
+ keybinding = calloc(1, sizeof(*keybinding));
+ if (!keybinding)
+ die("Failed to allocate keybinding");
+
+ keybinding->alias = key;
+ keybinding->request = request;
+ keybinding->next = keybindings[keymap];
+ keybindings[keymap] = keybinding;
+}
+
+/* Looks for a key binding first in the given map, then in the generic map, and
+ * lastly in the default keybindings. */
+static enum request
+get_keybinding(enum keymap keymap, int key)
+{
+ struct keybinding *kbd;
+ int i;
+
+ for (kbd = keybindings[keymap]; kbd; kbd = kbd->next)
+ if (kbd->alias == key)
+ return kbd->request;
+
+ for (kbd = keybindings[KEYMAP_GENERIC]; kbd; kbd = kbd->next)
+ if (kbd->alias == key)
+ return kbd->request;
+
+ for (i = 0; i < ARRAY_SIZE(default_keybindings); i++)
+ if (default_keybindings[i].alias == key)
+ return default_keybindings[i].request;
+
+ return (enum request) key;
+}
+
+
+struct key {
+ char *name;
+ int value;
+};
+
+static struct key key_table[] = {
+ { "Enter", KEY_RETURN },
+ { "Space", ' ' },
+ { "Backspace", KEY_BACKSPACE },
+ { "Tab", KEY_TAB },
+ { "Escape", KEY_ESC },
+ { "Left", KEY_LEFT },
+ { "Right", KEY_RIGHT },
+ { "Up", KEY_UP },
+ { "Down", KEY_DOWN },
+ { "Insert", KEY_IC },
+ { "Delete", KEY_DC },
+ { "Hash", '#' },
+ { "Home", KEY_HOME },
+ { "End", KEY_END },
+ { "PageUp", KEY_PPAGE },
+ { "PageDown", KEY_NPAGE },
+ { "F1", KEY_F(1) },
+ { "F2", KEY_F(2) },
+ { "F3", KEY_F(3) },
+ { "F4", KEY_F(4) },
+ { "F5", KEY_F(5) },
+ { "F6", KEY_F(6) },
+ { "F7", KEY_F(7) },
+ { "F8", KEY_F(8) },
+ { "F9", KEY_F(9) },
+ { "F10", KEY_F(10) },
+ { "F11", KEY_F(11) },
+ { "F12", KEY_F(12) },
+};
+
+static int
+get_key_value(const char *name)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(key_table); i++)
+ if (!strcasecmp(key_table[i].name, name))
+ return key_table[i].value;
+
+ if (strlen(name) == 1 && isprint(*name))
+ return (int) *name;
+
+ return ERR;
+}
+
+static char *
+get_key(enum request request)
+{
+ static char buf[BUFSIZ];
+ static char key_char[] = "'X'";
+ 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];
+ char *seq = NULL;
+ int key;
+
+ if (keybinding->request != request)
+ continue;
+
+ for (key = 0; key < ARRAY_SIZE(key_table); key++)
+ if (key_table[key].value == keybinding->alias)
+ seq = key_table[key].name;
+
+ if (seq == NULL &&
+ keybinding->alias < 127 &&
+ isprint(keybinding->alias)) {
+ key_char[1] = (char) keybinding->alias;
+ seq = key_char;
+ }
+
+ if (!seq)
+ seq = "'?'";
+
+ if (!string_format_from(buf, &pos, "%s%s", sep, seq))
+ return "Too many keybindings!";
+ sep = ", ";
+ }
+
+ return buf;
+}
+
+
+/*
+ * User config file handling.
+ */
+
+static struct int_map color_map[] = {
+#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
+ COLOR_MAP(DEFAULT),
+ COLOR_MAP(BLACK),
+ COLOR_MAP(BLUE),
+ COLOR_MAP(CYAN),
+ COLOR_MAP(GREEN),
+ COLOR_MAP(MAGENTA),
+ COLOR_MAP(RED),
+ COLOR_MAP(WHITE),
+ 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 }
+ ATTR_MAP(NORMAL),
+ ATTR_MAP(BLINK),
+ ATTR_MAP(BOLD),
+ ATTR_MAP(DIM),
+ ATTR_MAP(REVERSE),
+ ATTR_MAP(STANDOUT),
+ ATTR_MAP(UNDERLINE),
+};
+
+#define set_attribute(attr, name) \
+ set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, strlen(name))
+
+static int config_lineno;
+static bool config_errors;
+static char *config_msg;
+
+/* Wants: object fgcolor bgcolor [attr] */
+static int
+option_color_command(int argc, char *argv[])
+{
+ struct line_info *info;
+
+ if (argc != 3 && argc != 4) {
+ config_msg = "Wrong number of arguments given to color command";
+ return ERR;
+ }
+
+ info = get_line_info(argv[0], strlen(argv[0]));
+ if (!info) {
+ config_msg = "Unknown color name";
+ return ERR;
+ }
+
+ if (set_color(&info->fg, argv[1]) == ERR ||
+ set_color(&info->bg, argv[2]) == ERR) {
+ config_msg = "Unknown color";
+ return ERR;
+ }
+
+ if (argc == 4 && set_attribute(&info->attr, argv[3]) == ERR) {
+ config_msg = "Unknown attribute";
+ return ERR;
+ }
+
+ return OK;
+}
+
+/* Wants: name = value */
+static int
+option_set_command(int argc, char *argv[])
+{
+ if (argc != 3) {
+ config_msg = "Wrong number of arguments given to set command";
+ return ERR;
+ }
+
+ if (strcmp(argv[1], "=")) {
+ config_msg = "No value assigned";
+ return ERR;
+ }
+
+ if (!strcmp(argv[0], "show-rev-graph")) {
+ opt_rev_graph = (!strcmp(argv[2], "1") ||
+ !strcmp(argv[2], "true") ||
+ !strcmp(argv[2], "yes"));
+ return OK;
+ }
+
+ if (!strcmp(argv[0], "line-number-interval")) {
+ opt_num_interval = atoi(argv[2]);
+ return OK;
+ }
+
+ if (!strcmp(argv[0], "tab-size")) {
+ opt_tab_size = atoi(argv[2]);
return OK;
}
+ if (!strcmp(argv[0], "commit-encoding")) {
+ char *arg = argv[2];
+ int delimiter = *arg;
+ int i;
+
+ switch (delimiter) {
+ case '"':
+ case '\'':
+ for (arg++, i = 0; arg[i]; i++)
+ if (arg[i] == delimiter) {
+ arg[i] = 0;
+ break;
+ }
+ default:
+ string_copy(opt_encoding, arg);
+ return OK;
+ }
+ }
+
+ config_msg = "Unknown variable name";
+ return ERR;
+}
+
+/* Wants: mode request key */
+static int
+option_bind_command(int argc, char *argv[])
+{
+ enum request request;
+ int keymap;
+ int key;
+
+ if (argc != 3) {
+ config_msg = "Wrong number of arguments given to bind command";
+ return ERR;
+ }
+
+ if (set_keymap(&keymap, argv[0]) == ERR) {
+ config_msg = "Unknown key map";
+ return ERR;
+ }
+
+ key = get_key_value(argv[1]);
+ if (key == ERR) {
+ config_msg = "Unknown key";
+ return ERR;
+ }
+
+ request = get_request(argv[2]);
+ if (request == REQ_UNKNOWN) {
+ config_msg = "Unknown request name";
+ return ERR;
+ }
+
+ add_keybinding(keymap, request, key);
+
+ return OK;
+}
+
+static int
+set_option(char *opt, char *value)
+{
+ char *argv[16];
+ int valuelen;
+ int argc = 0;
+
+ /* Tokenize */
+ while (argc < ARRAY_SIZE(argv) && (valuelen = strcspn(value, " \t"))) {
+ argv[argc++] = value;
+
+ value += valuelen;
+ if (!*value)
+ break;
+
+ *value++ = 0;
+ while (isspace(*value))
+ value++;
+ }
+
+ if (!strcmp(opt, "color"))
+ return option_color_command(argc, argv);
+
+ if (!strcmp(opt, "set"))
+ return option_set_command(argc, argv);
+
+ if (!strcmp(opt, "bind"))
+ return option_bind_command(argc, argv);
+
+ config_msg = "Unknown option command";
return ERR;
}
static int
read_option(char *opt, int optlen, char *value, int valuelen)
{
+ int status = OK;
+
config_lineno++;
config_msg = "Internal error";
- optlen = strcspn(opt, "#;");
- if (optlen == 0) {
- /* The whole line is a commend or empty. */
+ /* Check for comment markers, since read_properties() will
+ * only ensure opt and value are split at first " \t". */
+ optlen = strcspn(opt, "#");
+ if (optlen == 0)
return OK;
- } else if (opt[optlen] != 0) {
- /* Part of the option name is a comment, so the value part
- * should be ignored. */
- valuelen = 0;
- opt[optlen] = value[valuelen] = 0;
- } else {
- /* Else look for comment endings in the value. */
- valuelen = strcspn(value, "#;");
- value[valuelen] = 0;
+ if (opt[optlen] != 0) {
+ config_msg = "No option value";
+ status = ERR;
+
+ } else {
+ /* Look for comment endings in the value. */
+ int len = strcspn(value, "#");
+
+ if (len < valuelen) {
+ valuelen = len;
+ value[valuelen] = 0;
+ }
+
+ status = set_option(opt, value);
}
- if (set_option(opt, optlen, value, valuelen) == ERR) {
- fprintf(stderr, "Error on line %d, near '%.*s' option: %s\n",
+ if (status == ERR) {
+ fprintf(stderr, "Error on line %d, near '%.*s': %s\n",
config_lineno, optlen, opt, config_msg);
config_errors = TRUE;
}
load_options(void)
{
char *home = getenv("HOME");
- char buf[1024];
+ char buf[SIZEOF_STR];
FILE *file;
config_lineno = 0;
config_errors = FALSE;
- if (!home ||
- snprintf(buf, sizeof(buf), "%s/.tigrc", home) >= sizeof(buf))
+ if (!home || !string_format(buf, "%s/.tigrc", home))
return ERR;
/* It's ok that the file doesn't exist. */
}
-/**
+/*
* The viewer
- * ----------
- * The display consists of a status window on the last line of the screen and
- * one or more views. The default is to only show one view at the time but it
- * is possible to split both the main and log view to also show the commit
- * diff.
- *
- * If you are in the log view and press 'Enter' when the current line is a
- * commit line, such as:
- *
- * commit 4d55caff4cc89335192f3e566004b4ceef572521
- *
- * You will split the view so that the log view is displayed in the top window
- * and the diff view in the bottom window. You can switch between the two
- * views by pressing 'Tab'. To maximize the log view again, simply press 'l'.
- **/
+ */
struct view;
struct view_ops;
static struct view *display[2];
static unsigned int current_view;
-#define foreach_view(view, i) \
+/* Reading from the prompt? */
+static bool input_mode = FALSE;
+
+#define foreach_displayed_view(view, i) \
for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
#define displayed_views() (display[1] != NULL ? 2 : 1)
-/**
- * Current head and commit ID
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~
- * The viewer keeps track of both what head and commit ID you are currently
- * viewing. The commit ID will follow the cursor line and change everytime time
- * you highlight a different commit. Whenever you reopen the diff view it
- * will be reloaded, if the commit ID changed.
- *
- * The head ID is used when opening the main and log view to indicate from
- * what revision to show history.
- **/
-
+/* Current head and commit ID */
+static char ref_blob[SIZEOF_REF] = "";
static char ref_commit[SIZEOF_REF] = "HEAD";
static char ref_head[SIZEOF_REF] = "HEAD";
const char *name; /* View name */
const char *cmd_fmt; /* Default command line format */
const char *cmd_env; /* Command line set via environment */
- const char *id; /* Points to either of ref_{head,commit} */
+ const char *id; /* Points to either of ref_{head,commit,blob} */
struct view_ops *ops; /* View operations */
- char cmd[SIZEOF_CMD]; /* Command buffer */
+ enum keymap keymap; /* What keymap does this view have */
+
+ char cmd[SIZEOF_STR]; /* Command buffer */
char ref[SIZEOF_REF]; /* Hovered commit reference */
char vid[SIZEOF_REF]; /* View ID. Set to id member when updating. */
unsigned long offset; /* Offset of the window top */
unsigned long lineno; /* Current line number */
+ /* Searching */
+ char grep[SIZEOF_STR]; /* Search string */
+ regex_t *regex; /* Pre-compiled regex */
+
/* 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;
/* Buffering */
unsigned long lines; /* Total number of lines */
struct line *line; /* Line index */
+ unsigned long line_size;/* Total number of allocated lines */
unsigned int digits; /* Number of digits in the lines member. */
/* Loading */
/* What type of content being displayed. Used in the title bar. */
const char *type;
/* Draw one line; @lineno must be < view->height. */
- bool (*draw)(struct view *view, struct line *line, unsigned int lineno);
+ bool (*draw)(struct view *view, struct line *line, unsigned int lineno, bool selected);
/* Read one line; updates view->line. */
- bool (*read)(struct view *view, struct line *prev, char *data);
+ bool (*read)(struct view *view, char *data);
/* Depending on view, change display based on current line. */
bool (*enter)(struct view *view, struct line *line);
+ /* Search for regex in a line. */
+ bool (*grep)(struct view *view, struct line *line);
+ /* Select line */
+ void (*select)(struct view *view, struct line *line);
};
static struct view_ops pager_ops;
static struct view_ops main_ops;
+static struct view_ops tree_ops;
+static struct view_ops blob_ops;
-#define VIEW_STR(name, cmd, env, ref, ops) \
- { name, cmd, #env, ref, ops }
+#define VIEW_STR(name, cmd, env, ref, ops, map) \
+ { name, cmd, #env, ref, ops, map}
#define VIEW_(id, name, ops, ref) \
- VIEW_STR(name, TIG_##id##_CMD, TIG_##id##_CMD, ref, ops)
+ VIEW_STR(name, TIG_##id##_CMD, TIG_##id##_CMD, ref, ops, KEYMAP_##id)
-/**
- * Views
- * ~~~~~
- * tig(1) presents various 'views' of a repository. Each view is based on output
- * from an external command, most often 'git log', 'git diff', or 'git show'.
- *
- * The main view::
- * Is the default view, and it shows a one line summary of each commit
- * in the chosen list of revisions. The summary includes commit date,
- * author, and the first line of the log message. Additionally, any
- * repository references, such as tags, will be shown.
- *
- * The log view::
- * Presents a more rich view of the revision log showing the whole log
- * message and the diffstat.
- *
- * The diff view::
- * Shows either the diff of the current working tree, that is, what
- * has changed since the last commit, or the commit diff complete
- * with log message, diffstat and diff.
- *
- * The pager view::
- * Is used for displaying both input from stdin and output from git
- * commands entered in the internal prompt.
- *
- * The help view::
- * Displays the information from the tig(1) man page. For the help view
- * to work you need to have the tig(1) man page installed.
- **/
static struct view views[] = {
VIEW_(MAIN, "main", &main_ops, ref_head),
VIEW_(DIFF, "diff", &pager_ops, ref_commit),
VIEW_(LOG, "log", &pager_ops, ref_head),
+ VIEW_(TREE, "tree", &tree_ops, ref_commit),
+ VIEW_(BLOB, "blob", &blob_ops, ref_blob),
VIEW_(HELP, "help", &pager_ops, "static"),
VIEW_(PAGER, "pager", &pager_ops, "static"),
};
#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
+#define foreach_view(view, i) \
+ for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
+
+#define view_is_displayed(view) \
+ (view == display[0] || view == display[1])
static bool
draw_view_line(struct view *view, unsigned int lineno)
{
+ struct line *line;
+ bool selected = (view->offset + lineno == view->lineno);
+ bool draw_ok;
+
+ assert(view_is_displayed(view));
+
if (view->offset + lineno >= view->lines)
return FALSE;
- return view->ops->draw(view, &view->line[view->offset + lineno], lineno);
+ line = &view->line[view->offset + lineno];
+
+ if (selected) {
+ line->selected = TRUE;
+ view->ops->select(view, line);
+ } else if (line->selected) {
+ line->selected = FALSE;
+ wmove(view->win, lineno, 0);
+ wclrtoeol(view->win);
+ }
+
+ scrollok(view->win, FALSE);
+ draw_ok = view->ops->draw(view, line, lineno, selected);
+ scrollok(view->win, TRUE);
+
+ return draw_ok;
}
static void
}
redrawwin(view->win);
- wrefresh(view->win);
+ if (input_mode)
+ wnoutrefresh(view->win);
+ else
+ wrefresh(view->win);
}
static void
}
-/**
- * Title windows
- * ~~~~~~~~~~~~~
- * Each view has a title window which shows the name of the view, current
- * commit ID if available, and where the view is positioned:
- *
- * [main] c622eefaa485995320bc743431bae0d497b1d875 - commit 1 of 61 (1%)
- *
- * By default, the title of the current view is highlighted using bold font.
- * For long loading views (taking over 3 seconds) the time since loading
- * started will be appended:
- *
- * [main] 77d9e40fbcea3238015aea403e06f61542df9a31 - commit 1 of 779 (0%) 5s
- **/
-
static void
update_view_title(struct view *view)
{
- if (view == display[current_view])
- wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
- else
- wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
-
- werase(view->title);
- wmove(view->title, 0, 0);
+ char buf[SIZEOF_STR];
+ char state[SIZEOF_STR];
+ size_t bufpos = 0, statelen = 0;
- if (*view->ref)
- wprintw(view->title, "[%s] %s", view->name, view->ref);
- else
- wprintw(view->title, "[%s]", view->name);
+ assert(view_is_displayed(view));
if (view->lines || view->pipe) {
+ unsigned int view_lines = view->offset + view->height;
unsigned int lines = view->lines
- ? (view->lineno + 1) * 100 / view->lines
+ ? MIN(view_lines, view->lines) * 100 / view->lines
: 0;
- wprintw(view->title, " - %s %d of %d (%d%%)",
- view->ops->type,
- view->lineno + 1,
- view->lines,
- lines);
+ string_format_from(state, &statelen, "- %s %d of %d (%d%%)",
+ view->ops->type,
+ view->lineno + 1,
+ view->lines,
+ lines);
+
+ if (view->pipe) {
+ time_t secs = time(NULL) - view->start_time;
+
+ /* Three git seconds are a long time ... */
+ if (secs > 2)
+ string_format_from(state, &statelen, " %lds", secs);
+ }
}
- if (view->pipe) {
- time_t secs = time(NULL) - view->start_time;
+ string_format_from(buf, &bufpos, "[%s]", view->name);
+ if (*view->ref && bufpos < view->width) {
+ size_t refsize = strlen(view->ref);
+ size_t minsize = bufpos + 1 + /* abbrev= */ 7 + 1 + statelen;
+
+ if (minsize < view->width)
+ refsize = view->width - minsize + 7;
+ string_format_from(buf, &bufpos, " %.*s", refsize, view->ref);
+ }
- /* Three git seconds are a long time ... */
- if (secs > 2)
- wprintw(view->title, " %lds", secs);
+ if (statelen && bufpos < view->width) {
+ string_format_from(buf, &bufpos, " %s", state);
}
+ if (view == display[current_view])
+ wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
+ else
+ wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
+
+ mvwaddnstr(view->title, 0, 0, buf, bufpos);
+ wclrtoeol(view->title);
wmove(view->title, 0, view->width - 1);
- wrefresh(view->title);
+
+ if (input_mode)
+ wnoutrefresh(view->title);
+ else
+ wrefresh(view->title);
}
static void
offset = 0;
- foreach_view (view, i) {
+ foreach_displayed_view (view, i) {
if (!view->win) {
view->win = newwin(view->height, 0, offset, 0);
if (!view->win)
struct view *view;
int i;
- foreach_view (view, i) {
+ foreach_displayed_view (view, i) {
redraw_view(view);
update_view_title(view);
}
}
static void
-update_display_cursor(void)
+update_display_cursor(struct view *view)
{
- struct view *view = display[current_view];
-
/* Move the cursor to the right-most column of the cursor line.
*
* XXX: This could turn out to be a bit expensive, but it ensures that
/* Scrolling backend */
static void
-do_scroll_view(struct view *view, int lines, bool redraw)
+do_scroll_view(struct view *view, int lines)
{
+ bool redraw_current_line = FALSE;
+
/* The rendering expects the new offset. */
view->offset += lines;
assert(0 <= view->offset && view->offset < view->lines);
assert(lines);
+ /* Move current line into the view. */
+ if (view->lineno < view->offset) {
+ view->lineno = view->offset;
+ redraw_current_line = TRUE;
+ } else if (view->lineno >= view->offset + view->height) {
+ view->lineno = view->offset + view->height - 1;
+ redraw_current_line = TRUE;
+ }
+
+ assert(view->offset <= view->lineno && view->lineno < view->lines);
+
/* Redraw the whole screen if scrolling is pointless. */
if (view->height < ABS(lines)) {
redraw_view(view);
if (!draw_view_line(view, line))
break;
}
- }
- /* Move current line into the view. */
- if (view->lineno < view->offset) {
- view->lineno = view->offset;
- draw_view_line(view, 0);
-
- } else if (view->lineno >= view->offset + view->height) {
- if (view->lineno == view->offset + view->height) {
- /* Clear the hidden line so it doesn't show if the view
- * is scrolled up. */
- wmove(view->win, view->height, 0);
- wclrtoeol(view->win);
- }
- view->lineno = view->offset + view->height - 1;
- draw_view_line(view, view->lineno - view->offset);
+ if (redraw_current_line)
+ draw_view_line(view, view->lineno - view->offset);
}
- assert(view->offset <= view->lineno && view->lineno < view->lines);
-
- if (!redraw)
- return;
-
redrawwin(view->win);
wrefresh(view->win);
report("");
{
int lines = 1;
+ assert(view_is_displayed(view));
+
switch (request) {
case REQ_SCROLL_PAGE_DOWN:
lines = view->height;
die("request %d not handled in switch", request);
}
- do_scroll_view(view, lines, TRUE);
+ do_scroll_view(view, lines);
}
/* Cursor moving */
static void
-move_view(struct view *view, enum request request, bool redraw)
+move_view(struct view *view, enum request request)
{
+ int scroll_steps = 0;
int steps;
switch (request) {
break;
default:
- die("request %d not handled in switch", request);
- }
-
- if (steps <= 0 && view->lineno == 0) {
- report("Cannot move beyond the first line");
- return;
-
- } else if (steps >= 0 && view->lineno + 1 >= view->lines) {
- report("Cannot move beyond the last line");
+ die("request %d not handled in switch", request);
+ }
+
+ if (steps <= 0 && view->lineno == 0) {
+ report("Cannot move beyond the first line");
+ return;
+
+ } else if (steps >= 0 && view->lineno + 1 >= view->lines) {
+ report("Cannot move beyond the last line");
+ return;
+ }
+
+ /* Move the current line */
+ view->lineno += steps;
+ assert(0 <= view->lineno && view->lineno < view->lines);
+
+ /* Check whether the view needs to be scrolled */
+ if (view->lineno < view->offset ||
+ view->lineno >= view->offset + view->height) {
+ scroll_steps = steps;
+ if (steps < 0 && -steps > view->offset) {
+ scroll_steps = -view->offset;
+
+ } else if (steps > 0) {
+ if (view->lineno == view->lines - 1 &&
+ view->lines > view->height) {
+ scroll_steps = view->lines - view->offset - 1;
+ if (scroll_steps >= view->height)
+ scroll_steps -= view->height - 1;
+ }
+ }
+ }
+
+ if (!view_is_displayed(view)) {
+ view->offset += steps;
+ view->ops->select(view, &view->line[view->lineno]);
+ return;
+ }
+
+ /* Repaint the old "current" line if we be scrolling */
+ if (ABS(steps) < view->height)
+ draw_view_line(view, view->lineno - steps - view->offset);
+
+ if (scroll_steps) {
+ do_scroll_view(view, scroll_steps);
+ return;
+ }
+
+ /* Draw the current line */
+ draw_view_line(view, view->lineno - view->offset);
+
+ redrawwin(view->win);
+ wrefresh(view->win);
+ report("");
+}
+
+
+/*
+ * Searching
+ */
+
+static void search_view(struct view *view, enum request request);
+
+static bool
+find_next_line(struct view *view, unsigned long lineno, struct line *line)
+{
+ assert(view_is_displayed(view));
+
+ if (!view->ops->grep(view, line))
+ return FALSE;
+
+ if (lineno - view->offset >= view->height) {
+ view->offset = lineno;
+ view->lineno = lineno;
+ redraw_view(view);
+
+ } else {
+ unsigned long old_lineno = view->lineno - view->offset;
+
+ view->lineno = lineno;
+ draw_view_line(view, old_lineno);
+
+ draw_view_line(view, view->lineno - view->offset);
+ redrawwin(view->win);
+ wrefresh(view->win);
+ }
+
+ report("Line %ld matches '%s'", lineno + 1, view->grep);
+ return TRUE;
+}
+
+static void
+find_next(struct view *view, enum request request)
+{
+ unsigned long lineno = view->lineno;
+ int direction;
+
+ if (!*view->grep) {
+ if (!*opt_search)
+ report("No previous search");
+ else
+ search_view(view, request);
+ return;
+ }
+
+ switch (request) {
+ case REQ_SEARCH:
+ case REQ_FIND_NEXT:
+ direction = 1;
+ break;
+
+ case REQ_SEARCH_BACK:
+ case REQ_FIND_PREV:
+ direction = -1;
+ break;
+
+ default:
return;
}
- /* Move the current line */
- view->lineno += steps;
- assert(0 <= view->lineno && view->lineno < view->lines);
+ if (request == REQ_FIND_NEXT || request == REQ_FIND_PREV)
+ lineno += direction;
- /* Repaint the old "current" line if we be scrolling */
- if (ABS(steps) < view->height) {
- int prev_lineno = view->lineno - steps - view->offset;
+ /* Note, lineno is unsigned long so will wrap around in which case it
+ * will become bigger than view->lines. */
+ for (; lineno < view->lines; lineno += direction) {
+ struct line *line = &view->line[lineno];
- wmove(view->win, prev_lineno, 0);
- wclrtoeol(view->win);
- draw_view_line(view, prev_lineno);
+ if (find_next_line(view, lineno, line))
+ return;
}
- /* Check whether the view needs to be scrolled */
- if (view->lineno < view->offset ||
- view->lineno >= view->offset + view->height) {
- if (steps < 0 && -steps > view->offset) {
- steps = -view->offset;
+ report("No match found for '%s'", view->grep);
+}
- } else if (steps > 0) {
- if (view->lineno == view->lines - 1 &&
- view->lines > view->height) {
- steps = view->lines - view->offset - 1;
- if (steps >= view->height)
- steps -= view->height - 1;
- }
- }
+static void
+search_view(struct view *view, enum request request)
+{
+ int regex_err;
- do_scroll_view(view, steps, redraw);
- return;
+ if (view->regex) {
+ regfree(view->regex);
+ *view->grep = 0;
+ } else {
+ view->regex = calloc(1, sizeof(*view->regex));
+ if (!view->regex)
+ return;
}
- /* Draw the current line */
- draw_view_line(view, view->lineno - view->offset);
+ regex_err = regcomp(view->regex, opt_search, REG_EXTENDED);
+ if (regex_err != 0) {
+ char buf[SIZEOF_STR] = "unknown error";
- if (!redraw)
+ regerror(regex_err, view->regex, buf, sizeof(buf));
+ report("Search failed: %s", buf);
return;
+ }
- redrawwin(view->win);
- wrefresh(view->win);
- report("");
-}
+ string_copy(view->grep, opt_search);
+ find_next(view, request);
+}
/*
* Incremental updating
/* When running random commands, the view ref could have become
* invalid so clear it. */
view->ref[0] = 0;
+
+ } else if (view == VIEW(REQ_VIEW_TREE)) {
+ const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+
+ if (strcmp(view->vid, view->id))
+ opt_path[0] = 0;
+
+ if (!string_format(view->cmd, format, id, opt_path))
+ return FALSE;
+
} else {
const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
- if (snprintf(view->cmd, sizeof(view->cmd), format,
- id, id, id, id, id) >= sizeof(view->cmd))
+ if (!string_format(view->cmd, format, id, id, id, id, id))
return FALSE;
}
return TRUE;
}
+static struct line *
+realloc_lines(struct view *view, size_t line_size)
+{
+ struct line *tmp = realloc(view->line, sizeof(*view->line) * line_size);
+
+ if (!tmp)
+ return NULL;
+
+ view->line = tmp;
+ view->line_size = line_size;
+ return view->line;
+}
+
static bool
update_view(struct view *view)
{
- char buffer[BUFSIZ];
+ char in_buffer[BUFSIZ];
+ char out_buffer[BUFSIZ * 2];
char *line;
- struct line *tmp;
/* The number of lines to read. If too low it will cause too much
* redrawing (and possible flickering), if too high responsiveness
* will suffer. */
if (view->offset + view->height >= view->lines)
redraw_from = view->lines - view->offset;
- tmp = realloc(view->line, sizeof(*view->line) * (view->lines + lines));
- if (!tmp)
+ /* FIXME: This is probably not perfect for backgrounded views. */
+ if (!realloc_lines(view, view->lines + lines))
goto alloc_error;
- view->line = tmp;
-
- while ((line = fgets(buffer, sizeof(buffer), view->pipe))) {
- int linelen = strlen(line);
-
- struct line *prev = view->lines
- ? &view->line[view->lines - 1]
- : NULL;
+ while ((line = fgets(in_buffer, sizeof(in_buffer), view->pipe))) {
+ size_t linelen = strlen(line);
if (linelen)
line[linelen - 1] = 0;
- if (!view->ops->read(view, prev, line))
+ if (opt_iconv != ICONV_NONE) {
+ char *inbuf = line;
+ size_t inlen = linelen;
+
+ char *outbuf = out_buffer;
+ size_t outlen = sizeof(out_buffer);
+
+ size_t ret;
+
+ ret = iconv(opt_iconv, &inbuf, &inlen, &outbuf, &outlen);
+ if (ret != (size_t) -1) {
+ line = out_buffer;
+ linelen = strlen(out_buffer);
+ }
+ }
+
+ if (!view->ops->read(view, line))
goto alloc_error;
if (lines-- == 1)
}
}
- if (redraw_from >= 0) {
+ if (!view_is_displayed(view))
+ goto check_pipe;
+
+ if (view == VIEW(REQ_VIEW_TREE)) {
+ /* Clear the view and redraw everything since the tree sorting
+ * might have rearranged things. */
+ redraw_view(view);
+
+ } else if (redraw_from >= 0) {
/* If this is an incremental update, redraw the previous line
* since for commits some members could have changed when
* loading the main view. */
* commit reference in view->ref it'll be available here. */
update_view_title(view);
+check_pipe:
if (ferror(view->pipe)) {
report("Failed to read: %s", strerror(errno));
goto end;
} else if (feof(view->pipe)) {
- if (view == VIEW(REQ_VIEW_HELP)) {
- const char *msg = TIG_HELP;
-
- if (view->lines == 0) {
- /* Slightly ugly, but abusing view->ref keeps
- * the error message. */
- string_copy(view->ref, "No help available");
- msg = "The tig(1) manpage is not installed";
- }
-
- report("%s", msg);
- goto end;
- }
-
report("");
goto end;
}
return FALSE;
}
+
+/*
+ * View opening
+ */
+
+static void open_help_view(struct view *view)
+{
+ char buf[BUFSIZ];
+ int lines = ARRAY_SIZE(req_info) + 2;
+ int i;
+
+ if (view->lines > 0)
+ return;
+
+ for (i = 0; i < ARRAY_SIZE(req_info); i++)
+ if (!req_info[i].request)
+ lines++;
+
+ view->line = calloc(lines, sizeof(*view->line));
+ if (!view->line) {
+ report("Allocation failure");
+ return;
+ }
+
+ view->ops->read(view, "Quick reference for tig keybindings:");
+
+ for (i = 0; i < ARRAY_SIZE(req_info); i++) {
+ char *key;
+
+ if (!req_info[i].request) {
+ view->ops->read(view, "");
+ view->ops->read(view, req_info[i].help);
+ continue;
+ }
+
+ key = get_key(req_info[i].request);
+ if (!string_format(buf, "%-25s %s", key, req_info[i].help))
+ continue;
+
+ view->ops->read(view, buf);
+ }
+}
+
enum open_flags {
OPEN_DEFAULT = 0, /* Use default view switching. */
OPEN_SPLIT = 1, /* Split current view. */
return;
}
- if ((reload || strcmp(view->vid, view->id)) &&
- !begin_update(view)) {
+ if (view == VIEW(REQ_VIEW_HELP)) {
+ open_help_view(view);
+
+ } else if ((reload || strcmp(view->vid, view->id)) &&
+ !begin_update(view)) {
report("Failed to load %s view", view->name);
return;
}
if (split) {
- display[current_view + 1] = view;
+ display[1] = view;
if (!backgrounded)
- current_view++;
+ current_view = 1;
} else {
/* Maximize the current view. */
memset(display, 0, sizeof(display));
/* Scroll the view that was split if the current line is
* outside the new limited view. */
- do_scroll_view(prev, lines, TRUE);
+ do_scroll_view(prev, lines);
}
if (prev && view != prev) {
report("");
} else {
redraw_view(view);
- if (view == VIEW(REQ_VIEW_HELP))
- report("%s", TIG_HELP);
- else
- report("");
+ report("");
}
/* If the view is backgrounded the above calls to report()
case REQ_MOVE_PAGE_DOWN:
case REQ_MOVE_FIRST_LINE:
case REQ_MOVE_LAST_LINE:
- move_view(view, request, TRUE);
+ move_view(view, request);
break;
case REQ_SCROLL_LINE_DOWN:
scroll_view(view, request);
break;
+ case REQ_VIEW_BLOB:
+ if (!ref_blob[0]) {
+ report("No file chosen, press 't' to open tree view");
+ break;
+ }
+ /* Fall-through */
case REQ_VIEW_MAIN:
case REQ_VIEW_DIFF:
case REQ_VIEW_LOG:
+ case REQ_VIEW_TREE:
case REQ_VIEW_HELP:
case REQ_VIEW_PAGER:
open_view(view, request, OPEN_DEFAULT);
case REQ_PREVIOUS:
request = request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
- if (view == VIEW(REQ_VIEW_DIFF) &&
- view->parent == VIEW(REQ_VIEW_MAIN)) {
- bool redraw = display[1] == view;
-
+ if ((view == VIEW(REQ_VIEW_DIFF) &&
+ view->parent == VIEW(REQ_VIEW_MAIN)) ||
+ (view == VIEW(REQ_VIEW_BLOB) &&
+ view->parent == VIEW(REQ_VIEW_TREE))) {
view = view->parent;
- move_view(view, request, redraw);
- if (redraw)
+ move_view(view, request);
+ if (view_is_displayed(view))
update_view_title(view);
} else {
- move_view(view, request, TRUE);
+ move_view(view, request);
break;
}
/* Fall-through */
report("");
break;
}
- case REQ_TOGGLE_LINE_NUMBERS:
+ case REQ_TOGGLE_LINENO:
opt_line_number = !opt_line_number;
redraw_display();
break;
+ case REQ_TOGGLE_REV_GRAPH:
+ opt_rev_graph = !opt_rev_graph;
+ redraw_display();
+ break;
+
case REQ_PROMPT:
/* Always reload^Wrerun commands from the prompt. */
open_view(view, opt_request, OPEN_RELOAD);
break;
+ case REQ_SEARCH:
+ case REQ_SEARCH_BACK:
+ search_view(view, request);
+ break;
+
+ case REQ_FIND_NEXT:
+ case REQ_FIND_PREV:
+ find_next(view, request);
+ break;
+
case REQ_STOP_LOADING:
for (i = 0; i < ARRAY_SIZE(views); i++) {
view = &views[i];
redraw_display();
break;
- case REQ_SCREEN_UPDATE:
+ case REQ_NONE:
doupdate();
return TRUE;
*/
static bool
-pager_draw(struct view *view, struct line *line, unsigned int lineno)
+pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
{
char *text = line->data;
enum line_type type = line->type;
wmove(view->win, lineno, 0);
- if (view->offset + lineno == view->lineno) {
- if (type == LINE_COMMIT) {
- string_copy(view->ref, text + 7);
- string_copy(ref_commit, view->ref);
- }
-
+ if (selected) {
type = LINE_CURSOR;
wchgat(view->win, -1, 0, type, NULL);
}
cols = line ? text - pos : strlen(pos);
}
- waddnstr(view->win, pos, MIN(cols, cols_max));
- col += cols;
- }
+ waddnstr(view->win, pos, MIN(cols, cols_max));
+ col += cols;
+ }
+
+ } else {
+ int col = 0, pos = 0;
+
+ for (; pos < textlen && col < view->width; pos++, col++)
+ if (text[pos] == '\t')
+ col += TABSIZE - (col % TABSIZE) - 1;
+
+ waddnstr(view->win, text, pos);
+ }
+
+ return TRUE;
+}
+
+static bool
+add_describe_ref(char *buf, size_t *bufpos, char *commit_id, const char *sep)
+{
+ char refbuf[SIZEOF_STR];
+ char *ref = NULL;
+ FILE *pipe;
+
+ if (!string_format(refbuf, "git describe %s 2>/dev/null", commit_id))
+ return TRUE;
+
+ pipe = popen(refbuf, "r");
+ if (!pipe)
+ return TRUE;
+
+ if ((ref = fgets(refbuf, sizeof(refbuf), pipe)))
+ ref = chomp_string(ref);
+ pclose(pipe);
+
+ if (!ref || !*ref)
+ return TRUE;
+
+ /* This is the only fatal call, since it can "corrupt" the buffer. */
+ if (!string_nformat(buf, SIZEOF_STR, bufpos, "%s%s", sep, ref))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+add_pager_refs(struct view *view, struct line *line)
+{
+ char buf[SIZEOF_STR];
+ char *commit_id = line->data + STRING_SIZE("commit ");
+ struct ref **refs;
+ size_t bufpos = 0, refpos = 0;
+ 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))
+ goto try_add_describe_ref;
+ return;
+ }
+
+ do {
+ struct ref *ref = refs[refpos];
+ char *fmt = ref->tag ? "%s[%s]" : "%s%s";
+
+ if (!string_format_from(buf, &bufpos, fmt, sep, ref->name))
+ return;
+ sep = ", ";
+ if (ref->tag)
+ is_tag = TRUE;
+ } while (refs[refpos++]->next);
+
+ if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) {
+try_add_describe_ref:
+ /* Add <tag>-g<commit_id> "fake" reference. */
+ if (!add_describe_ref(buf, &bufpos, commit_id, sep))
+ return;
+ }
+
+ if (bufpos == 0)
+ return;
+
+ if (!realloc_lines(view, view->line_size + 1))
+ return;
+
+ line = &view->line[view->lines];
+ line->data = strdup(buf);
+ if (!line->data)
+ return;
+
+ line->type = LINE_PP_REFS;
+ view->lines++;
+}
+
+static bool
+pager_read(struct view *view, char *data)
+{
+ struct line *line = &view->line[view->lines];
+
+ line->data = strdup(data);
+ if (!line->data)
+ return FALSE;
+
+ line->type = get_line_type(line->data);
+ view->lines++;
+
+ if (line->type == LINE_COMMIT &&
+ (view == VIEW(REQ_VIEW_DIFF) ||
+ view == VIEW(REQ_VIEW_LOG)))
+ add_pager_refs(view, line);
+
+ return TRUE;
+}
+
+static bool
+pager_enter(struct view *view, struct line *line)
+{
+ int split = 0;
+
+ if (line->type == LINE_COMMIT &&
+ (view == VIEW(REQ_VIEW_LOG) ||
+ view == VIEW(REQ_VIEW_PAGER))) {
+ open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
+ split = 1;
+ }
+
+ /* Always scroll the view even if it was split. That way
+ * you can use Enter to scroll through the log view and
+ * split open each commit diff. */
+ scroll_view(view, REQ_SCROLL_LINE_DOWN);
+
+ /* FIXME: A minor workaround. Scrolling the view will call report("")
+ * but if we are scrolling a non-current view this won't properly
+ * update the view title. */
+ if (split)
+ update_view_title(view);
+
+ return TRUE;
+}
+
+static bool
+pager_grep(struct view *view, struct line *line)
+{
+ regmatch_t pmatch;
+ char *text = line->data;
+
+ if (!*text)
+ return FALSE;
+
+ if (regexec(view->regex, text, 1, &pmatch, 0) == REG_NOMATCH)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+pager_select(struct view *view, struct line *line)
+{
+ if (line->type == LINE_COMMIT) {
+ char *text = line->data;
+
+ string_copy(view->ref, text + STRING_SIZE("commit "));
+ string_copy(ref_commit, view->ref);
+ }
+}
+
+static struct view_ops pager_ops = {
+ "line",
+ pager_draw,
+ pager_read,
+ pager_enter,
+ pager_grep,
+ pager_select,
+};
+
+
+/*
+ * Tree backend
+ */
+
+/* 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")
+
+#define TREE_UP_FORMAT "040000 tree %s\t.."
+
+static int
+tree_compare_entry(enum line_type type1, char *name1,
+ enum line_type type2, char *name2)
+{
+ if (type1 != type2) {
+ if (type1 == LINE_TREE_DIR)
+ return -1;
+ return 1;
+ }
+
+ return strcmp(name1, name2);
+}
+
+static bool
+tree_read(struct view *view, char *text)
+{
+ size_t textlen = strlen(text);
+ char buf[SIZEOF_STR];
+ unsigned long pos;
+ enum line_type type;
+ bool first_read = view->lines == 0;
+
+ if (textlen <= SIZEOF_TREE_ATTR)
+ return FALSE;
+
+ type = text[STRING_SIZE("100644 ")] == 't'
+ ? LINE_TREE_DIR : LINE_TREE_FILE;
+
+ if (first_read) {
+ /* Add path info line */
+ if (string_format(buf, "Directory path /%s", opt_path) &&
+ realloc_lines(view, view->line_size + 1) &&
+ pager_read(view, buf))
+ view->line[view->lines - 1].type = LINE_DEFAULT;
+ else
+ return FALSE;
+
+ /* Insert "link" to parent directory. */
+ if (*opt_path &&
+ string_format(buf, TREE_UP_FORMAT, view->ref) &&
+ realloc_lines(view, view->line_size + 1) &&
+ pager_read(view, buf))
+ view->line[view->lines - 1].type = LINE_TREE_DIR;
+ else if (*opt_path)
+ return FALSE;
+ }
+
+ /* Strip the path part ... */
+ if (*opt_path) {
+ size_t pathlen = textlen - SIZEOF_TREE_ATTR;
+ size_t striplen = strlen(opt_path);
+ char *path = text + SIZEOF_TREE_ATTR;
+
+ if (pathlen > striplen)
+ memmove(path, path + striplen,
+ pathlen - striplen + 1);
+ }
+
+ /* Skip "Directory ..." and ".." line. */
+ for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
+ struct line *line = &view->line[pos];
+ char *path1 = ((char *) line->data) + SIZEOF_TREE_ATTR;
+ char *path2 = text + SIZEOF_TREE_ATTR;
+ int cmp = tree_compare_entry(line->type, path1, type, path2);
- } else {
- int col = 0, pos = 0;
+ if (cmp <= 0)
+ continue;
- for (; pos < textlen && col < view->width; pos++, col++)
- if (text[pos] == '\t')
- col += TABSIZE - (col % TABSIZE) - 1;
+ text = strdup(text);
+ if (!text)
+ return FALSE;
- waddnstr(view->win, text, pos);
+ if (view->lines > pos)
+ memmove(&view->line[pos + 1], &view->line[pos],
+ (view->lines - pos) * sizeof(*line));
+
+ line = &view->line[pos];
+ line->data = text;
+ line->type = type;
+ view->lines++;
+ return TRUE;
}
+ if (!pager_read(view, text))
+ return FALSE;
+
+ /* Move the current line to the first tree entry. */
+ if (first_read)
+ view->lineno++;
+
+ view->line[view->lines - 1].type = type;
return TRUE;
}
static bool
-pager_read(struct view *view, struct line *prev, char *line)
+tree_enter(struct view *view, struct line *line)
{
- /* Compress empty lines in the help view. */
- if (view == VIEW(REQ_VIEW_HELP) &&
- !*line && prev && !*((char *) prev->data))
- return TRUE;
+ enum open_flags flags;
+ enum request request;
- view->line[view->lines].data = strdup(line);
- if (!view->line[view->lines].data)
- return FALSE;
+ switch (line->type) {
+ case LINE_TREE_DIR:
+ /* Depending on whether it is a subdir or parent (updir?) link
+ * mangle the path buffer. */
+ if (line == &view->line[1] && *opt_path) {
+ size_t path_len = strlen(opt_path);
+ char *dirsep = opt_path + path_len - 1;
- view->line[view->lines].type = get_line_type(line);
+ while (dirsep > opt_path && dirsep[-1] != '/')
+ dirsep--;
+
+ dirsep[0] = 0;
+
+ } else {
+ size_t pathlen = strlen(opt_path);
+ size_t origlen = pathlen;
+ char *data = line->data;
+ char *basename = data + SIZEOF_TREE_ATTR;
+
+ if (!string_format_from(opt_path, &pathlen, "%s/", basename)) {
+ opt_path[origlen] = 0;
+ return TRUE;
+ }
+ }
+
+ /* Trees and subtrees share the same ID, so they are not not
+ * unique like blobs. */
+ flags = OPEN_RELOAD;
+ request = REQ_VIEW_TREE;
+ break;
+
+ case LINE_TREE_FILE:
+ flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+ request = REQ_VIEW_BLOB;
+ break;
+
+ default:
+ return TRUE;
+ }
+
+ open_view(view, request, flags);
- view->lines++;
return TRUE;
}
-static bool
-pager_enter(struct view *view, struct line *line)
+static void
+tree_select(struct view *view, struct line *line)
{
- int split = 0;
+ char *text = line->data;
- if (line->type == LINE_COMMIT &&
- (view == VIEW(REQ_VIEW_LOG) ||
- view == VIEW(REQ_VIEW_PAGER))) {
- open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
- split = 1;
+ text += STRING_SIZE("100644 blob ");
+
+ if (line->type == LINE_TREE_FILE) {
+ string_ncopy(ref_blob, text, 40);
+ /* Also update the blob view's ref, since all there must always
+ * be in sync. */
+ string_copy(VIEW(REQ_VIEW_BLOB)->ref, ref_blob);
+
+ } else if (line->type != LINE_TREE_DIR) {
+ return;
}
- /* Always scroll the view even if it was split. That way
- * you can use Enter to scroll through the log view and
- * split open each commit diff. */
- scroll_view(view, REQ_SCROLL_LINE_DOWN);
+ string_ncopy(view->ref, text, 40);
+}
- /* FIXME: A minor workaround. Scrolling the view will call report("")
- * but if we are scrolling a non-current view this won't properly
- * update the view title. */
- if (split)
- update_view_title(view);
+static struct view_ops tree_ops = {
+ "file",
+ pager_draw,
+ tree_read,
+ tree_enter,
+ pager_grep,
+ tree_select,
+};
- return TRUE;
+static bool
+blob_read(struct view *view, char *line)
+{
+ bool state = pager_read(view, line);
+
+ if (state == TRUE)
+ view->line[view->lines - 1].type = LINE_DEFAULT;
+
+ return state;
}
-static struct view_ops pager_ops = {
+static struct view_ops blob_ops = {
"line",
pager_draw,
- pager_read,
+ blob_read,
pager_enter,
+ pager_grep,
+ pager_select,
};
*/
struct commit {
- char id[41]; /* SHA1 ID. */
- char title[75]; /* The first line of the commit message. */
- char author[75]; /* The author of the commit. */
- struct tm time; /* Date from the author ident. */
- struct ref **refs; /* Repository references; tags & branch heads. */
+ 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. */
+ chtype graph[SIZEOF_REVGRAPH]; /* Ancestry chain graphics. */
+ size_t graph_size; /* The width of the graph array. */
};
static bool
-main_draw(struct view *view, struct line *line, unsigned int lineno)
+main_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
{
char buf[DATE_COLS + 1];
struct commit *commit = line->data;
wmove(view->win, lineno, col);
- if (view->offset + lineno == view->lineno) {
- string_copy(view->ref, commit->id);
- string_copy(ref_commit, view->ref);
+ if (selected) {
type = LINE_CURSOR;
wattrset(view->win, get_line_attr(type));
wchgat(view->win, -1, 0, type, NULL);
if (type != LINE_CURSOR)
wattrset(view->win, A_NORMAL);
- mvwaddch(view->win, lineno, col, ACS_LTEE);
- wmove(view->win, lineno, col + 2);
- col += 2;
+ if (opt_rev_graph && commit->graph_size) {
+ size_t i;
+
+ wmove(view->win, lineno, col);
+ /* Using waddch() instead of waddnstr() ensures that
+ * they'll be rendered correctly for the cursor line. */
+ for (i = 0; i < commit->graph_size; i++)
+ waddch(view->win, commit->graph[i]);
+
+ col += commit->graph_size + 1;
+ }
+
+ wmove(view->win, lineno, col);
if (commit->refs) {
size_t i = 0;
/* Reads git log --pretty=raw output and parses it into the commit struct. */
static bool
-main_read(struct view *view, struct line *prev, char *line)
+main_read(struct view *view, char *line)
{
enum line_type type = get_line_type(line);
- struct commit *commit;
+ struct commit *commit = view->lines
+ ? view->line[view->lines - 1].data : NULL;
switch (type) {
case LINE_COMMIT:
view->line[view->lines++].data = commit;
string_copy(commit->id, line);
commit->refs = get_refs(commit->id);
+ commit->graph[commit->graph_size++] = ACS_LTEE;
break;
case LINE_AUTHOR:
{
+ /* Parse author lines where the name may be empty:
+ * author <email@address.tld> 1138474660 +0100
+ */
char *ident = line + STRING_SIZE("author ");
- char *end = strchr(ident, '<');
+ char *nameend = strchr(ident, '<');
+ char *emailend = strchr(ident, '>');
- if (!prev)
+ if (!commit || !nameend || !emailend)
break;
- commit = prev->data;
-
- if (end) {
- for (; end > ident && isspace(end[-1]); end--) ;
- *end = 0;
+ *nameend = *emailend = 0;
+ ident = chomp_string(ident);
+ if (!*ident) {
+ ident = chomp_string(nameend + 1);
+ if (!*ident)
+ ident = "Unknown";
}
string_copy(commit->author, ident);
/* Parse epoch and timezone */
- if (end) {
- char *secs = strchr(end + 1, '>');
- char *zone;
- time_t time;
-
- if (!secs || secs[1] != ' ')
- break;
+ if (emailend[1] == ' ') {
+ char *secs = emailend + 2;
+ char *zone = strchr(secs, ' ');
+ time_t time = (time_t) atol(secs);
- secs += 2;
- time = (time_t) atol(secs);
- zone = strchr(secs, ' ');
if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
long tz;
time -= tz;
}
+
gmtime_r(&time, &commit->time);
}
break;
}
default:
- if (!prev)
+ if (!commit)
break;
- commit = prev->data;
-
/* Fill in the commit title if it has not already been set. */
if (commit->title[0])
break;
/* Require titles to start with a non-space character at the
* offset used by git log. */
- /* FIXME: More gracefull handling of titles; append "..." to
- * shortened titles, etc. */
- if (strncmp(line, " ", 4) ||
- isspace(line[4]))
+ if (strncmp(line, " ", 4))
+ break;
+ line += 4;
+ /* Well, if the title starts with a whitespace character,
+ * try to be forgiving. Otherwise we end up with no title. */
+ while (isspace(*line))
+ line++;
+ if (*line == '\0')
break;
+ /* FIXME: More graceful handling of titles; append "..." to
+ * shortened titles, etc. */
- string_copy(commit->title, line + 4);
+ string_copy(commit->title, line);
}
return TRUE;
return TRUE;
}
-static struct view_ops main_ops = {
- "commit",
- main_draw,
- main_read,
- main_enter,
-};
-
-
-/**
- * KEYS
- * ----
- * Below the default key bindings are shown.
- **/
-
-struct keymap {
- int alias;
- int request;
-};
-
-static struct keymap keymap[] = {
- /**
- * View switching
- * ~~~~~~~~~~~~~~
- * m::
- * Switch to main view.
- * d::
- * Switch to diff view.
- * l::
- * Switch to log view.
- * p::
- * Switch to pager view.
- * h::
- * Show man page.
- **/
- { 'm', REQ_VIEW_MAIN },
- { 'd', REQ_VIEW_DIFF },
- { 'l', REQ_VIEW_LOG },
- { 'p', REQ_VIEW_PAGER },
- { 'h', REQ_VIEW_HELP },
-
- /**
- * View manipulation
- * ~~~~~~~~~~~~~~~~~
- * q::
- * Close view, if multiple views are open it will jump back to the
- * previous view in the view stack. If it is the last open view it
- * will quit. Use 'Q' to quit all views at once.
- * Enter::
- * This key is "context sensitive" depending on what view you are
- * currently in. When in log view on a commit line or in the main
- * view, split the view and show the commit diff. In the diff view
- * pressing Enter will simply scroll the view one line down.
- * Tab::
- * Switch to next view.
- * Up::
- * This key is "context sensitive" and will move the cursor one
- * line up. However, uf you opened a diff view from the main view
- * (split- or full-screen) it will change the cursor to point to
- * the previous commit in the main view and update the diff view
- * to display it.
- * Down::
- * Similar to 'Up' but will move down.
- **/
- { 'q', REQ_VIEW_CLOSE },
- { KEY_TAB, REQ_VIEW_NEXT },
- { KEY_RETURN, REQ_ENTER },
- { KEY_UP, REQ_PREVIOUS },
- { KEY_DOWN, REQ_NEXT },
-
- /**
- * Cursor navigation
- * ~~~~~~~~~~~~~~~~~
- * j::
- * Move cursor one line up.
- * k::
- * Move cursor one line down.
- * PgUp::
- * b::
- * -::
- * Move cursor one page up.
- * PgDown::
- * Space::
- * Move cursor one page down.
- * Home::
- * Jump to first line.
- * End::
- * Jump to last line.
- **/
- { 'k', REQ_MOVE_UP },
- { 'j', REQ_MOVE_DOWN },
- { KEY_HOME, REQ_MOVE_FIRST_LINE },
- { KEY_END, REQ_MOVE_LAST_LINE },
- { KEY_NPAGE, REQ_MOVE_PAGE_DOWN },
- { ' ', REQ_MOVE_PAGE_DOWN },
- { KEY_PPAGE, REQ_MOVE_PAGE_UP },
- { 'b', REQ_MOVE_PAGE_UP },
- { '-', REQ_MOVE_PAGE_UP },
-
- /**
- * Scrolling
- * ~~~~~~~~~
- * Insert::
- * Scroll view one line up.
- * Delete::
- * Scroll view one line down.
- * w::
- * Scroll view one page up.
- * s::
- * Scroll view one page down.
- **/
- { KEY_IC, REQ_SCROLL_LINE_UP },
- { KEY_DC, REQ_SCROLL_LINE_DOWN },
- { 'w', REQ_SCROLL_PAGE_UP },
- { 's', REQ_SCROLL_PAGE_DOWN },
+static bool
+main_grep(struct view *view, struct line *line)
+{
+ struct commit *commit = line->data;
+ enum { S_TITLE, S_AUTHOR, S_DATE, 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: text = commit->author; break;
+ case S_DATE:
+ if (!strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time))
+ continue;
+ text = buf;
+ break;
- /**
- * Misc
- * ~~~~
- * Q::
- * Quit.
- * r::
- * Redraw screen.
- * z::
- * Stop all background loading. This can be useful if you use
- * tig(1) in a repository with a long history without limiting
- * the revision log.
- * v::
- * Show version.
- * n::
- * Toggle line numbers on/off.
- * ':'::
- * Open prompt. This allows you to specify what git command
- * to run. Example:
- *
- * :log -p
- **/
- { 'Q', REQ_QUIT },
- { 'z', REQ_STOP_LOADING },
- { 'v', REQ_SHOW_VERSION },
- { 'r', REQ_SCREEN_REDRAW },
- { 'n', REQ_TOGGLE_LINE_NUMBERS },
- { ':', REQ_PROMPT },
+ default:
+ return FALSE;
+ }
- /* wgetch() with nodelay() enabled returns ERR when there's no input. */
- { ERR, REQ_SCREEN_UPDATE },
+ if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+ return TRUE;
+ }
- /* Use the ncurses SIGWINCH handler. */
- { KEY_RESIZE, REQ_SCREEN_RESIZE },
-};
+ return FALSE;
+}
-static enum request
-get_request(int key)
+static void
+main_select(struct view *view, struct line *line)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(keymap); i++)
- if (keymap[i].alias == key)
- return keymap[i].request;
+ struct commit *commit = line->data;
- return (enum request) key;
+ string_copy(view->ref, commit->id);
+ string_copy(ref_commit, view->ref);
}
+static struct view_ops main_ops = {
+ "commit",
+ main_draw,
+ main_read,
+ main_enter,
+ main_grep,
+ main_select,
+};
+
/*
* Unicode / UTF-8 handling
/* The status window is used for polling keystrokes. */
static WINDOW *status_win;
+static bool status_empty = TRUE;
+
/* Update status and title window. */
static void
report(const char *msg, ...)
{
- static bool empty = TRUE;
struct view *view = display[current_view];
- if (!empty || *msg) {
+ if (input_mode)
+ return;
+
+ if (!status_empty || *msg) {
va_list args;
va_start(args, msg);
- werase(status_win);
wmove(status_win, 0, 0);
if (*msg) {
vwprintw(status_win, msg, args);
- empty = FALSE;
+ status_empty = FALSE;
} else {
- empty = TRUE;
+ status_empty = TRUE;
}
+ wclrtoeol(status_win);
wrefresh(status_win);
va_end(args);
}
update_view_title(view);
- update_display_cursor();
+ update_display_cursor(view);
}
/* Controls when nodelay should be in effect when polling user input. */
/* Leave stdin and stdout alone when acting as a pager. */
FILE *io = fopen("/dev/tty", "r+");
+ if (!io)
+ die("Failed to open /dev/tty");
cursed = !!newterm(NULL, io, io);
}
wbkgdset(status_win, get_line_attr(LINE_STATUS));
}
+static char *
+read_prompt(const char *prompt)
+{
+ enum { READING, STOP, CANCEL } status = READING;
+ static char buf[sizeof(opt_cmd) - STRING_SIZE("git \0")];
+ int pos = 0;
+
+ while (status == READING) {
+ struct view *view;
+ int i, key;
+
+ input_mode = TRUE;
+
+ foreach_view (view, i)
+ update_view(view);
+
+ input_mode = FALSE;
+
+ mvwprintw(status_win, 0, 0, "%s%.*s", prompt, pos, buf);
+ wclrtoeol(status_win);
+
+ /* Refresh, accept single keystroke of input */
+ key = wgetch(status_win);
+ switch (key) {
+ case KEY_RETURN:
+ case KEY_ENTER:
+ case '\n':
+ status = pos ? STOP : CANCEL;
+ break;
+
+ case KEY_BACKSPACE:
+ if (pos > 0)
+ pos--;
+ else
+ status = CANCEL;
+ break;
+
+ case KEY_ESC:
+ status = CANCEL;
+ break;
+
+ case ERR:
+ break;
+
+ default:
+ if (pos >= sizeof(buf)) {
+ report("Input string too long");
+ return NULL;
+ }
+
+ if (isprint(key))
+ buf[pos++] = (char) key;
+ }
+ }
+
+ /* Clear the status window */
+ status_empty = FALSE;
+ report("");
+
+ if (status == CANCEL)
+ return NULL;
+
+ buf[pos++] = 0;
+
+ return buf;
+}
/*
* Repository references
{
struct ref *ref;
bool tag = FALSE;
- bool tag_commit = FALSE;
- /* Commits referenced by tags has "^{}" appended. */
- if (name[namelen - 1] == '}') {
+ if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
+ /* Commits referenced by tags has "^{}" appended. */
+ if (name[namelen - 1] != '}')
+ return OK;
+
while (namelen > 0 && name[namelen] != '^')
namelen--;
- if (namelen > 0)
- tag_commit = TRUE;
- name[namelen] = 0;
- }
- if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
- if (!tag_commit)
- return OK;
- name += STRING_SIZE("refs/tags/");
tag = TRUE;
+ namelen -= STRING_SIZE("refs/tags/");
+ name += STRING_SIZE("refs/tags/");
} else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
- name += STRING_SIZE("refs/heads/");
+ namelen -= STRING_SIZE("refs/heads/");
+ name += STRING_SIZE("refs/heads/");
} else if (!strcmp(name, "HEAD")) {
return OK;
return ERR;
ref = &refs[refs_size++];
- ref->name = strdup(name);
+ ref->name = malloc(namelen + 1);
if (!ref->name)
return ERR;
+ strncpy(ref->name, name, namelen);
+ ref->name[namelen] = 0;
ref->tag = tag;
string_copy(ref->id, id);
static int
read_repo_config_option(char *name, int namelen, char *value, int valuelen)
{
- if (!strcmp(name, "i18n.commitencoding")) {
+ if (!strcmp(name, "i18n.commitencoding"))
string_copy(opt_encoding, value);
- }
return OK;
}
* Main
*/
-#if __GNUC__ >= 3
-#define __NORETURN __attribute__((__noreturn__))
-#else
-#define __NORETURN
-#endif
-
static void __NORETURN
quit(int sig)
{
signal(SIGINT, quit);
+ if (setlocale(LC_ALL, "")) {
+ string_copy(opt_codeset, nl_langinfo(CODESET));
+ }
+
if (load_options() == ERR)
die("Failed to load user config.");
if (!parse_options(argc, argv))
return 0;
+ if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) {
+ opt_iconv = iconv_open(opt_codeset, opt_encoding);
+ if (opt_iconv == ICONV_NONE)
+ die("Failed to initialize character set conversion");
+ }
+
if (load_refs() == ERR)
die("Failed to load refs.");
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
- request = get_request(key);
+
+ /* wgetch() with nodelay() enabled returns ERR when there's no
+ * input. */
+ if (key == ERR) {
+ request = REQ_NONE;
+ continue;
+ }
+
+ request = get_keybinding(display[current_view]->keymap, key);
/* Some low-level request handling. This keeps access to
* status_win restricted. */
switch (request) {
case REQ_PROMPT:
- report(":");
- /* Temporarily switch to line-oriented and echoed
- * input. */
- nocbreak();
- echo();
-
- if (wgetnstr(status_win, opt_cmd + 4, sizeof(opt_cmd) - 4) == OK) {
- memcpy(opt_cmd, "git ", 4);
- opt_request = REQ_VIEW_PAGER;
- } else {
- report("Prompt interrupted by loading view, "
- "press 'z' to stop loading views");
- request = REQ_SCREEN_UPDATE;
+ {
+ char *cmd = read_prompt(":");
+
+ if (cmd && string_format(opt_cmd, "git %s", cmd)) {
+ if (strncmp(cmd, "show", 4) && isspace(cmd[4])) {
+ opt_request = REQ_VIEW_DIFF;
+ } else {
+ opt_request = REQ_VIEW_PAGER;
+ }
+ break;
}
- noecho();
- cbreak();
+ request = REQ_NONE;
break;
+ }
+ case REQ_SEARCH:
+ case REQ_SEARCH_BACK:
+ {
+ const char *prompt = request == REQ_SEARCH
+ ? "/" : "?";
+ char *search = read_prompt(prompt);
+ if (search)
+ string_copy(opt_search, search);
+ else
+ request = REQ_NONE;
+ break;
+ }
case REQ_SCREEN_RESIZE:
{
int height, width;
return 0;
}
-
-/**
- * [[refspec]]
- * Revision specification
- * ----------------------
- * This section describes various ways to specify what revisions to display
- * or otherwise limit the view to. tig(1) does not itself parse the described
- * revision options so refer to the relevant git man pages for futher
- * information. Relevant man pages besides git-log(1) are git-diff(1) and
- * git-rev-list(1).
- *
- * You can tune the interaction with git by making use of the options
- * explained in this section. For example, by configuring the environment
- * variables described in the <<history-commands, "History commands">>
- * section.
- *
- * Limit by path name
- * ~~~~~~~~~~~~~~~~~~
- * If you are interested only in those revisions that made changes to a
- * specific file (or even several files) list the files like this:
- *
- * $ tig log Makefile README
- *
- * To avoid ambiguity with repository references such as tag name, be sure
- * to separate file names from other git options using "\--". So if you
- * have a file named 'master' it will clash with the reference named
- * 'master', and thus you will have to use:
- *
- * $ tig log -- master
- *
- * NOTE: For the main view, avoiding ambiguity will in some cases require
- * you to specify two "\--" options. The first will make tig(1) stop
- * option processing and the latter will be passed to git log.
- *
- * Limit by date or number
- * ~~~~~~~~~~~~~~~~~~~~~~~
- * To speed up interaction with git, you can limit the amount of commits
- * to show both for the log and main view. Either limit by date using
- * e.g. `--since=1.month` or limit by the number of commits using `-n400`.
- *
- * If you are only interested in changed that happened between two dates
- * you can use:
- *
- * $ tig -- --after="May 5th" --before="2006-05-16 15:44"
- *
- * NOTE: If you want to avoid having to quote dates containing spaces you
- * can use "." instead, e.g. `--after=May.5th`.
- *
- * Limiting by commit ranges
- * ~~~~~~~~~~~~~~~~~~~~~~~~~
- * Alternatively, commits can be limited to a specific range, such as
- * "all commits between 'tag-1.0' and 'tag-2.0'". For example:
- *
- * $ tig log tag-1.0..tag-2.0
- *
- * This way of commit limiting makes it trivial to only browse the commits
- * which haven't been pushed to a remote branch. Assuming 'origin' is your
- * upstream remote branch, using:
- *
- * $ tig log origin..HEAD
- *
- * will list what will be pushed to the remote branch. Optionally, the ending
- * 'HEAD' can be left out since it is implied.
- *
- * Limiting by reachability
- * ~~~~~~~~~~~~~~~~~~~~~~~~
- * Git interprets the range specifier "tag-1.0..tag-2.0" as
- * "all commits reachable from 'tag-2.0' but not from 'tag-1.0'".
- * Where reachability refers to what commits are ancestors (or part of the
- * history) of the branch or tagged revision in question.
- *
- * If you prefer to specify which commit to preview in this way use the
- * following:
- *
- * $ tig log tag-2.0 ^tag-1.0
- *
- * You can think of '^' as a negation operator. Using this alternate syntax,
- * it is possible to further prune commits by specifying multiple branch
- * cut offs.
- *
- * Combining revisions specification
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Revisions options can to some degree be combined, which makes it possible
- * to say "show at most 20 commits from within the last month that changed
- * files under the Documentation/ directory."
- *
- * $ tig -- --since=1.month -n20 -- Documentation/
- *
- * Examining all repository references
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * In some cases, it can be useful to query changes across all references
- * in a repository. An example is to ask "did any line of development in
- * this repository change a particular file within the last week". This
- * can be accomplished using:
- *
- * $ tig -- --all --since=1.week -- Makefile
- *
- * BUGS
- * ----
- * Known bugs and problems:
- *
- * - In it's current state tig is pretty much UTF-8 only.
- *
- * - If the screen width is very small the main view can draw
- * outside the current view causing bad wrapping. Same goes
- * for title and status windows.
- *
- * - The cursor can wrap-around on the last line and cause the
- * window to scroll.
- *
- * - The prompt doesn't work while loading.
- *
- * TODO
- * ----
- * Features that should be explored.
- *
- * - Searching.
- *
- * - Locale support.
- *
- * - Make '?' show a one page keybinding cheat sheet.
- *
- * COPYRIGHT
- * ---------
- * Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * SEE ALSO
- * --------
- * - link:http://www.kernel.org/pub/software/scm/git/docs/[git(7)],
- * - link:http://www.kernel.org/pub/software/scm/cogito/docs/[cogito(7)]
- *
- * Other git repository browsers:
- *
- * - gitk(1)
- * - qgit(1)
- * - gitview(1)
- **/
~mdw / tig / blobdiff