-/* Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2008 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 version 2 as
- * published by the Free Software Foundation.
+ * 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef TIG_VERSION
+#define TIG_VERSION "unknown-version"
#endif
#ifndef DEBUG
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
+#include <regex.h>
+
+#include <locale.h>
+#include <langinfo.h>
+#include <iconv.h>
+
+/* ncurses(3): Must be defined to have extended wide-character functions. */
+#define _XOPEN_SOURCE_EXTENDED
+
#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 warn(const char *msg, ...);
static void report(const char *msg, ...);
-static int read_properties(const char *cmd, int separator, int (*read)(char *, int, char *, int));
+static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, size_t, char *, size_t));
static void set_nonblocking_input(bool loading);
-static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed);
+static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve);
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#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 */
+
+/* Revision graph */
+
+#define REVGRAPH_INIT 'I'
+#define REVGRAPH_MERGE 'M'
+#define REVGRAPH_BRANCH '+'
+#define REVGRAPH_COMMIT '*'
+#define REVGRAPH_BOUND '^'
+#define REVGRAPH_LINE '|'
+
+#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)
+#ifndef ICONV_CONST
+#define ICONV_CONST /* nothing */
+#endif
/* 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 AUTHOR_COLS 20
+#define ID_COLS 8
/* The default interval between line numbers. */
-#define NUMBER_INTERVAL 1
+#define NUMBER_INTERVAL 5
#define TABSIZE 8
#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#define NULL_ID "0000000000000000000000000000000000000000"
+
+#ifndef GIT_CONFIG
+#define GIT_CONFIG "git config"
+#endif
+
+#define TIG_LS_REMOTE \
+ "git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
+
+#define TIG_DIFF_CMD \
+ "git show --pretty=fuller --no-color --root --patch-with-stat --find-copies-harder -C %s 2>/dev/null"
+
+#define TIG_LOG_CMD \
+ "git log --no-color --cc --stat -n100 %s 2>/dev/null"
+
+#define TIG_MAIN_CMD \
+ "git log --no-color --topo-order --parents --boundary --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 ""
+#define TIG_STATUS_CMD ""
+#define TIG_STAGE_CMD ""
+#define TIG_BLAME_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 ltag:1; /* If so, is the tag local? */
+ unsigned int remote:1; /* Is it a remote ref? */
unsigned int next:1; /* For ref lists: are there more refs? */
+ unsigned int head:1; /* Is it the current HEAD? */
};
static struct ref **get_refs(char *id);
+struct int_map {
+ const char *name;
+ int namelen;
+ int value;
+};
+
+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;
+}
+
/*
* String helpers
*/
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(src))
+
+#define string_ncopy(dst, src, srclen) \
+ string_ncopy_do(dst, sizeof(dst), src, srclen)
+
+#define string_copy_rev(dst, src) \
+ string_ncopy_do(dst, SIZEOF_REV, src, SIZEOF_REV - 1)
+
+#define string_add(dst, from, src) \
+ string_ncopy_do(dst + (from), sizeof(dst) - (from), src, sizeof(src))
+
+static char *
+chomp_string(char *name)
+{
+ int namelen;
+
+ while (isspace(*name))
+ name++;
+
+ namelen = strlen(name) - 1;
+ while (namelen > 0 && isspace(name[namelen]))
+ name[namelen--] = 0;
+
+ 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++)) {
}
BUFPUT('\'');
+ if (bufsize < SIZEOF_STR)
+ buf[bufsize] = 0;
+
return bufsize;
}
-/**
- * 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_BLAME, "Show blame view"), \
+ REQ_(VIEW_HELP, "Show help page"), \
+ REQ_(VIEW_PAGER, "Show pager view"), \
+ REQ_(VIEW_STATUS, "Show status view"), \
+ REQ_(VIEW_STAGE, "Show stage 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_(REFRESH, "Reload and refresh"), \
+ 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_(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_DATE, "Toggle date display"), \
+ REQ_(TOGGLE_AUTHOR, "Toggle author display"), \
+ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \
+ REQ_(TOGGLE_REFS, "Toggle reference display (tags/branches)"), \
+ REQ_(STATUS_UPDATE, "Update file status"), \
+ REQ_(STATUS_MERGE, "Merge file using external tool"), \
+ REQ_(TREE_PARENT, "Switch to parent directory in tree view"), \
+ REQ_(EDIT, "Open in editor"), \
+ REQ_(NONE, "Do nothing")
+
+
+/* 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
+
+#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_NONE;
+}
+
+
+/*
+ * Options
+ */
static const char usage[] =
-VERSION " (" __DATE__ ")\n"
+"tig " TIG_VERSION " (" __DATE__ ")\n"
"\n"
-"Usage: tig [options]\n"
-" or: tig [options] [--] [git log options]\n"
-" or: tig [options] log [git log options]\n"
-" or: tig [options] diff [git diff options]\n"
-" or: tig [options] show [git show options]\n"
-" or: tig [options] < [git command output]\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"
-" -l Start up in log view\n"
-" -d Start up in diff view\n"
-" -n[I], --line-number[=I] Show line numbers with given interval\n"
-" -t[N], --tab-size[=N] Set number of spaces for tab expansion\n"
-" -- Mark end of tig options\n"
-" -v, --version Show version and exit\n"
-" -h, --help Show help message and exit\n";
+" -v, --version Show version and exit\n"
+" -h, --help Show help message and exit";
/* 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;
-
-/* Returns the index of log or diff command or -1 to exit. */
+static bool opt_date = TRUE;
+static bool opt_author = TRUE;
+static bool opt_line_number = FALSE;
+static bool opt_rev_graph = FALSE;
+static bool opt_show_refs = 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 char opt_file[SIZEOF_STR] = "";
+static char opt_ref[SIZEOF_REF] = "";
+static char opt_head[SIZEOF_REF] = "";
+static bool opt_no_head = TRUE;
+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] = "";
+static char opt_cdup[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 bool
parse_options(int argc, char *argv[])
{
+ size_t buf_size;
+ char *subcommand;
+ bool seen_dashdash = FALSE;
int i;
- for (i = 1; i < argc; i++) {
- char *opt = argv[i];
+ if (argc <= 1)
+ return TRUE;
- /**
- * -l::
- * Start up in log view using the internal log command.
- **/
- if (!strcmp(opt, "-l")) {
- opt_request = REQ_VIEW_LOG;
- continue;
- }
+ subcommand = argv[1];
+ if (!strcmp(subcommand, "status") || !strcmp(subcommand, "-S")) {
+ opt_request = REQ_VIEW_STATUS;
+ if (!strcmp(subcommand, "-S"))
+ warn("`-S' has been deprecated; use `tig status' instead");
+ if (argc > 2)
+ warn("ignoring arguments after `%s'", subcommand);
+ return TRUE;
- /**
- * -d::
- * Start up in diff view using the internal diff command.
- **/
- if (!strcmp(opt, "-d")) {
- opt_request = REQ_VIEW_DIFF;
- continue;
- }
+ } else if (!strcmp(subcommand, "blame")) {
+ opt_request = REQ_VIEW_BLAME;
+ if (argc <= 2 || argc > 4)
+ die("invalid number of options to blame\n\n%s", usage);
- /**
- * -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;
+ i = 2;
+ if (argc == 4) {
+ string_ncopy(opt_ref, argv[i], strlen(argv[i]));
+ i++;
+ }
- if (opt[1] == 'n') {
- num = opt + 2;
+ string_ncopy(opt_file, argv[i], strlen(argv[i]));
+ return TRUE;
- } else if (opt[STRING_SIZE("--line-number")] == '=') {
- num = opt + STRING_SIZE("--line-number=");
- }
+ } else if (!strcmp(subcommand, "show")) {
+ opt_request = REQ_VIEW_DIFF;
- if (isdigit(*num))
- opt_num_interval = atoi(num);
+ } else if (!strcmp(subcommand, "log") || !strcmp(subcommand, "diff")) {
+ opt_request = subcommand[0] == 'l'
+ ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+ warn("`tig %s' has been deprecated", subcommand);
- opt_line_number = TRUE;
- continue;
- }
+ } else {
+ subcommand = NULL;
+ }
- /**
- * -t[NSPACES], --tab-size[=NSPACES]::
- * Set the number of spaces tabs should be expanded to.
- **/
- if (!strncmp(opt, "-t", 2) ||
- !strncmp(opt, "--tab-size", 10)) {
- char *num = opt;
+ if (!subcommand)
+ /* XXX: This is vulnerable to the user overriding
+ * options required for the main view parser. */
+ string_copy(opt_cmd, "git log --no-color --pretty=raw --boundary --parents");
+ else
+ string_format(opt_cmd, "git %s", subcommand);
- if (opt[1] == 't') {
- num = opt + 2;
+ buf_size = strlen(opt_cmd);
- } else if (opt[STRING_SIZE("--tab-size")] == '=') {
- num = opt + STRING_SIZE("--tab-size=");
- }
+ for (i = 1 + !!subcommand; i < argc; i++) {
+ char *opt = argv[i];
- if (isdigit(*num))
- opt_tab_size = MIN(atoi(num), TABSIZE);
- continue;
- }
+ if (seen_dashdash || !strcmp(opt, "--")) {
+ seen_dashdash = TRUE;
- /**
- * -v, --version::
- * Show version and exit.
- **/
- if (!strcmp(opt, "-v") ||
- !strcmp(opt, "--version")) {
- printf("tig version %s\n", VERSION);
+ } else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) {
+ printf("tig version %s\n", TIG_VERSION);
return FALSE;
- }
- /**
- * -h, --help::
- * Show help message and exit.
- **/
- if (!strcmp(opt, "-h") ||
- !strcmp(opt, "--help")) {
+ } else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
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);
+ opt_cmd[buf_size++] = ' ';
+ buf_size = sq_quote(opt_cmd, buf_size, opt);
+ if (buf_size >= sizeof(opt_cmd))
+ die("command too long");
}
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");
- else
- string_copy(opt_cmd, "git");
- buf_size = strlen(opt_cmd);
-
- while (buf_size < sizeof(opt_cmd) && i < argc) {
- opt_cmd[buf_size++] = ' ';
- buf_size = sq_quote(opt_cmd, buf_size, argv[i++]);
- }
-
- if (buf_size >= sizeof(opt_cmd))
- die("command too long");
-
- opt_cmd[buf_size] = 0;
-
+ buf_size = 0;
}
- if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
- opt_utf8 = FALSE;
+ opt_cmd[buf_size] = 0;
return TRUE;
}
-/**
- * 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"
-
-/**
- * [[view-commands]]
- * View 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 \
- ""
-
-
/*
* Line-oriented content detection.
*/
#define LINE_INFO \
-/* Line type String to match Foreground Background Attributes
- * --------- --------------- ---------- ---------- ---------- */ \
-/* Diff markup */ \
-LINE(DIFF, "diff --git ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_INDEX, "index ", COLOR_BLUE, COLOR_DEFAULT, 0), \
+LINE(DIFF_HEADER, "diff --git ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
LINE(DIFF_CHUNK, "@@", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(DIFF_ADD, "+", COLOR_GREEN, COLOR_DEFAULT, 0), \
LINE(DIFF_DEL, "-", COLOR_RED, COLOR_DEFAULT, 0), \
-LINE(DIFF_OLDMODE, "old file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_NEWMODE, "new file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_COPY, "copy ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_RENAME, "rename ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_SIM, "similarity ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-LINE(DIFF_DISSIM, "dissimilarity ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-/* Pretty print commit header */ \
+LINE(DIFF_INDEX, "index ", COLOR_BLUE, COLOR_DEFAULT, 0), \
+LINE(DIFF_OLDMODE, "old file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_NEWMODE, "new file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_COPY_FROM, "copy from", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_COPY_TO, "copy to", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_RENAME_FROM, "rename from", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_RENAME_TO, "rename to", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_SIMILARITY, "similarity ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_DISSIMILARITY,"dissimilarity ", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(DIFF_TREE, "diff-tree ", COLOR_BLUE, COLOR_DEFAULT, 0), \
LINE(PP_AUTHOR, "Author: ", COLOR_CYAN, COLOR_DEFAULT, 0), \
LINE(PP_COMMIT, "Commit: ", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(PP_MERGE, "Merge: ", COLOR_BLUE, 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), \
-/* Raw commit header */ \
+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), \
-/* Misc */ \
-LINE(DIFF_TREE, "diff-tree ", COLOR_BLUE, COLOR_DEFAULT, 0), \
LINE(SIGNOFF, " Signed-off-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \
-/* UI colors */ \
+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(DELIMITER, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(TITLE_BLUR, "", COLOR_WHITE, COLOR_BLUE, 0), \
LINE(TITLE_FOCUS, "", COLOR_WHITE, COLOR_BLUE, A_BOLD), \
LINE(MAIN_DATE, "", COLOR_BLUE, COLOR_DEFAULT, 0), \
LINE(MAIN_AUTHOR, "", COLOR_GREEN, COLOR_DEFAULT, 0), \
LINE(MAIN_COMMIT, "", COLOR_DEFAULT, 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(MAIN_LOCAL_TAG,"", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \
+LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \
+LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \
+LINE(MAIN_HEAD, "", COLOR_RED, COLOR_DEFAULT, A_BOLD), \
+LINE(MAIN_REVGRAPH,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
+LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
+LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
+LINE(STAT_HEAD, "", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(STAT_SECTION, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
+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(BLAME_DATE, "", COLOR_BLUE, COLOR_DEFAULT, 0), \
+LINE(BLAME_AUTHOR, "", COLOR_GREEN, COLOR_DEFAULT, 0), \
+LINE(BLAME_COMMIT, "", COLOR_DEFAULT, COLOR_DEFAULT, 0), \
+LINE(BLAME_ID, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
+LINE(BLAME_LINENO, "", COLOR_CYAN, COLOR_DEFAULT, 0)
enum line_type {
#define LINE(type, line, fg, bg, attr) \
};
struct line_info {
+ const char *name; /* Option name. */
+ int namelen; /* Size of option name. */
const char *line; /* The start of line to match. */
int linelen; /* Size of string to match. */
int fg, bg, attr; /* Color and text attributes for the lines. */
static struct line_info line_info[] = {
#define LINE(type, line, fg, bg, attr) \
- { (line), STRING_SIZE(line), (fg), (bg), (attr) }
+ { #type, STRING_SIZE(#type), (line), STRING_SIZE(line), (fg), (bg), (attr) }
LINE_INFO
#undef LINE
};
return COLOR_PAIR(type) | line_info[type].attr;
}
+static struct line_info *
+get_line_info(char *name)
+{
+ size_t namelen = strlen(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))
+ return &line_info[type];
+
+ return NULL;
+}
+
static void
init_colors(void)
{
- int default_bg = COLOR_BLACK;
- int default_fg = COLOR_WHITE;
+ int default_bg = line_info[LINE_DEFAULT].bg;
+ int default_fg = line_info[LINE_DEFAULT].fg;
enum line_type type;
start_color();
- if (use_default_colors() != ERR) {
- default_bg = -1;
- default_fg = -1;
+ if (assume_default_colors(default_fg, default_bg) == ERR) {
+ default_bg = COLOR_BLACK;
+ default_fg = COLOR_WHITE;
}
for (type = 0; type < ARRAY_SIZE(line_info); type++) {
struct line {
enum line_type type;
+
+ /* State flags */
+ unsigned int selected:1;
+ unsigned int dirty:1;
+
void *data; /* User data */
};
-/**
- * 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'.
- **/
+/*
+ * Keys
+ */
-struct view;
-struct view_ops;
+struct keybinding {
+ int alias;
+ enum request request;
+ struct keybinding *next;
+};
-/* The display array of active views and the index of the current view. */
-static struct view *display[2];
-static unsigned int current_view;
+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 },
+ { 'B', REQ_VIEW_BLAME },
+ { 'p', REQ_VIEW_PAGER },
+ { 'h', REQ_VIEW_HELP },
+ { 'S', REQ_VIEW_STATUS },
+ { 'c', REQ_VIEW_STAGE },
-#define foreach_view(view, i) \
- for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
+ /* View manipulation */
+ { 'q', REQ_VIEW_CLOSE },
+ { KEY_TAB, REQ_VIEW_NEXT },
+ { KEY_RETURN, REQ_ENTER },
+ { KEY_UP, REQ_PREVIOUS },
+ { KEY_DOWN, REQ_NEXT },
+ { 'R', REQ_REFRESH },
-#define displayed_views() (display[1] != NULL ? 2 : 1)
+ /* 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 },
-/**
- * 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.
- **/
+ /* Scrolling */
+ { KEY_IC, REQ_SCROLL_LINE_UP },
+ { KEY_DC, REQ_SCROLL_LINE_DOWN },
+ { 'w', REQ_SCROLL_PAGE_UP },
+ { 's', REQ_SCROLL_PAGE_DOWN },
-static char ref_commit[SIZEOF_REF] = "HEAD";
-static char ref_head[SIZEOF_REF] = "HEAD";
+ /* Searching */
+ { '/', REQ_SEARCH },
+ { '?', REQ_SEARCH_BACK },
+ { 'n', REQ_FIND_NEXT },
+ { 'N', REQ_FIND_PREV },
-struct view {
- 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} */
+ /* Misc */
+ { 'Q', REQ_QUIT },
+ { 'z', REQ_STOP_LOADING },
+ { 'v', REQ_SHOW_VERSION },
+ { 'r', REQ_SCREEN_REDRAW },
+ { '.', REQ_TOGGLE_LINENO },
+ { 'D', REQ_TOGGLE_DATE },
+ { 'A', REQ_TOGGLE_AUTHOR },
+ { 'g', REQ_TOGGLE_REV_GRAPH },
+ { 'F', REQ_TOGGLE_REFS },
+ { ':', REQ_PROMPT },
+ { 'u', REQ_STATUS_UPDATE },
+ { 'M', REQ_STATUS_MERGE },
+ { ',', REQ_TREE_PARENT },
+ { 'e', REQ_EDIT },
- struct view_ops *ops; /* View operations */
+ /* Using the ncurses SIGWINCH handler. */
+ { KEY_RESIZE, REQ_SCREEN_RESIZE },
+};
- char cmd[SIZEOF_CMD]; /* Command buffer */
- char ref[SIZEOF_REF]; /* Hovered commit reference */
- char vid[SIZEOF_REF]; /* View ID. Set to id member when updating. */
+#define KEYMAP_INFO \
+ KEYMAP_(GENERIC), \
+ KEYMAP_(MAIN), \
+ KEYMAP_(DIFF), \
+ KEYMAP_(LOG), \
+ KEYMAP_(TREE), \
+ KEYMAP_(BLOB), \
+ KEYMAP_(BLAME), \
+ KEYMAP_(PAGER), \
+ KEYMAP_(HELP), \
+ KEYMAP_(STATUS), \
+ KEYMAP_(STAGE)
+
+enum keymap {
+#define KEYMAP_(name) KEYMAP_##name
+ KEYMAP_INFO
+#undef KEYMAP_
+};
- int height, width; /* The width and height of the main window */
- WINDOW *win; /* The main window */
- WINDOW *title; /* The title window living below the main window */
+static struct int_map keymap_table[] = {
+#define KEYMAP_(name) { #name, STRING_SIZE(#name), KEYMAP_##name }
+ KEYMAP_INFO
+#undef KEYMAP_
+};
- /* Navigation */
- unsigned long offset; /* Offset of the window top */
- unsigned long lineno; /* Current line number */
+#define set_keymap(map, name) \
+ set_from_int_map(keymap_table, ARRAY_SIZE(keymap_table), map, name, strlen(name))
- /* 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;
+static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
- /* Buffering */
- unsigned long lines; /* Total number of lines */
- struct line *line; /* Line index */
- unsigned int digits; /* Number of digits in the lines member. */
+static void
+add_keybinding(enum keymap keymap, enum request request, int key)
+{
+ struct keybinding *keybinding;
- /* Loading */
- FILE *pipe;
- time_t start_time;
-};
+ keybinding = calloc(1, sizeof(*keybinding));
+ if (!keybinding)
+ die("Failed to allocate keybinding");
-struct view_ops {
- /* 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);
- /* Read one line; updates view->line. */
- bool (*read)(struct view *view, struct line *prev, char *data);
- /* Depending on view, change display based on current line. */
- bool (*enter)(struct view *view, struct line *line);
-};
+ keybinding->alias = key;
+ keybinding->request = request;
+ keybinding->next = keybindings[keymap];
+ keybindings[keymap] = keybinding;
+}
-static struct view_ops pager_ops;
-static struct view_ops main_ops;
+/* 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;
-#define VIEW_STR(name, cmd, env, ref, ops) \
- { name, cmd, #env, ref, ops }
+ for (kbd = keybindings[keymap]; kbd; kbd = kbd->next)
+ if (kbd->alias == key)
+ return kbd->request;
-#define VIEW_(id, name, ops, ref) \
- VIEW_STR(name, TIG_##id##_CMD, TIG_##id##_CMD, ref, ops)
+ for (kbd = keybindings[KEYMAP_GENERIC]; kbd; kbd = kbd->next)
+ if (kbd->alias == key)
+ return kbd->request;
-/**
- * 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.
- **/
+ for (i = 0; i < ARRAY_SIZE(default_keybindings); i++)
+ if (default_keybindings[i].alias == key)
+ return default_keybindings[i].request;
-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_(HELP, "help", &pager_ops, "static"),
- VIEW_(PAGER, "pager", &pager_ops, "static"),
-};
+ return (enum request) key;
+}
-#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
+struct key {
+ char *name;
+ int value;
+};
-static bool
-draw_view_line(struct view *view, unsigned int lineno)
+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)
{
- if (view->offset + lineno >= view->lines)
- return FALSE;
+ 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 view->ops->draw(view, &view->line[view->offset + lineno], lineno);
+ return ERR;
}
-static void
-redraw_view_from(struct view *view, int lineno)
+static char *
+get_key_name(int key_value)
{
- assert(0 <= lineno && lineno < view->height);
-
- for (; lineno < view->height; lineno++) {
- if (!draw_view_line(view, lineno))
- break;
+ static char key_char[] = "'X'";
+ char *seq = NULL;
+ int key;
+
+ for (key = 0; key < ARRAY_SIZE(key_table); key++)
+ if (key_table[key].value == key_value)
+ seq = key_table[key].name;
+
+ if (seq == NULL &&
+ key_value < 127 &&
+ isprint(key_value)) {
+ key_char[1] = (char) key_value;
+ seq = key_char;
}
- redrawwin(view->win);
- wrefresh(view->win);
+ return seq ? seq : "'?'";
}
-static void
-redraw_view(struct view *view)
+static char *
+get_key(enum request request)
{
- wclear(view->win);
- redraw_view_from(view, 0);
-}
+ static char buf[BUFSIZ];
+ size_t pos = 0;
+ char *sep = "";
+ int i;
+ buf[pos] = 0;
-/**
- * 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 (i = 0; i < ARRAY_SIZE(default_keybindings); i++) {
+ struct keybinding *keybinding = &default_keybindings[i];
-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));
+ if (keybinding->request != request)
+ continue;
- werase(view->title);
- wmove(view->title, 0, 0);
+ if (!string_format_from(buf, &pos, "%s%s", sep,
+ get_key_name(keybinding->alias)))
+ return "Too many keybindings!";
+ sep = ", ";
+ }
- if (*view->ref)
- wprintw(view->title, "[%s] %s", view->name, view->ref);
- else
- wprintw(view->title, "[%s]", view->name);
+ return buf;
+}
- if (view->lines || view->pipe) {
- unsigned int lines = view->lines
- ? (view->lineno + 1) * 100 / view->lines
- : 0;
+struct run_request {
+ enum keymap keymap;
+ int key;
+ char cmd[SIZEOF_STR];
+};
- wprintw(view->title, " - %s %d of %d (%d%%)",
- view->ops->type,
- view->lineno + 1,
- view->lines,
- lines);
- }
+static struct run_request *run_request;
+static size_t run_requests;
- if (view->pipe) {
- time_t secs = time(NULL) - view->start_time;
+static enum request
+add_run_request(enum keymap keymap, int key, int argc, char **argv)
+{
+ struct run_request *tmp;
+ struct run_request req = { keymap, key };
+ size_t bufpos;
- /* Three git seconds are a long time ... */
- if (secs > 2)
- wprintw(view->title, " %lds", secs);
- }
+ for (bufpos = 0; argc > 0; argc--, argv++)
+ if (!string_format_from(req.cmd, &bufpos, "%s ", *argv))
+ return REQ_NONE;
+
+ req.cmd[bufpos - 1] = 0;
+ tmp = realloc(run_request, (run_requests + 1) * sizeof(*run_request));
+ if (!tmp)
+ return REQ_NONE;
+
+ run_request = tmp;
+ run_request[run_requests++] = req;
+
+ return REQ_NONE + run_requests;
+}
- wrefresh(view->title);
+static struct run_request *
+get_run_request(enum request request)
+{
+ if (request <= REQ_NONE)
+ return NULL;
+ return &run_request[request - REQ_NONE - 1];
}
static void
-resize_display(void)
+add_builtin_run_requests(void)
{
- int offset, i;
- struct view *base = display[0];
- struct view *view = display[1] ? display[1] : display[0];
+ struct {
+ enum keymap keymap;
+ int key;
+ char *argv[1];
+ } reqs[] = {
+ { KEYMAP_MAIN, 'C', { "git cherry-pick %(commit)" } },
+ { KEYMAP_GENERIC, 'G', { "git gc" } },
+ };
+ int i;
- /* Setup window dimensions */
+ for (i = 0; i < ARRAY_SIZE(reqs); i++) {
+ enum request req;
- getmaxyx(stdscr, base->height, base->width);
+ req = add_run_request(reqs[i].keymap, reqs[i].key, 1, reqs[i].argv);
+ if (req != REQ_NONE)
+ add_keybinding(reqs[i].keymap, req, reqs[i].key);
+ }
+}
- /* Make room for the status window. */
- base->height -= 1;
+/*
+ * User config file handling.
+ */
- if (view != base) {
- /* Horizontal split. */
- view->width = base->width;
- view->height = SCALE_SPLIT_VIEW(base->height);
- base->height -= view->height;
+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),
+};
- /* Make room for the title bar. */
- view->height -= 1;
- }
+#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),
+};
- /* Make room for the title bar. */
- base->height -= 1;
+#define set_attribute(attr, name) \
+ set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, strlen(name))
- offset = 0;
+static int config_lineno;
+static bool config_errors;
+static char *config_msg;
- foreach_view (view, i) {
- if (!view->win) {
- view->win = newwin(view->height, 0, offset, 0);
- if (!view->win)
- die("Failed to create %s view", view->name);
+/* Wants: object fgcolor bgcolor [attr] */
+static int
+option_color_command(int argc, char *argv[])
+{
+ struct line_info *info;
- scrollok(view->win, TRUE);
+ if (argc != 3 && argc != 4) {
+ config_msg = "Wrong number of arguments given to color command";
+ return ERR;
+ }
- view->title = newwin(1, 0, offset + view->height, 0);
- if (!view->title)
- die("Failed to create title window");
+ 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 {
- wresize(view->win, view->height, view->width);
- mvwin(view->win, offset, 0);
- mvwin(view->title, offset + view->height, 0);
- wrefresh(view->win);
+ config_msg = "Unknown color name";
+ return ERR;
}
+ }
- offset += view->height + 1;
+ 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;
}
-static void
-redraw_display(void)
+static bool parse_bool(const char *s)
{
- struct view *view;
- int i;
+ return (!strcmp(s, "1") || !strcmp(s, "true") ||
+ !strcmp(s, "yes")) ? TRUE : FALSE;
+}
- foreach_view (view, i) {
- redraw_view(view);
- update_view_title(view);
+/* 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;
+ }
-/*
- * Navigation
- */
+ if (!strcmp(argv[0], "show-author")) {
+ opt_author = parse_bool(argv[2]);
+ return OK;
+ }
-/* Scrolling backend */
-static void
-do_scroll_view(struct view *view, int lines, bool redraw)
-{
- /* The rendering expects the new offset. */
- view->offset += lines;
+ if (!strcmp(argv[0], "show-date")) {
+ opt_date = parse_bool(argv[2]);
+ return OK;
+ }
- assert(0 <= view->offset && view->offset < view->lines);
- assert(lines);
+ if (!strcmp(argv[0], "show-rev-graph")) {
+ opt_rev_graph = parse_bool(argv[2]);
+ return OK;
+ }
- /* Redraw the whole screen if scrolling is pointless. */
- if (view->height < ABS(lines)) {
- redraw_view(view);
+ if (!strcmp(argv[0], "show-refs")) {
+ opt_show_refs = parse_bool(argv[2]);
+ return OK;
+ }
- } else {
- int line = lines > 0 ? view->height - lines : 0;
- int end = line + ABS(lines);
+ if (!strcmp(argv[0], "show-line-numbers")) {
+ opt_line_number = parse_bool(argv[2]);
+ return OK;
+ }
- wscrl(view->win, lines);
+ if (!strcmp(argv[0], "line-number-interval")) {
+ opt_num_interval = atoi(argv[2]);
+ return OK;
+ }
- for (; line < end; line++) {
- if (!draw_view_line(view, line))
- break;
- }
+ if (!strcmp(argv[0], "tab-size")) {
+ opt_tab_size = atoi(argv[2]);
+ return OK;
}
- /* Move current line into the view. */
- if (view->lineno < view->offset) {
- view->lineno = view->offset;
- draw_view_line(view, 0);
+ if (!strcmp(argv[0], "commit-encoding")) {
+ char *arg = argv[2];
+ int delimiter = *arg;
+ int i;
- } 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);
+ switch (delimiter) {
+ case '"':
+ case '\'':
+ for (arg++, i = 0; arg[i]; i++)
+ if (arg[i] == delimiter) {
+ arg[i] = 0;
+ break;
+ }
+ default:
+ string_ncopy(opt_encoding, arg, strlen(arg));
+ return OK;
}
- view->lineno = view->offset + view->height - 1;
- 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("");
+ config_msg = "Unknown variable name";
+ return ERR;
}
-/* Scroll frontend */
-static void
-scroll_view(struct view *view, enum request request)
+/* Wants: mode request key */
+static int
+option_bind_command(int argc, char *argv[])
{
- int lines = 1;
-
- switch (request) {
- case REQ_SCROLL_PAGE_DOWN:
- lines = view->height;
- case REQ_SCROLL_LINE_DOWN:
- if (view->offset + lines > view->lines)
- lines = view->lines - view->offset;
+ enum request request;
+ int keymap;
+ int key;
- if (lines == 0 || view->offset + view->height >= view->lines) {
- report("Cannot scroll beyond the last line");
- return;
- }
- break;
+ if (argc < 3) {
+ config_msg = "Wrong number of arguments given to bind command";
+ return ERR;
+ }
- case REQ_SCROLL_PAGE_UP:
- lines = view->height;
- case REQ_SCROLL_LINE_UP:
- if (lines > view->offset)
- lines = view->offset;
+ if (set_keymap(&keymap, argv[0]) == ERR) {
+ config_msg = "Unknown key map";
+ return ERR;
+ }
- if (lines == 0) {
- report("Cannot scroll beyond the first line");
- return;
- }
+ key = get_key_value(argv[1]);
+ if (key == ERR) {
+ config_msg = "Unknown key";
+ return ERR;
+ }
- lines = -lines;
- break;
+ request = get_request(argv[2]);
+ if (request == REQ_NONE) {
+ const char *obsolete[] = { "cherry-pick" };
+ size_t namelen = strlen(argv[2]);
+ int i;
- default:
- die("request %d not handled in switch", request);
+ for (i = 0; i < ARRAY_SIZE(obsolete); i++) {
+ if (namelen == strlen(obsolete[i]) &&
+ !string_enum_compare(obsolete[i], argv[2], namelen)) {
+ 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) {
+ config_msg = "Unknown request name";
+ return ERR;
}
- do_scroll_view(view, lines, TRUE);
+ add_keybinding(keymap, request, key);
+
+ return OK;
}
-/* Cursor moving */
-static void
-move_view(struct view *view, enum request request, bool redraw)
+static int
+set_option(char *opt, char *value)
{
- int steps;
+ char *argv[16];
+ int valuelen;
+ int argc = 0;
- switch (request) {
+ /* Tokenize */
+ while (argc < ARRAY_SIZE(argv) && (valuelen = strcspn(value, " \t"))) {
+ argv[argc++] = value;
+ value += valuelen;
+
+ /* Nothing more to tokenize or last available token. */
+ if (!*value || argc >= ARRAY_SIZE(argv))
+ 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, size_t optlen, char *value, size_t valuelen)
+{
+ int status = OK;
+
+ config_lineno++;
+ config_msg = "Internal error";
+
+ /* 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;
+
+ if (opt[optlen] != 0) {
+ config_msg = "No option value";
+ status = ERR;
+
+ } else {
+ /* Look for comment endings in the value. */
+ size_t len = strcspn(value, "#");
+
+ if (len < valuelen) {
+ valuelen = len;
+ value[valuelen] = 0;
+ }
+
+ status = set_option(opt, value);
+ }
+
+ if (status == ERR) {
+ fprintf(stderr, "Error on line %d, near '%.*s': %s\n",
+ config_lineno, (int) optlen, opt, config_msg);
+ config_errors = TRUE;
+ }
+
+ /* Always keep going if errors are encountered. */
+ return OK;
+}
+
+static void
+load_option_file(const char *path)
+{
+ FILE *file;
+
+ /* It's ok that the file doesn't exist. */
+ file = fopen(path, "r");
+ if (!file)
+ return;
+
+ config_lineno = 0;
+ config_errors = FALSE;
+
+ if (read_properties(file, " \t", read_option) == ERR ||
+ config_errors == TRUE)
+ fprintf(stderr, "Errors while loading %s.\n", path);
+}
+
+static int
+load_options(void)
+{
+ char *home = getenv("HOME");
+ char *tigrc_user = getenv("TIGRC_USER");
+ 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;
+ }
+ load_option_file(tigrc_system);
+
+ if (!tigrc_user) {
+ if (!home || !string_format(buf, "%s/.tigrc", home))
+ return ERR;
+ tigrc_user = buf;
+ }
+ load_option_file(tigrc_user);
+
+ return OK;
+}
+
+
+/*
+ * The viewer
+ */
+
+struct view;
+struct view_ops;
+
+/* The display array of active views and the index of the current view. */
+static struct view *display[2];
+static unsigned int current_view;
+
+/* 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 */
+static char ref_blob[SIZEOF_REF] = "";
+static char ref_commit[SIZEOF_REF] = "HEAD";
+static char ref_head[SIZEOF_REF] = "HEAD";
+
+struct view {
+ 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,blob} */
+
+ struct view_ops *ops; /* View operations */
+
+ 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. */
+
+ int height, width; /* The width and height of the main window */
+ WINDOW *win; /* The main window */
+ WINDOW *title; /* The title window living below the main window */
+
+ /* Navigation */
+ 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 */
+ size_t lines; /* Total number of lines */
+ struct line *line; /* Line index */
+ size_t line_alloc; /* Total number of allocated lines */
+ size_t line_size; /* Total number of used lines */
+ unsigned int digits; /* Number of digits in the lines member. */
+
+ /* Loading */
+ FILE *pipe;
+ time_t start_time;
+};
+
+struct view_ops {
+ /* What type of content being displayed. Used in the title bar. */
+ const char *type;
+ /* Open and reads in all view content. */
+ bool (*open)(struct view *view);
+ /* Read one line; updates view->line. */
+ bool (*read)(struct view *view, char *data);
+ /* Draw one line; @lineno must be < view->height. */
+ bool (*draw)(struct view *view, struct line *line, unsigned int lineno, bool selected);
+ /* 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. */
+ 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;
+static struct view_ops blame_ops;
+static struct view_ops help_ops;
+static struct view_ops status_ops;
+static struct view_ops stage_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, KEYMAP_##id)
+
+
+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_(BLAME, "blame", &blame_ops, ref_commit),
+ VIEW_(HELP, "help", &help_ops, ""),
+ VIEW_(PAGER, "pager", &pager_ops, "stdin"),
+ VIEW_(STATUS, "status", &status_ops, ""),
+ VIEW_(STAGE, "stage", &stage_ops, ""),
+};
+
+#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 int
+draw_text(struct view *view, const char *string, int max_len,
+ bool use_tilde, bool selected)
+{
+ int len = 0;
+ int trimmed = FALSE;
+
+ if (max_len <= 0)
+ return 0;
+
+ if (opt_utf8) {
+ len = utf8_length(string, max_len, &trimmed, use_tilde);
+ } else {
+ len = strlen(string);
+ if (len > max_len) {
+ if (use_tilde) {
+ max_len -= 1;
+ }
+ len = max_len;
+ trimmed = TRUE;
+ }
+ }
+
+ waddnstr(view->win, string, len);
+ if (trimmed && use_tilde) {
+ if (!selected)
+ wattrset(view->win, get_line_attr(LINE_DELIMITER));
+ waddch(view->win, '~');
+ len++;
+ }
+
+ return len;
+}
+
+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;
+
+ 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
+redraw_view_dirty(struct view *view)
+{
+ bool dirty = FALSE;
+ int lineno;
+
+ for (lineno = 0; lineno < view->height; lineno++) {
+ struct line *line = &view->line[view->offset + lineno];
+
+ if (!line->dirty)
+ continue;
+ line->dirty = 0;
+ dirty = TRUE;
+ if (!draw_view_line(view, lineno))
+ break;
+ }
+
+ if (!dirty)
+ return;
+ redrawwin(view->win);
+ if (input_mode)
+ wnoutrefresh(view->win);
+ else
+ wrefresh(view->win);
+}
+
+static void
+redraw_view_from(struct view *view, int lineno)
+{
+ assert(0 <= lineno && lineno < view->height);
+
+ for (; lineno < view->height; lineno++) {
+ if (!draw_view_line(view, lineno))
+ break;
+ }
+
+ redrawwin(view->win);
+ if (input_mode)
+ wnoutrefresh(view->win);
+ else
+ wrefresh(view->win);
+}
+
+static void
+redraw_view(struct view *view)
+{
+ wclear(view->win);
+ redraw_view_from(view, 0);
+}
+
+
+static void
+update_view_title(struct view *view)
+{
+ char buf[SIZEOF_STR];
+ char state[SIZEOF_STR];
+ size_t bufpos = 0, statelen = 0;
+
+ assert(view_is_displayed(view));
+
+ if (view != VIEW(REQ_VIEW_STATUS) && (view->lines || view->pipe)) {
+ unsigned int view_lines = view->offset + view->height;
+ unsigned int lines = view->lines
+ ? MIN(view_lines, view->lines) * 100 / view->lines
+ : 0;
+
+ 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);
+ }
+ }
+
+ 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", (int) refsize, view->ref);
+ }
+
+ 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);
+
+ if (input_mode)
+ wnoutrefresh(view->title);
+ else
+ wrefresh(view->title);
+}
+
+static void
+resize_display(void)
+{
+ int offset, i;
+ struct view *base = display[0];
+ struct view *view = display[1] ? display[1] : display[0];
+
+ /* Setup window dimensions */
+
+ getmaxyx(stdscr, base->height, base->width);
+
+ /* Make room for the status window. */
+ base->height -= 1;
+
+ if (view != base) {
+ /* Horizontal split. */
+ view->width = base->width;
+ view->height = SCALE_SPLIT_VIEW(base->height);
+ base->height -= view->height;
+
+ /* Make room for the title bar. */
+ view->height -= 1;
+ }
+
+ /* Make room for the title bar. */
+ base->height -= 1;
+
+ offset = 0;
+
+ foreach_displayed_view (view, i) {
+ if (!view->win) {
+ view->win = newwin(view->height, 0, offset, 0);
+ if (!view->win)
+ die("Failed to create %s view", view->name);
+
+ scrollok(view->win, TRUE);
+
+ view->title = newwin(1, 0, offset + view->height, 0);
+ if (!view->title)
+ die("Failed to create title window");
+
+ } else {
+ wresize(view->win, view->height, view->width);
+ mvwin(view->win, offset, 0);
+ mvwin(view->title, offset + view->height, 0);
+ }
+
+ offset += view->height + 1;
+ }
+}
+
+static void
+redraw_display(void)
+{
+ struct view *view;
+ int i;
+
+ foreach_displayed_view (view, i) {
+ redraw_view(view);
+ update_view_title(view);
+ }
+}
+
+static void
+update_display_cursor(struct view *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
+ * the cursor does not jump around. */
+ if (view->lines) {
+ wmove(view->win, view->lineno - view->offset, view->width - 1);
+ wrefresh(view->win);
+ }
+}
+
+/*
+ * Navigation
+ */
+
+/* Scrolling backend */
+static void
+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);
+
+ } else {
+ int line = lines > 0 ? view->height - lines : 0;
+ int end = line + ABS(lines);
+
+ wscrl(view->win, lines);
+
+ for (; line < end; line++) {
+ if (!draw_view_line(view, line))
+ break;
+ }
+
+ if (redraw_current_line)
+ draw_view_line(view, view->lineno - view->offset);
+ }
+
+ redrawwin(view->win);
+ wrefresh(view->win);
+ report("");
+}
+
+/* Scroll frontend */
+static void
+scroll_view(struct view *view, enum request request)
+{
+ int lines = 1;
+
+ assert(view_is_displayed(view));
+
+ switch (request) {
+ case REQ_SCROLL_PAGE_DOWN:
+ lines = view->height;
+ case REQ_SCROLL_LINE_DOWN:
+ if (view->offset + lines > view->lines)
+ lines = view->lines - view->offset;
+
+ if (lines == 0 || view->offset + view->height >= view->lines) {
+ report("Cannot scroll beyond the last line");
+ return;
+ }
+ break;
+
+ case REQ_SCROLL_PAGE_UP:
+ lines = view->height;
+ case REQ_SCROLL_LINE_UP:
+ if (lines > view->offset)
+ lines = view->offset;
+
+ if (lines == 0) {
+ report("Cannot scroll beyond the first line");
+ return;
+ }
+
+ lines = -lines;
+ break;
+
+ default:
+ die("request %d not handled in switch", request);
+ }
+
+ do_scroll_view(view, lines);
+}
+
+/* Cursor moving */
+static void
+move_view(struct view *view, enum request request)
+{
+ int scroll_steps = 0;
+ int steps;
+
+ switch (request) {
+ case REQ_MOVE_FIRST_LINE:
+ steps = -view->lineno;
+ break;
+
+ case REQ_MOVE_LAST_LINE:
+ steps = view->lines - view->lineno - 1;
+ break;
+
+ case REQ_MOVE_PAGE_UP:
+ steps = view->height > view->lineno
+ ? -view->lineno : -view->height;
+ break;
+
+ case REQ_MOVE_PAGE_DOWN:
+ steps = view->lineno + view->height >= view->lines
+ ? view->lines - view->lineno - 1 : view->height;
+ break;
+
+ case REQ_MOVE_UP:
+ steps = -1;
+ break;
+
+ case REQ_MOVE_DOWN:
+ steps = 1;
+ 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");
+ 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 += scroll_steps;
+ assert(0 <= view->offset && view->offset < view->lines);
+ 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;
+ }
+
+ if (request == REQ_FIND_NEXT || request == REQ_FIND_PREV)
+ lineno += direction;
+
+ /* 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];
+
+ if (find_next_line(view, lineno, line))
+ return;
+ }
+
+ report("No match found for '%s'", view->grep);
+}
+
+static void
+search_view(struct view *view, enum request request)
+{
+ int regex_err;
+
+ if (view->regex) {
+ regfree(view->regex);
+ *view->grep = 0;
+ } else {
+ view->regex = calloc(1, sizeof(*view->regex));
+ if (!view->regex)
+ return;
+ }
+
+ regex_err = regcomp(view->regex, opt_search, REG_EXTENDED);
+ if (regex_err != 0) {
+ char buf[SIZEOF_STR] = "unknown error";
+
+ regerror(regex_err, view->regex, buf, sizeof(buf));
+ report("Search failed: %s", buf);
+ return;
+ }
+
+ string_copy(view->grep, opt_search);
+
+ find_next(view, request);
+}
+
+/*
+ * Incremental updating
+ */
+
+static void
+end_update(struct view *view)
+{
+ if (!view->pipe)
+ return;
+ set_nonblocking_input(FALSE);
+ if (view->pipe == stdin)
+ fclose(view->pipe);
+ else
+ pclose(view->pipe);
+ view->pipe = NULL;
+}
+
+static bool
+begin_update(struct view *view)
+{
+ if (view->pipe)
+ end_update(view);
+
+ if (opt_cmd[0]) {
+ string_copy(view->cmd, opt_cmd);
+ opt_cmd[0] = 0;
+ /* When running random commands, initially show the
+ * command in the title. However, it maybe later be
+ * overwritten if a commit line is selected. */
+ if (view == VIEW(REQ_VIEW_PAGER))
+ string_copy(view->ref, view->cmd);
+ else
+ view->ref[0] = 0;
+
+ } else if (view == VIEW(REQ_VIEW_TREE)) {
+ const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+ char path[SIZEOF_STR];
+
+ if (strcmp(view->vid, view->id))
+ opt_path[0] = path[0] = 0;
+ else if (sq_quote(path, 0, opt_path) >= sizeof(path))
+ return FALSE;
+
+ if (!string_format(view->cmd, format, view->id, path))
+ return FALSE;
+
+ } else {
+ const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+ const char *id = view->id;
+
+ if (!string_format(view->cmd, format, id, id, id, id, id))
+ return FALSE;
+
+ /* Put the current ref_* value to the view title ref
+ * member. This is needed by the blob view. Most other
+ * views sets it automatically after loading because the
+ * first line is a commit line. */
+ string_copy_rev(view->ref, view->id);
+ }
+
+ /* Special case for the pager view. */
+ if (opt_pipe) {
+ view->pipe = opt_pipe;
+ opt_pipe = NULL;
+ } else {
+ view->pipe = popen(view->cmd, "r");
+ }
+
+ if (!view->pipe)
+ return FALSE;
+
+ set_nonblocking_input(TRUE);
+
+ view->offset = 0;
+ view->lines = 0;
+ view->lineno = 0;
+ string_copy_rev(view->vid, view->id);
+
+ if (view->line) {
+ int i;
+
+ for (i = 0; i < view->lines; i++)
+ if (view->line[i].data)
+ free(view->line[i].data);
+
+ free(view->line);
+ view->line = NULL;
+ }
+
+ view->start_time = time(NULL);
+
+ 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;
+ view->line_size = line_size;
+ return view->line;
+}
+
+static bool
+update_view(struct view *view)
+{
+ char in_buffer[BUFSIZ];
+ char out_buffer[BUFSIZ * 2];
+ char *line;
+ /* The number of lines to read. If too low it will cause too much
+ * redrawing (and possible flickering), if too high responsiveness
+ * will suffer. */
+ unsigned long lines = view->height;
+ int redraw_from = -1;
+
+ if (!view->pipe)
+ return TRUE;
+
+ /* Only redraw if lines are visible. */
+ if (view->offset + view->height >= view->lines)
+ redraw_from = view->lines - view->offset;
+
+ /* FIXME: This is probably not perfect for backgrounded views. */
+ if (!realloc_lines(view, view->lines + lines))
+ goto alloc_error;
+
+ while ((line = fgets(in_buffer, sizeof(in_buffer), view->pipe))) {
+ size_t linelen = strlen(line);
+
+ if (linelen)
+ line[linelen - 1] = 0;
+
+ if (opt_iconv != ICONV_NONE) {
+ ICONV_CONST 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)
+ break;
+ }
+
+ {
+ int digits;
+
+ lines = view->lines;
+ for (digits = 0; lines; digits++)
+ lines /= 10;
+
+ /* Keep the displayed view in sync with line number scaling. */
+ if (digits != view->digits) {
+ view->digits = digits;
+ 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. */
+ if (redraw_from > 0)
+ redraw_from--;
+
+ /* Since revision graph visualization requires knowledge
+ * about the parent commit, it causes a further one-off
+ * needed to be redrawn for incremental updates. */
+ if (redraw_from > 0 && opt_rev_graph)
+ redraw_from--;
+
+ /* Incrementally draw avoids flickering. */
+ redraw_view_from(view, redraw_from);
+ }
+
+ if (view == VIEW(REQ_VIEW_BLAME))
+ redraw_view_dirty(view);
+
+ /* Update the title _after_ the redraw so that if the redraw picks up a
+ * 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)) {
+ report("");
+ goto end;
+ }
+
+ return TRUE;
+
+alloc_error:
+ report("Allocation failure");
+
+end:
+ if (view->ops->read(view, NULL))
+ end_update(view);
+ return FALSE;
+}
+
+static struct line *
+add_line_data(struct view *view, void *data, enum line_type type)
+{
+ struct line *line = &view->line[view->lines++];
+
+ memset(line, 0, sizeof(*line));
+ line->type = type;
+ line->data = data;
+
+ return line;
+}
+
+static struct line *
+add_line_text(struct view *view, char *data, enum line_type type)
+{
+ if (data)
+ data = strdup(data);
+
+ return data ? add_line_data(view, data, type) : NULL;
+}
+
+
+/*
+ * View opening
+ */
+
+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. */
+};
+
+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);
+ struct view *view = VIEW(request);
+ int nviews = displayed_views();
+ struct view *base_view = display[0];
+
+ if (view == prev && nviews == 1 && !reload) {
+ report("Already in %s view", view->name);
+ return;
+ }
+
+ if (view->ops->open) {
+ if (!view->ops->open(view)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+
+ } else if ((reload || strcmp(view->vid, view->id)) &&
+ !begin_update(view)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+
+ if (split) {
+ display[1] = view;
+ if (!backgrounded)
+ current_view = 1;
+ } else {
+ /* Maximize the current view. */
+ memset(display, 0, sizeof(display));
+ current_view = 0;
+ display[current_view] = view;
+ }
+
+ /* Resize the view when switching between split- and full-screen,
+ * or when switching between two different full-screen views. */
+ if (nviews != displayed_views() ||
+ (nviews == 1 && base_view != display[0]))
+ resize_display();
+
+ if (split && prev->lineno - prev->offset >= prev->height) {
+ /* Take the title line into account. */
+ int lines = prev->lineno - prev->offset - prev->height + 1;
+
+ /* Scroll the view that was split if the current line is
+ * outside the new limited view. */
+ do_scroll_view(prev, lines);
+ }
+
+ if (prev && view != prev) {
+ if (split && !backgrounded) {
+ /* "Blur" the previous view. */
+ update_view_title(prev);
+ }
+
+ view->parent = prev;
+ }
+
+ if (view->pipe && view->lines == 0) {
+ /* Clear the old view and let the incremental updating refill
+ * the screen. */
+ wclear(view->win);
+ report("");
+ } else {
+ 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
+open_external_viewer(const char *cmd)
+{
+ def_prog_mode(); /* save current tty modes */
+ endwin(); /* restore original tty modes */
+ system(cmd);
+ fprintf(stderr, "Press Enter to continue");
+ getc(stdin);
+ reset_prog_mode();
+ redraw_display();
+}
+
+static void
+open_mergetool(const char *file)
+{
+ char cmd[SIZEOF_STR];
+ char file_sq[SIZEOF_STR];
+
+ if (sq_quote(file_sq, 0, file) < sizeof(file_sq) &&
+ string_format(cmd, "git mergetool %s", file_sq)) {
+ open_external_viewer(cmd);
+ }
+}
+
+static void
+open_editor(bool from_root, const char *file)
+{
+ char cmd[SIZEOF_STR];
+ char file_sq[SIZEOF_STR];
+ char *editor;
+ char *prefix = from_root ? opt_cdup : "";
+
+ editor = getenv("GIT_EDITOR");
+ if (!editor && *opt_editor)
+ editor = opt_editor;
+ if (!editor)
+ editor = getenv("VISUAL");
+ if (!editor)
+ editor = getenv("EDITOR");
+ if (!editor)
+ editor = "vi";
+
+ if (sq_quote(file_sq, 0, file) < sizeof(file_sq) &&
+ string_format(cmd, "%s %s%s", editor, prefix, file_sq)) {
+ open_external_viewer(cmd);
+ }
+}
+
+static void
+open_run_request(enum request request)
+{
+ struct run_request *req = get_run_request(request);
+ char buf[SIZEOF_STR * 2];
+ size_t bufpos;
+ char *cmd;
+
+ if (!req) {
+ report("Unknown run request");
+ return;
+ }
+
+ bufpos = 0;
+ cmd = req->cmd;
+
+ while (cmd) {
+ char *next = strstr(cmd, "%(");
+ int len = next - cmd;
+ char *value;
+
+ if (!next) {
+ len = strlen(cmd);
+ value = "";
+
+ } else if (!strncmp(next, "%(head)", 7)) {
+ value = ref_head;
+
+ } else if (!strncmp(next, "%(commit)", 9)) {
+ value = ref_commit;
+
+ } else if (!strncmp(next, "%(blob)", 7)) {
+ value = ref_blob;
+
+ } else {
+ report("Unknown replacement in run request: `%s`", req->cmd);
+ return;
+ }
+
+ if (!string_format_from(buf, &bufpos, "%.*s%s", len, cmd, value))
+ return;
+
+ if (next)
+ next = strchr(next, ')') + 1;
+ cmd = next;
+ }
+
+ open_external_viewer(buf);
+}
+
+/*
+ * User request switch noodle
+ */
+
+static int
+view_driver(struct view *view, enum request request)
+{
+ int i;
+
+ if (request == REQ_NONE) {
+ doupdate();
+ return TRUE;
+ }
+
+ if (request > REQ_NONE) {
+ open_run_request(request);
+ return TRUE;
+ }
+
+ if (view && view->lines) {
+ request = view->ops->request(view, request, &view->line[view->lineno]);
+ if (request == REQ_NONE)
+ return TRUE;
+ }
+
+ switch (request) {
+ case REQ_MOVE_UP:
+ case REQ_MOVE_DOWN:
+ case REQ_MOVE_PAGE_UP:
+ case REQ_MOVE_PAGE_DOWN:
case REQ_MOVE_FIRST_LINE:
- steps = -view->lineno;
+ case REQ_MOVE_LAST_LINE:
+ move_view(view, request);
+ break;
+
+ case REQ_SCROLL_LINE_DOWN:
+ case REQ_SCROLL_LINE_UP:
+ case REQ_SCROLL_PAGE_DOWN:
+ case REQ_SCROLL_PAGE_UP:
+ scroll_view(view, request);
+ break;
+
+ case REQ_VIEW_BLAME:
+ if (!opt_file[0]) {
+ report("No file chosen, press %s to open tree view",
+ get_key(REQ_VIEW_TREE));
+ break;
+ }
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ case REQ_VIEW_BLOB:
+ if (!ref_blob[0]) {
+ report("No file chosen, press %s to open tree view",
+ get_key(REQ_VIEW_TREE));
+ break;
+ }
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ case REQ_VIEW_PAGER:
+ if (!opt_pipe && !VIEW(REQ_VIEW_PAGER)->lines) {
+ report("No pager content, press %s to run command from prompt",
+ get_key(REQ_PROMPT));
+ break;
+ }
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ 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));
+ break;
+ }
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ case REQ_VIEW_STATUS:
+ if (opt_is_inside_work_tree == FALSE) {
+ report("The status view requires a working tree");
+ break;
+ }
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ case REQ_VIEW_MAIN:
+ case REQ_VIEW_DIFF:
+ case REQ_VIEW_LOG:
+ case REQ_VIEW_TREE:
+ case REQ_VIEW_HELP:
+ open_view(view, request, OPEN_DEFAULT);
+ break;
+
+ case REQ_NEXT:
+ 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))) {
+ int line;
+
+ view = view->parent;
+ line = view->lineno;
+ move_view(view, request);
+ if (view_is_displayed(view))
+ update_view_title(view);
+ if (line != view->lineno)
+ view->ops->request(view, REQ_ENTER,
+ &view->line[view->lineno]);
+
+ } else {
+ move_view(view, request);
+ }
+ break;
+
+ case REQ_VIEW_NEXT:
+ {
+ int nviews = displayed_views();
+ int next_view = (current_view + 1) % nviews;
+
+ if (next_view == current_view) {
+ report("Only one view is displayed");
+ break;
+ }
+
+ current_view = next_view;
+ /* Blur out the title of the previous view. */
+ update_view_title(view);
+ report("");
+ break;
+ }
+ case REQ_REFRESH:
+ report("Refreshing is not yet supported for the %s view", view->name);
+ break;
+
+ case REQ_TOGGLE_LINENO:
+ opt_line_number = !opt_line_number;
+ redraw_display();
+ break;
+
+ case REQ_TOGGLE_DATE:
+ opt_date = !opt_date;
+ redraw_display();
+ break;
+
+ case REQ_TOGGLE_AUTHOR:
+ opt_author = !opt_author;
+ redraw_display();
+ break;
+
+ case REQ_TOGGLE_REV_GRAPH:
+ opt_rev_graph = !opt_rev_graph;
+ redraw_display();
+ break;
+
+ case REQ_TOGGLE_REFS:
+ opt_show_refs = !opt_show_refs;
+ 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];
+ if (view->pipe)
+ report("Stopped loading the %s view", view->name),
+ end_update(view);
+ }
+ break;
+
+ case REQ_SHOW_VERSION:
+ report("tig-%s (built %s)", TIG_VERSION, __DATE__);
+ return TRUE;
+
+ case REQ_SCREEN_RESIZE:
+ resize_display();
+ /* Fall-through */
+ case REQ_SCREEN_REDRAW:
+ redraw_display();
+ break;
+
+ case REQ_EDIT:
+ report("Nothing to edit");
+ break;
+
+
+ case REQ_ENTER:
+ report("Nothing to enter");
+ break;
+
+
+ case REQ_VIEW_CLOSE:
+ /* XXX: Mark closed views by letting view->parent 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();
+ break;
+ }
+ /* Fall-through */
+ case REQ_QUIT:
+ return FALSE;
+
+ default:
+ /* An unknown key will show most commonly used commands. */
+ report("Unknown key, press 'h' for help");
+ return TRUE;
+ }
+
+ return TRUE;
+}
+
+
+/*
+ * Pager backend
+ */
+
+static bool
+pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+{
+ char *text = line->data;
+ enum line_type type = line->type;
+ int attr;
+
+ wmove(view->win, lineno, 0);
+
+ if (selected) {
+ type = LINE_CURSOR;
+ wchgat(view->win, -1, 0, type, NULL);
+ }
+
+ attr = get_line_attr(type);
+ wattrset(view->win, attr);
+
+ if (opt_line_number || opt_tab_size < TABSIZE) {
+ static char spaces[] = " ";
+ int col_offset = 0, col = 0;
+
+ if (opt_line_number) {
+ unsigned long real_lineno = view->offset + lineno + 1;
+
+ if (real_lineno == 1 ||
+ (real_lineno % opt_num_interval) == 0) {
+ wprintw(view->win, "%.*d", view->digits, real_lineno);
+
+ } else {
+ waddnstr(view->win, spaces,
+ MIN(view->digits, STRING_SIZE(spaces)));
+ }
+ waddstr(view->win, ": ");
+ col_offset = view->digits + 2;
+ }
+
+ while (text && col_offset + col < view->width) {
+ int cols_max = view->width - col_offset - col;
+ char *pos = text;
+ int cols;
+
+ if (*text == '\t') {
+ text++;
+ assert(sizeof(spaces) > TABSIZE);
+ pos = spaces;
+ cols = opt_tab_size - (col % opt_tab_size);
+
+ } else {
+ text = strchr(text, '\t');
+ cols = line ? text - pos : strlen(pos);
+ }
+
+ waddnstr(view->win, pos, MIN(cols, cols_max));
+ col += cols;
+ }
+
+ } else {
+ draw_text(view, text, view->width, TRUE, selected);
+ }
+
+ 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 = (char *)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]" :
+ ref->remote ? "%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;
+
+ add_line_text(view, buf, LINE_PP_REFS);
+}
+
+static bool
+pager_read(struct view *view, char *data)
+{
+ struct line *line;
+
+ if (!data)
+ return TRUE;
+
+ line = add_line_text(view, data, get_line_type(data));
+ if (!line)
+ return FALSE;
+
+ if (line->type == LINE_COMMIT &&
+ (view == VIEW(REQ_VIEW_DIFF) ||
+ view == VIEW(REQ_VIEW_LOG)))
+ add_pager_refs(view, line);
+
+ return TRUE;
+}
+
+static enum request
+pager_request(struct view *view, enum request request, struct line *line)
+{
+ int split = 0;
+
+ if (request != REQ_ENTER)
+ return request;
+
+ 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 REQ_NONE;
+}
+
+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 = (char *)line->data + STRING_SIZE("commit ");
+
+ if (view != VIEW(REQ_VIEW_PAGER))
+ string_copy_rev(view->ref, text);
+ string_copy_rev(ref_commit, text);
+ }
+}
+
+static struct view_ops pager_ops = {
+ "line",
+ NULL,
+ pager_read,
+ pager_draw,
+ pager_request,
+ pager_grep,
+ pager_select,
+};
+
+
+/*
+ * Help backend
+ */
+
+static bool
+help_open(struct view *view)
+{
+ char buf[BUFSIZ];
+ int lines = ARRAY_SIZE(req_info) + 2;
+ int i;
+
+ if (view->lines > 0)
+ return TRUE;
+
+ for (i = 0; i < ARRAY_SIZE(req_info); i++)
+ if (!req_info[i].request)
+ lines++;
+
+ lines += run_requests + 1;
+
+ view->line = calloc(lines, sizeof(*view->line));
+ if (!view->line)
+ return FALSE;
+
+ add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
+
+ for (i = 0; i < ARRAY_SIZE(req_info); i++) {
+ char *key;
+
+ 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);
+ continue;
+ }
+
+ key = get_key(req_info[i].request);
+ if (!*key)
+ key = "(no key defined)";
+
+ if (!string_format(buf, " %-25s %s", key, req_info[i].help))
+ continue;
+
+ add_line_text(view, buf, LINE_DEFAULT);
+ }
+
+ if (run_requests) {
+ add_line_text(view, "", LINE_DEFAULT);
+ add_line_text(view, "External commands:", LINE_DEFAULT);
+ }
+
+ for (i = 0; i < run_requests; i++) {
+ struct run_request *req = get_run_request(REQ_NONE + i + 1);
+ char *key;
+
+ if (!req)
+ continue;
+
+ key = get_key_name(req->key);
+ if (!*key)
+ key = "(no key defined)";
+
+ if (!string_format(buf, " %-10s %-14s `%s`",
+ keymap_table[req->keymap].name,
+ key, req->cmd))
+ continue;
+
+ add_line_text(view, buf, LINE_DEFAULT);
+ }
+
+ return TRUE;
+}
+
+static struct view_ops help_ops = {
+ "line",
+ help_open,
+ NULL,
+ pager_draw,
+ pager_request,
+ pager_grep,
+ pager_select,
+};
+
+
+/*
+ * Tree backend
+ */
+
+struct tree_stack_entry {
+ struct tree_stack_entry *prev; /* Entry below this in the stack */
+ unsigned long lineno; /* Line number to restore */
+ char *name; /* Position of name in opt_path */
+};
+
+/* The top of the path stack. */
+static struct tree_stack_entry *tree_stack = NULL;
+unsigned long tree_lineno = 0;
+
+static void
+pop_tree_stack_entry(void)
+{
+ struct tree_stack_entry *entry = tree_stack;
+
+ tree_lineno = entry->lineno;
+ entry->name[0] = 0;
+ tree_stack = entry->prev;
+ free(entry);
+}
+
+static void
+push_tree_stack_entry(char *name, unsigned long lineno)
+{
+ struct tree_stack_entry *entry = calloc(1, sizeof(*entry));
+ size_t pathlen = strlen(opt_path);
+
+ if (!entry)
+ return;
+
+ entry->prev = tree_stack;
+ entry->name = opt_path + pathlen;
+ tree_stack = entry;
+
+ if (!string_format_from(opt_path, &pathlen, "%s/", name)) {
+ pop_tree_stack_entry();
+ return;
+ }
+
+ /* Move the current line to the first tree entry. */
+ tree_lineno = 1;
+ entry->lineno = 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")
+
+#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 char *
+tree_path(struct line *line)
+{
+ char *path = line->data;
+
+ return path + SIZEOF_TREE_ATTR;
+}
+
+static bool
+tree_read(struct view *view, char *text)
+{
+ size_t textlen = text ? strlen(text) : 0;
+ char buf[SIZEOF_STR];
+ unsigned long pos;
+ enum line_type type;
+ bool first_read = view->lines == 0;
+
+ if (!text)
+ return TRUE;
+ 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) ||
+ !add_line_text(view, buf, LINE_DEFAULT))
+ return FALSE;
+
+ /* Insert "link" to parent directory. */
+ if (*opt_path) {
+ if (!string_format(buf, TREE_UP_FORMAT, view->ref) ||
+ !realloc_lines(view, view->line_size + 1) ||
+ !add_line_text(view, buf, LINE_TREE_DIR))
+ 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 = tree_path(line);
+ char *path2 = text + SIZEOF_TREE_ATTR;
+ int cmp = tree_compare_entry(line->type, path1, type, path2);
+
+ if (cmp <= 0)
+ continue;
+
+ text = strdup(text);
+ if (!text)
+ return FALSE;
+
+ 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 (!add_line_text(view, text, type))
+ return FALSE;
+
+ if (tree_lineno > view->lineno) {
+ view->lineno = tree_lineno;
+ tree_lineno = 0;
+ }
+
+ return TRUE;
+}
+
+static enum request
+tree_request(struct view *view, enum request request, struct line *line)
+{
+ enum open_flags flags;
+
+ if (request == REQ_VIEW_BLAME) {
+ char *filename = tree_path(line);
+
+ if (line->type == LINE_TREE_DIR) {
+ report("Cannot show blame for directory %s", opt_path);
+ return REQ_NONE;
+ }
+
+ string_copy(opt_ref, view->vid);
+ string_format(opt_file, "%s%s", opt_path, filename);
+ return request;
+ }
+ if (request == REQ_TREE_PARENT) {
+ if (*opt_path) {
+ /* fake 'cd ..' */
+ request = REQ_ENTER;
+ line = &view->line[1];
+ } else {
+ /* quit view if at top of tree */
+ return REQ_VIEW_CLOSE;
+ }
+ }
+ if (request != REQ_ENTER)
+ return request;
+
+ /* Cleanup the stack if the tree view is at a different tree. */
+ while (!*opt_path && tree_stack)
+ pop_tree_stack_entry();
+
+ 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) {
+ pop_tree_stack_entry();
+
+ } else {
+ char *basename = tree_path(line);
+
+ push_tree_stack_entry(basename, view->lineno);
+ }
+
+ /* 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;
- case REQ_MOVE_LAST_LINE:
- steps = view->lines - view->lineno - 1;
- break;
+ default:
+ return TRUE;
+ }
+
+ open_view(view, request, flags);
+ if (request == REQ_VIEW_TREE) {
+ view->lineno = tree_lineno;
+ }
+
+ return REQ_NONE;
+}
+
+static void
+tree_select(struct view *view, struct line *line)
+{
+ char *text = (char *)line->data + STRING_SIZE("100644 blob ");
+
+ if (line->type == LINE_TREE_FILE) {
+ string_copy_rev(ref_blob, text);
+
+ } else if (line->type != LINE_TREE_DIR) {
+ return;
+ }
+
+ string_copy_rev(view->ref, text);
+}
+
+static struct view_ops tree_ops = {
+ "file",
+ NULL,
+ tree_read,
+ pager_draw,
+ tree_request,
+ pager_grep,
+ tree_select,
+};
+
+static bool
+blob_read(struct view *view, char *line)
+{
+ if (!line)
+ return TRUE;
+ return add_line_text(view, line, LINE_DEFAULT) != NULL;
+}
+
+static struct view_ops blob_ops = {
+ "line",
+ NULL,
+ blob_read,
+ pager_draw,
+ pager_request,
+ pager_grep,
+ pager_select,
+};
+
+/*
+ * Blame backend
+ *
+ * Loading the blame view is a two phase job:
+ *
+ * 1. File content is read either using opt_file from the
+ * filesystem or using git-cat-file.
+ * 2. Then blame information is incrementally added by
+ * reading output from git-blame.
+ */
+
+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. */
+ char filename[128]; /* Name of file. */
+};
+
+struct blame {
+ struct blame_commit *commit;
+ unsigned int header:1;
+ char text[1];
+};
+
+#define BLAME_CAT_FILE_CMD "git cat-file blob %s:%s"
+#define BLAME_INCREMENTAL_CMD "git blame --incremental %s %s"
+
+static bool
+blame_open(struct view *view)
+{
+ char path[SIZEOF_STR];
+ char ref[SIZEOF_STR] = "";
+
+ if (sq_quote(path, 0, opt_file) >= sizeof(path))
+ return FALSE;
+
+ if (*opt_ref && sq_quote(ref, 0, opt_ref) >= sizeof(ref))
+ return FALSE;
+
+ if (*opt_ref) {
+ if (!string_format(view->cmd, BLAME_CAT_FILE_CMD, ref, path))
+ return FALSE;
+ } else {
+ view->pipe = fopen(opt_file, "r");
+ if (!view->pipe &&
+ !string_format(view->cmd, BLAME_CAT_FILE_CMD, "HEAD", path))
+ return FALSE;
+ }
+
+ if (!view->pipe)
+ view->pipe = popen(view->cmd, "r");
+ if (!view->pipe)
+ return FALSE;
+
+ if (!string_format(view->cmd, BLAME_INCREMENTAL_CMD, ref, path))
+ return FALSE;
+
+ string_format(view->ref, "%s ...", opt_file);
+ string_copy_rev(view->vid, opt_file);
+ set_nonblocking_input(TRUE);
+
+ if (view->line) {
+ int i;
+
+ for (i = 0; i < view->lines; i++)
+ free(view->line[i].data);
+ free(view->line);
+ }
+
+ view->lines = view->line_alloc = view->line_size = view->lineno = 0;
+ view->offset = view->lines = view->lineno = 0;
+ view->line = NULL;
+ view->start_time = time(NULL);
+
+ return TRUE;
+}
+
+static struct blame_commit *
+get_blame_commit(struct view *view, const char *id)
+{
+ size_t i;
+
+ for (i = 0; i < view->lines; i++) {
+ struct blame *blame = view->line[i].data;
+
+ if (!blame->commit)
+ continue;
+
+ if (!strncmp(blame->commit->id, id, SIZEOF_REV - 1))
+ return blame->commit;
+ }
+
+ {
+ struct blame_commit *commit = calloc(1, sizeof(*commit));
+
+ if (commit)
+ string_ncopy(commit->id, id, SIZEOF_REV);
+ return commit;
+ }
+}
+
+static bool
+parse_number(char **posref, size_t *number, size_t min, size_t max)
+{
+ char *pos = *posref;
+
+ *posref = NULL;
+ pos = strchr(pos + 1, ' ');
+ if (!pos || !isdigit(pos[1]))
+ return FALSE;
+ *number = atoi(pos + 1);
+ if (*number < min || *number > max)
+ return FALSE;
+
+ *posref = pos;
+ return TRUE;
+}
+
+static struct blame_commit *
+parse_blame_commit(struct view *view, char *text, int *blamed)
+{
+ struct blame_commit *commit;
+ struct blame *blame;
+ char *pos = text + SIZEOF_REV - 1;
+ size_t lineno;
+ size_t group;
+
+ if (strlen(text) <= SIZEOF_REV || *pos != ' ')
+ return NULL;
+
+ if (!parse_number(&pos, &lineno, 1, view->lines) ||
+ !parse_number(&pos, &group, 1, view->lines - lineno + 1))
+ return NULL;
+
+ commit = get_blame_commit(view, text);
+ if (!commit)
+ return NULL;
+
+ *blamed += group;
+ while (group--) {
+ struct line *line = &view->line[lineno + group - 1];
+
+ blame = line->data;
+ blame->commit = commit;
+ line->dirty = 1;
+ }
+ blame->header = 1;
+
+ return commit;
+}
+
+static bool
+blame_read_file(struct view *view, char *line)
+{
+ if (!line) {
+ FILE *pipe = NULL;
+
+ if (view->lines > 0)
+ pipe = popen(view->cmd, "r");
+ view->cmd[0] = 0;
+ if (!pipe) {
+ report("Failed to load blame data");
+ return TRUE;
+ }
+
+ fclose(view->pipe);
+ view->pipe = pipe;
+ return FALSE;
- case REQ_MOVE_PAGE_UP:
- steps = view->height > view->lineno
- ? -view->lineno : -view->height;
+ } else {
+ size_t linelen = strlen(line);
+ struct blame *blame = malloc(sizeof(*blame) + linelen);
+
+ if (!line)
+ return FALSE;
+
+ blame->commit = NULL;
+ strncpy(blame->text, line, linelen);
+ blame->text[linelen] = 0;
+ return add_line_data(view, blame, LINE_BLAME_COMMIT) != NULL;
+ }
+}
+
+static bool
+match_blame_header(const char *name, char **line)
+{
+ size_t namelen = strlen(name);
+ bool matched = !strncmp(name, *line, namelen);
+
+ if (matched)
+ *line += namelen;
+
+ return matched;
+}
+
+static bool
+blame_read(struct view *view, char *line)
+{
+ static struct blame_commit *commit = NULL;
+ static int blamed = 0;
+ static time_t author_time;
+
+ if (*view->cmd)
+ return blame_read_file(view, line);
+
+ if (!line) {
+ /* Reset all! */
+ commit = NULL;
+ blamed = 0;
+ string_format(view->ref, "%s", view->vid);
+ if (view_is_displayed(view)) {
+ update_view_title(view);
+ redraw_view_from(view, 0);
+ }
+ return TRUE;
+ }
+
+ if (!commit) {
+ commit = parse_blame_commit(view, line, &blamed);
+ string_format(view->ref, "%s %2d%%", view->vid,
+ blamed * 100 / view->lines);
+
+ } else if (match_blame_header("author ", &line)) {
+ string_ncopy(commit->author, line, strlen(line));
+
+ } else if (match_blame_header("author-time ", &line)) {
+ author_time = (time_t) atol(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);
+
+ } else if (match_blame_header("summary ", &line)) {
+ string_ncopy(commit->title, line, strlen(line));
+
+ } else if (match_blame_header("filename ", &line)) {
+ string_ncopy(commit->filename, line, strlen(line));
+ commit = NULL;
+ }
+
+ return TRUE;
+}
+
+static bool
+blame_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+{
+ struct blame *blame = line->data;
+ int col = 0;
+
+ wmove(view->win, lineno, 0);
+
+ if (selected) {
+ wattrset(view->win, get_line_attr(LINE_CURSOR));
+ wchgat(view->win, -1, 0, LINE_CURSOR, NULL);
+ } else {
+ wattrset(view->win, A_NORMAL);
+ }
+
+ if (opt_date) {
+ int n;
+
+ if (!selected)
+ wattrset(view->win, get_line_attr(LINE_MAIN_DATE));
+ if (blame->commit) {
+ char buf[DATE_COLS + 1];
+ int timelen;
+
+ timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &blame->commit->time);
+ n = draw_text(view, buf, view->width - col, FALSE, selected);
+ draw_text(view, " ", view->width - col - n, FALSE, selected);
+ }
+
+ col += DATE_COLS;
+ wmove(view->win, lineno, col);
+ if (col >= view->width)
+ return TRUE;
+ }
+
+ if (opt_author) {
+ int max = MIN(AUTHOR_COLS - 1, view->width - col);
+
+ if (!selected)
+ wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));
+ if (blame->commit)
+ draw_text(view, blame->commit->author, max, TRUE, selected);
+ col += AUTHOR_COLS;
+ if (col >= view->width)
+ return TRUE;
+ wmove(view->win, lineno, col);
+ }
+
+ {
+ int max = MIN(ID_COLS - 1, view->width - col);
+
+ if (!selected)
+ wattrset(view->win, get_line_attr(LINE_BLAME_ID));
+ if (blame->commit)
+ draw_text(view, blame->commit->id, max, FALSE, -1);
+ col += ID_COLS;
+ if (col >= view->width)
+ return TRUE;
+ wmove(view->win, lineno, col);
+ }
+
+ {
+ unsigned long real_lineno = view->offset + lineno + 1;
+ char number[10] = " ";
+ int max = MIN(view->digits, STRING_SIZE(number));
+ bool showtrimmed = FALSE;
+
+ if (real_lineno == 1 ||
+ (real_lineno % opt_num_interval) == 0) {
+ char fmt[] = "%1ld";
+
+ if (view->digits <= 9)
+ fmt[1] = '0' + view->digits;
+
+ if (!string_format(number, fmt, real_lineno))
+ number[0] = 0;
+ showtrimmed = TRUE;
+ }
+
+ if (max > view->width - col)
+ max = view->width - col;
+ if (!selected)
+ wattrset(view->win, get_line_attr(LINE_BLAME_LINENO));
+ col += draw_text(view, number, max, showtrimmed, selected);
+ if (col >= view->width)
+ return TRUE;
+ }
+
+ if (!selected)
+ wattrset(view->win, A_NORMAL);
+
+ if (col >= view->width)
+ return TRUE;
+ waddch(view->win, ACS_VLINE);
+ col++;
+ if (col >= view->width)
+ return TRUE;
+ waddch(view->win, ' ');
+ col++;
+ col += draw_text(view, blame->text, view->width - col, TRUE, selected);
+
+ return TRUE;
+}
+
+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;
+ struct blame *blame = line->data;
+
+ switch (request) {
+ case REQ_ENTER:
+ if (!blame->commit) {
+ report("No commit loaded yet");
+ break;
+ }
+
+ if (!strcmp(blame->commit->id, NULL_ID)) {
+ char path[SIZEOF_STR];
+
+ if (sq_quote(path, 0, view->vid) >= sizeof(path))
+ break;
+ string_format(opt_cmd, "git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s 2>/dev/null", path);
+ }
+
+ open_view(view, REQ_VIEW_DIFF, flags);
break;
- case REQ_MOVE_PAGE_DOWN:
- steps = view->lineno + view->height >= view->lines
- ? view->lines - view->lineno - 1 : view->height;
+ default:
+ return request;
+ }
+
+ return REQ_NONE;
+}
+
+static bool
+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) \
+ (*text && regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+
+ if (commit) {
+ char buf[DATE_COLS + 1];
+
+ if (MATCH(commit->title) ||
+ MATCH(commit->author) ||
+ MATCH(commit->id))
+ return TRUE;
+
+ if (strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time) &&
+ MATCH(buf))
+ return TRUE;
+ }
+
+ return MATCH(blame->text);
+
+#undef MATCH
+}
+
+static void
+blame_select(struct view *view, struct line *line)
+{
+ struct blame *blame = line->data;
+ struct blame_commit *commit = blame->commit;
+
+ if (!commit)
+ return;
+
+ if (!strcmp(commit->id, NULL_ID))
+ string_ncopy(ref_commit, "HEAD", 4);
+ else
+ string_copy_rev(ref_commit, commit->id);
+}
+
+static struct view_ops blame_ops = {
+ "line",
+ blame_open,
+ blame_read,
+ blame_draw,
+ blame_request,
+ blame_grep,
+ blame_select,
+};
+
+/*
+ * Status backend
+ */
+
+struct status {
+ char status;
+ struct {
+ mode_t mode;
+ char rev[SIZEOF_REV];
+ char name[SIZEOF_STR];
+ } old;
+ struct {
+ mode_t mode;
+ char rev[SIZEOF_REV];
+ char name[SIZEOF_STR];
+ } new;
+};
+
+static char status_onbranch[SIZEOF_STR];
+static struct status stage_status;
+static enum line_type stage_line_type;
+
+/* Get fields from the diff line:
+ * :100644 100644 06a5d6ae9eca55be2e0e585a152e6b1336f2b20e 0000000000000000000000000000000000000000 M
+ */
+static inline bool
+status_get_diff(struct status *file, char *buf, size_t bufsize)
+{
+ char *old_mode = buf + 1;
+ char *new_mode = buf + 8;
+ char *old_rev = buf + 15;
+ char *new_rev = buf + 56;
+ char *status = buf + 97;
+
+ if (bufsize < 99 ||
+ old_mode[-1] != ':' ||
+ new_mode[-1] != ' ' ||
+ old_rev[-1] != ' ' ||
+ new_rev[-1] != ' ' ||
+ status[-1] != ' ')
+ return FALSE;
+
+ file->status = *status;
+
+ string_copy_rev(file->old.rev, old_rev);
+ string_copy_rev(file->new.rev, new_rev);
+
+ file->old.mode = strtoul(old_mode, NULL, 8);
+ file->new.mode = strtoul(new_mode, NULL, 8);
+
+ file->old.name[0] = file->new.name[0] = 0;
+
+ return TRUE;
+}
+
+static bool
+status_run(struct view *view, const char cmd[], char status, enum line_type type)
+{
+ struct status *file = NULL;
+ struct status *unmerged = NULL;
+ char buf[SIZEOF_STR * 4];
+ size_t bufsize = 0;
+ FILE *pipe;
+
+ pipe = popen(cmd, "r");
+ if (!pipe)
+ return FALSE;
+
+ add_line_data(view, NULL, type);
+
+ while (!feof(pipe) && !ferror(pipe)) {
+ char *sep;
+ size_t readsize;
+
+ readsize = fread(buf + bufsize, 1, sizeof(buf) - bufsize, pipe);
+ if (!readsize)
+ break;
+ bufsize += readsize;
+
+ /* Process while we have NUL chars. */
+ while ((sep = memchr(buf, 0, bufsize))) {
+ size_t sepsize = sep - buf + 1;
+
+ if (!file) {
+ if (!realloc_lines(view, view->line_size + 1))
+ goto error_out;
+
+ file = calloc(1, sizeof(*file));
+ if (!file)
+ goto error_out;
+
+ add_line_data(view, file, type);
+ }
+
+ /* Parse diff info part. */
+ if (status) {
+ file->status = status;
+ if (status == 'A')
+ string_copy(file->old.rev, NULL_ID);
+
+ } else if (!file->status) {
+ if (!status_get_diff(file, buf, sepsize))
+ goto error_out;
+
+ bufsize -= sepsize;
+ memmove(buf, sep + 1, bufsize);
+
+ sep = memchr(buf, 0, bufsize);
+ if (!sep)
+ break;
+ sepsize = sep - buf + 1;
+
+ /* 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);
+
+ unmerged = NULL;
+ if (collapse) {
+ free(file);
+ view->lines--;
+ continue;
+ }
+ }
+ }
+
+ /* Grab the old name for rename/copy. */
+ if (!*file->old.name &&
+ (file->status == 'R' || file->status == 'C')) {
+ sepsize = sep - buf + 1;
+ string_ncopy(file->old.name, buf, sepsize);
+ bufsize -= sepsize;
+ memmove(buf, sep + 1, bufsize);
+
+ sep = memchr(buf, 0, bufsize);
+ if (!sep)
+ break;
+ sepsize = sep - buf + 1;
+ }
+
+ /* git-ls-files just delivers a NUL separated
+ * list of file names similar to the second half
+ * of the git-diff-* output. */
+ string_ncopy(file->new.name, buf, sepsize);
+ if (!*file->old.name)
+ string_copy(file->old.name, file->new.name);
+ bufsize -= sepsize;
+ memmove(buf, sep + 1, bufsize);
+ file = NULL;
+ }
+ }
+
+ if (ferror(pipe)) {
+error_out:
+ pclose(pipe);
+ return FALSE;
+ }
+
+ if (!view->line[view->lines - 1].data)
+ add_line_data(view, NULL, LINE_STAT_NONE);
+
+ pclose(pipe);
+ return TRUE;
+}
+
+/* Don't show unmerged entries in the staged section. */
+#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached -M HEAD"
+#define STATUS_DIFF_FILES_CMD "git diff-files -z"
+#define STATUS_LIST_OTHER_CMD \
+ "git ls-files -z --others --exclude-per-directory=.gitignore"
+#define STATUS_LIST_NO_HEAD_CMD \
+ "git ls-files -z --cached --exclude-per-directory=.gitignore"
+
+#define STATUS_DIFF_INDEX_SHOW_CMD \
+ "git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s %s 2>/dev/null"
+
+#define STATUS_DIFF_FILES_SHOW_CMD \
+ "git diff-files --root --patch-with-stat -C -M -- %s %s 2>/dev/null"
+
+#define STATUS_DIFF_NO_HEAD_SHOW_CMD \
+ "git diff --no-color --patch-with-stat /dev/null %s 2>/dev/null"
+
+/* First parse staged info using git-diff-index(1), then parse unstaged
+ * info using git-diff-files(1), and finally untracked files using
+ * git-ls-files(1). */
+static bool
+status_open(struct view *view)
+{
+ struct stat statbuf;
+ char exclude[SIZEOF_STR];
+ char indexcmd[SIZEOF_STR] = STATUS_DIFF_INDEX_CMD;
+ char othercmd[SIZEOF_STR] = STATUS_LIST_OTHER_CMD;
+ unsigned long prev_lineno = view->lineno;
+ char indexstatus = 0;
+ size_t i;
+
+ for (i = 0; i < view->lines; i++)
+ free(view->line[i].data);
+ free(view->line);
+ view->lines = view->line_alloc = view->line_size = view->lineno = 0;
+ view->line = NULL;
+
+ if (!realloc_lines(view, view->line_size + 7))
+ return FALSE;
+
+ add_line_data(view, NULL, LINE_STAT_HEAD);
+ if (opt_no_head)
+ 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;
+
+ if (opt_no_head) {
+ string_copy(indexcmd, STATUS_LIST_NO_HEAD_CMD);
+ indexstatus = 'A';
+ }
+
+ if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+ return FALSE;
+
+ if (stat(exclude, &statbuf) >= 0) {
+ size_t cmdsize = strlen(othercmd);
+
+ if (!string_format_from(othercmd, &cmdsize, " %s", "--exclude-from=") ||
+ sq_quote(othercmd, cmdsize, exclude) >= sizeof(othercmd))
+ return FALSE;
+
+ cmdsize = strlen(indexcmd);
+ if (opt_no_head &&
+ (!string_format_from(indexcmd, &cmdsize, " %s", "--exclude-from=") ||
+ sq_quote(indexcmd, cmdsize, exclude) >= sizeof(indexcmd)))
+ return FALSE;
+ }
+
+ system("git update-index -q --refresh");
+
+ if (!status_run(view, indexcmd, indexstatus, LINE_STAT_STAGED) ||
+ !status_run(view, STATUS_DIFF_FILES_CMD, 0, LINE_STAT_UNSTAGED) ||
+ !status_run(view, othercmd, '?', LINE_STAT_UNTRACKED))
+ return FALSE;
+
+ /* If all went well restore the previous line number to stay in
+ * the context or select a line with something that can be
+ * updated. */
+ if (prev_lineno >= view->lines)
+ prev_lineno = view->lines - 1;
+ while (prev_lineno < view->lines && !view->line[prev_lineno].data)
+ prev_lineno++;
+
+ /* If the above fails, always skip the "On branch" line. */
+ if (prev_lineno < view->lines)
+ view->lineno = prev_lineno;
+ else
+ view->lineno = 1;
+
+ return TRUE;
+}
+
+static bool
+status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+{
+ struct status *status = line->data;
+
+ wmove(view->win, lineno, 0);
+
+ if (selected) {
+ wattrset(view->win, get_line_attr(LINE_CURSOR));
+ wchgat(view->win, -1, 0, LINE_CURSOR, NULL);
+
+ } else if (line->type == LINE_STAT_HEAD) {
+ wattrset(view->win, get_line_attr(LINE_STAT_HEAD));
+ wchgat(view->win, -1, 0, LINE_STAT_HEAD, NULL);
+
+ } else if (!status && line->type != LINE_STAT_NONE) {
+ wattrset(view->win, get_line_attr(LINE_STAT_SECTION));
+ wchgat(view->win, -1, 0, LINE_STAT_SECTION, NULL);
+
+ } else {
+ wattrset(view->win, get_line_attr(line->type));
+ }
+
+ if (!status) {
+ char *text;
+
+ switch (line->type) {
+ case LINE_STAT_STAGED:
+ text = "Changes to be committed:";
+ break;
+
+ case LINE_STAT_UNSTAGED:
+ text = "Changed but not updated:";
+ break;
+
+ case LINE_STAT_UNTRACKED:
+ text = "Untracked files:";
+ break;
+
+ case LINE_STAT_NONE:
+ text = " (no files)";
+ break;
+
+ case LINE_STAT_HEAD:
+ text = status_onbranch;
+ break;
+
+ default:
+ return FALSE;
+ }
+
+ draw_text(view, text, view->width, TRUE, selected);
+ return TRUE;
+ }
+
+ waddch(view->win, status->status);
+ if (!selected)
+ wattrset(view->win, A_NORMAL);
+ wmove(view->win, lineno, 4);
+ if (view->width < 5)
+ return TRUE;
+
+ draw_text(view, status->new.name, view->width - 5, TRUE, selected);
+ return TRUE;
+}
+
+static enum request
+status_enter(struct view *view, struct line *line)
+{
+ struct status *status = line->data;
+ char oldpath[SIZEOF_STR] = "";
+ char newpath[SIZEOF_STR] = "";
+ char *info;
+ size_t cmdsize = 0;
+
+ if (line->type == LINE_STAT_NONE ||
+ (!status && line[1].type == LINE_STAT_NONE)) {
+ report("No file to diff");
+ return REQ_NONE;
+ }
+
+ if (status) {
+ if (sq_quote(oldpath, 0, status->old.name) >= sizeof(oldpath))
+ return REQ_QUIT;
+ /* Diffs for unmerged entries are empty when pasing the
+ * new path, so leave it empty. */
+ if (status->status != 'U' &&
+ sq_quote(newpath, 0, status->new.name) >= sizeof(newpath))
+ return REQ_QUIT;
+ }
+
+ if (opt_cdup[0] &&
+ line->type != LINE_STAT_UNTRACKED &&
+ !string_format_from(opt_cmd, &cmdsize, "cd %s;", opt_cdup))
+ return REQ_QUIT;
+
+ switch (line->type) {
+ case LINE_STAT_STAGED:
+ if (opt_no_head) {
+ if (!string_format_from(opt_cmd, &cmdsize,
+ STATUS_DIFF_NO_HEAD_SHOW_CMD,
+ newpath))
+ return REQ_QUIT;
+ } else {
+ if (!string_format_from(opt_cmd, &cmdsize,
+ STATUS_DIFF_INDEX_SHOW_CMD,
+ oldpath, newpath))
+ return REQ_QUIT;
+ }
+
+ if (status)
+ info = "Staged changes to %s";
+ else
+ info = "Staged changes";
break;
- case REQ_MOVE_UP:
- steps = -1;
+ case LINE_STAT_UNSTAGED:
+ if (!string_format_from(opt_cmd, &cmdsize,
+ STATUS_DIFF_FILES_SHOW_CMD, oldpath, newpath))
+ return REQ_QUIT;
+ if (status)
+ info = "Unstaged changes to %s";
+ else
+ info = "Unstaged changes";
break;
- case REQ_MOVE_DOWN:
- steps = 1;
+ case LINE_STAT_UNTRACKED:
+ if (opt_pipe)
+ return REQ_QUIT;
+
+ if (!status) {
+ report("No file to show");
+ return REQ_NONE;
+ }
+
+ opt_pipe = fopen(status->new.name, "r");
+ info = "Untracked file %s";
break;
+ case LINE_STAT_HEAD:
+ return REQ_NONE;
+
default:
- die("request %d not handled in switch", request);
+ die("line type %d not handled in switch", line->type);
}
- if (steps <= 0 && view->lineno == 0) {
- report("Cannot move beyond the first line");
- return;
+ open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT);
+ if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
+ if (status) {
+ stage_status = *status;
+ } else {
+ memset(&stage_status, 0, sizeof(stage_status));
+ }
- } else if (steps >= 0 && view->lineno + 1 >= view->lines) {
- report("Cannot move beyond the last line");
- return;
+ stage_line_type = line->type;
+ string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.new.name);
}
- /* Move the current line */
- view->lineno += steps;
- assert(0 <= view->lineno && view->lineno < view->lines);
+ return REQ_NONE;
+}
- /* Repaint the old "current" line if we be scrolling */
- if (ABS(steps) < view->height) {
- int prev_lineno = view->lineno - steps - view->offset;
- wmove(view->win, prev_lineno, 0);
- wclrtoeol(view->win);
- draw_view_line(view, prev_lineno);
- }
+static bool
+status_update_file(struct view *view, struct status *status, enum line_type type)
+{
+ char cmd[SIZEOF_STR];
+ char buf[SIZEOF_STR];
+ size_t cmdsize = 0;
+ size_t bufsize = 0;
+ size_t written = 0;
+ FILE *pipe;
- /* 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;
+ if (opt_cdup[0] &&
+ type != LINE_STAT_UNTRACKED &&
+ !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
+ return FALSE;
- } 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;
- }
- }
+ switch (type) {
+ case LINE_STAT_STAGED:
+ if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c",
+ status->old.mode,
+ status->old.rev,
+ status->old.name, 0))
+ return FALSE;
- do_scroll_view(view, steps, redraw);
- return;
+ string_add(cmd, cmdsize, "git update-index -z --index-info");
+ break;
+
+ case LINE_STAT_UNSTAGED:
+ case LINE_STAT_UNTRACKED:
+ if (!string_format_from(buf, &bufsize, "%s%c", status->new.name, 0))
+ return FALSE;
+
+ string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
+ break;
+
+ case LINE_STAT_HEAD:
+ return TRUE;
+
+ default:
+ die("line type %d not handled in switch", type);
}
- /* Draw the current line */
- draw_view_line(view, view->lineno - view->offset);
+ pipe = popen(cmd, "w");
+ if (!pipe)
+ return FALSE;
- if (!redraw)
- return;
+ while (!ferror(pipe) && written < bufsize) {
+ written += fwrite(buf + written, 1, bufsize - written, pipe);
+ }
- redrawwin(view->win);
- wrefresh(view->win);
- report("");
-}
+ pclose(pipe);
+ if (written != bufsize)
+ return FALSE;
-/*
- * Incremental updating
- */
+ return TRUE;
+}
static void
-end_update(struct view *view)
+status_update(struct view *view)
{
- if (!view->pipe)
- return;
- set_nonblocking_input(FALSE);
- if (view->pipe == stdin)
- fclose(view->pipe);
- else
- pclose(view->pipe);
- view->pipe = NULL;
-}
+ struct line *line = &view->line[view->lineno];
-static bool
-begin_update(struct view *view)
-{
- const char *id = view->id;
+ assert(view->lines);
- if (view->pipe)
- end_update(view);
+ if (!line->data) {
+ while (++line < view->line + view->lines && line->data) {
+ if (!status_update_file(view, line->data, line->type))
+ report("Failed to update file status");
+ }
- if (opt_cmd[0]) {
- string_copy(view->cmd, opt_cmd);
- opt_cmd[0] = 0;
- /* When running random commands, the view ref could have become
- * invalid so clear it. */
- view->ref[0] = 0;
- } else {
- const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+ if (!line[-1].data) {
+ report("Nothing to update");
+ return;
+ }
- if (snprintf(view->cmd, sizeof(view->cmd), format,
- id, id, id, id, id) >= sizeof(view->cmd))
- return FALSE;
+ } else if (!status_update_file(view, line->data, line->type)) {
+ report("Failed to update file status");
}
+}
- /* Special case for the pager view. */
- if (opt_pipe) {
- view->pipe = opt_pipe;
- opt_pipe = NULL;
- } else {
- view->pipe = popen(view->cmd, "r");
- }
+static enum request
+status_request(struct view *view, enum request request, struct line *line)
+{
+ struct status *status = line->data;
- if (!view->pipe)
- return FALSE;
+ switch (request) {
+ case REQ_STATUS_UPDATE:
+ status_update(view);
+ break;
- set_nonblocking_input(TRUE);
+ case REQ_STATUS_MERGE:
+ if (!status || status->status != 'U') {
+ report("Merging only possible for files with unmerged status ('U').");
+ return REQ_NONE;
+ }
+ open_mergetool(status->new.name);
+ break;
- view->offset = 0;
- view->lines = 0;
- view->lineno = 0;
- string_copy(view->vid, id);
+ case REQ_EDIT:
+ if (!status)
+ return request;
- if (view->line) {
- int i;
+ open_editor(status->status != '?', status->new.name);
+ break;
- for (i = 0; i < view->lines; i++)
- if (view->line[i].data)
- free(view->line[i].data);
+ case REQ_VIEW_BLAME:
+ if (status) {
+ string_copy(opt_file, status->new.name);
+ opt_ref[0] = 0;
+ }
+ return request;
- free(view->line);
- view->line = NULL;
+ 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;
+
+ case REQ_REFRESH:
+ /* Simply reload the view. */
+ break;
+
+ default:
+ return request;
}
- view->start_time = time(NULL);
+ open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
- return TRUE;
+ return REQ_NONE;
}
-static bool
-update_view(struct view *view)
+static void
+status_select(struct view *view, struct line *line)
{
- char buffer[BUFSIZ];
- 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. */
- unsigned long lines = view->height;
- int redraw_from = -1;
-
- if (!view->pipe)
- return TRUE;
-
- /* Only redraw if lines are visible. */
- if (view->offset + view->height >= view->lines)
- redraw_from = view->lines - view->offset;
+ struct status *status = line->data;
+ char file[SIZEOF_STR] = "all files";
+ char *text;
+ char *key;
- tmp = realloc(view->line, sizeof(*view->line) * (view->lines + lines));
- if (!tmp)
- goto alloc_error;
+ if (status && !string_format(file, "'%s'", status->new.name))
+ return;
- view->line = tmp;
+ if (!status && line[1].type == LINE_STAT_NONE)
+ line++;
- while ((line = fgets(buffer, sizeof(buffer), view->pipe))) {
- int linelen = strlen(line);
+ switch (line->type) {
+ case LINE_STAT_STAGED:
+ text = "Press %s to unstage %s for commit";
+ break;
- struct line *prev = view->lines
- ? &view->line[view->lines - 1]
- : NULL;
+ case LINE_STAT_UNSTAGED:
+ text = "Press %s to stage %s for commit";
+ break;
- if (linelen)
- line[linelen - 1] = 0;
+ case LINE_STAT_UNTRACKED:
+ text = "Press %s to stage %s for addition";
+ break;
- if (!view->ops->read(view, prev, line))
- goto alloc_error;
+ case LINE_STAT_HEAD:
+ case LINE_STAT_NONE:
+ text = "Nothing to update";
+ break;
- if (lines-- == 1)
- break;
+ default:
+ die("line type %d not handled in switch", line->type);
}
- {
- int digits;
-
- lines = view->lines;
- for (digits = 0; lines; digits++)
- lines /= 10;
+ if (status && status->status == 'U') {
+ text = "Press %s to resolve conflict in %s";
+ key = get_key(REQ_STATUS_MERGE);
- /* Keep the displayed view in sync with line number scaling. */
- if (digits != view->digits) {
- view->digits = digits;
- redraw_from = 0;
- }
+ } else {
+ key = get_key(REQ_STATUS_UPDATE);
}
- 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. */
- if (redraw_from > 0)
- redraw_from--;
+ string_format(view->ref, text, key, file);
+}
- /* Incrementally draw avoids flickering. */
- redraw_view_from(view, redraw_from);
- }
+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;
- /* Update the title _after_ the redraw so that if the redraw picks up a
- * commit reference in view->ref it'll be available here. */
- update_view_title(view);
+ if (!status)
+ return FALSE;
- if (ferror(view->pipe)) {
- report("Failed to read: %s", strerror(errno));
- goto end;
+ for (state = S_STATUS; state < S_END; state++) {
+ char *text;
- } 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";
- }
+ switch (state) {
+ case S_NAME: text = status->new.name; break;
+ case S_STATUS:
+ buf[0] = status->status;
+ text = buf;
+ break;
- report("%s", msg);
- goto end;
+ default:
+ return FALSE;
}
- report("");
- goto end;
+ if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+ return TRUE;
}
- return TRUE;
-
-alloc_error:
- report("Allocation failure");
-
-end:
- end_update(view);
return FALSE;
}
-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. */
+static struct view_ops status_ops = {
+ "file",
+ status_open,
+ NULL,
+ status_draw,
+ status_request,
+ status_grep,
+ status_select,
};
-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);
- struct view *view = VIEW(request);
- int nviews = displayed_views();
- struct view *base_view = display[0];
-
- if (view == prev && nviews == 1 && !reload) {
- report("Already in %s view", view->name);
- return;
- }
- if ((reload || strcmp(view->vid, view->id)) &&
- !begin_update(view)) {
- report("Failed to load %s view", view->name);
- return;
- }
+static bool
+stage_diff_line(FILE *pipe, struct line *line)
+{
+ char *buf = line->data;
+ size_t bufsize = strlen(buf);
+ size_t written = 0;
- if (split) {
- display[current_view + 1] = view;
- if (!backgrounded)
- current_view++;
- } else {
- /* Maximize the current view. */
- memset(display, 0, sizeof(display));
- current_view = 0;
- display[current_view] = view;
+ while (!ferror(pipe) && written < bufsize) {
+ written += fwrite(buf + written, 1, bufsize - written, pipe);
}
- /* Resize the view when switching between split- and full-screen,
- * or when switching between two different full-screen views. */
- if (nviews != displayed_views() ||
- (nviews == 1 && base_view != display[0]))
- resize_display();
+ fputc('\n', pipe);
- if (split && prev->lineno - prev->offset >= prev->height) {
- /* Take the title line into account. */
- int lines = prev->lineno - prev->offset - prev->height + 1;
+ return written == bufsize;
+}
- /* Scroll the view that was split if the current line is
- * outside the new limited view. */
- do_scroll_view(prev, lines, TRUE);
- }
+static struct line *
+stage_diff_hdr(struct view *view, struct line *line)
+{
+ int diff_hdr_dir = line->type == LINE_DIFF_CHUNK ? -1 : 1;
+ struct line *diff_hdr;
- if (prev && view != prev) {
- /* Continue loading split views in the background. */
- if (!split)
- end_update(prev);
- else if (!backgrounded)
- /* "Blur" the previous view. */
- update_view_title(prev);
+ if (line->type == LINE_DIFF_CHUNK)
+ diff_hdr = line - 1;
+ else
+ diff_hdr = view->line + 1;
- view->parent = prev;
- }
+ while (diff_hdr > view->line && diff_hdr < view->line + view->lines) {
+ if (diff_hdr->type == LINE_DIFF_HEADER)
+ return diff_hdr;
- if (view->pipe) {
- /* Clear the old view and let the incremental updating refill
- * the screen. */
- wclear(view->win);
- report("");
- } else {
- redraw_view(view);
- if (view == VIEW(REQ_VIEW_HELP))
- report("%s", TIG_HELP);
- else
- report("");
+ diff_hdr += diff_hdr_dir;
}
- /* If the view is backgrounded the above calls to report()
- * won't redraw the view title. */
- if (backgrounded)
- update_view_title(view);
+ return NULL;
}
-
-/*
- * User request switch noodle
- */
-
-static int
-view_driver(struct view *view, enum request request)
+static bool
+stage_update_chunk(struct view *view, struct line *line)
{
- int i;
+ char cmd[SIZEOF_STR];
+ size_t cmdsize = 0;
+ struct line *diff_hdr, *diff_chunk, *diff_end;
+ FILE *pipe;
- switch (request) {
- case REQ_MOVE_UP:
- case REQ_MOVE_DOWN:
- case REQ_MOVE_PAGE_UP:
- case REQ_MOVE_PAGE_DOWN:
- case REQ_MOVE_FIRST_LINE:
- case REQ_MOVE_LAST_LINE:
- move_view(view, request, TRUE);
- break;
+ diff_hdr = stage_diff_hdr(view, line);
+ if (!diff_hdr)
+ return FALSE;
- case REQ_SCROLL_LINE_DOWN:
- case REQ_SCROLL_LINE_UP:
- case REQ_SCROLL_PAGE_DOWN:
- case REQ_SCROLL_PAGE_UP:
- scroll_view(view, request);
- break;
+ if (opt_cdup[0] &&
+ !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
+ return FALSE;
- case REQ_VIEW_MAIN:
- case REQ_VIEW_DIFF:
- case REQ_VIEW_LOG:
- case REQ_VIEW_HELP:
- case REQ_VIEW_PAGER:
- open_view(view, request, OPEN_DEFAULT);
- break;
+ if (!string_format_from(cmd, &cmdsize,
+ "git apply --cached %s - && "
+ "git update-index -q --unmerged --refresh 2>/dev/null",
+ stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
+ return FALSE;
- case REQ_NEXT:
- case REQ_PREVIOUS:
- request = request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
+ pipe = popen(cmd, "w");
+ if (!pipe)
+ return FALSE;
- if (view == VIEW(REQ_VIEW_DIFF) &&
- view->parent == VIEW(REQ_VIEW_MAIN)) {
- bool redraw = display[1] == view;
+ diff_end = view->line + view->lines;
+ if (line->type != LINE_DIFF_CHUNK) {
+ diff_chunk = diff_hdr;
- view = view->parent;
- move_view(view, request, redraw);
- if (redraw)
- update_view_title(view);
- } else {
- move_view(view, request, TRUE);
- break;
- }
- /* Fall-through */
+ } else {
+ for (diff_chunk = line + 1; diff_chunk < diff_end; diff_chunk++)
+ if (diff_chunk->type == LINE_DIFF_CHUNK ||
+ diff_chunk->type == LINE_DIFF_HEADER)
+ diff_end = diff_chunk;
+
+ diff_chunk = line;
+
+ while (diff_hdr->type != LINE_DIFF_CHUNK) {
+ switch (diff_hdr->type) {
+ case LINE_DIFF_HEADER:
+ case LINE_DIFF_INDEX:
+ case LINE_DIFF_ADD:
+ case LINE_DIFF_DEL:
+ break;
- case REQ_ENTER:
- if (!view->lines) {
- report("Nothing to enter");
- break;
+ default:
+ diff_hdr++;
+ continue;
+ }
+
+ if (!stage_diff_line(pipe, diff_hdr++)) {
+ pclose(pipe);
+ return FALSE;
+ }
}
- return view->ops->enter(view, &view->line[view->lineno]);
+ }
- case REQ_VIEW_NEXT:
- {
- int nviews = displayed_views();
- int next_view = (current_view + 1) % nviews;
+ while (diff_chunk < diff_end && stage_diff_line(pipe, diff_chunk))
+ diff_chunk++;
- if (next_view == current_view) {
- report("Only one view is displayed");
- break;
+ pclose(pipe);
+
+ if (diff_chunk != diff_end)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+stage_update(struct view *view, struct line *line)
+{
+ if (!opt_no_head && stage_line_type != LINE_STAT_UNTRACKED &&
+ (line->type == LINE_DIFF_CHUNK || !stage_status.status)) {
+ if (!stage_update_chunk(view, line)) {
+ report("Failed to apply chunk");
+ return;
}
- current_view = next_view;
- /* Blur out the title of the previous view. */
- update_view_title(view);
- report("");
- break;
+ } else if (!status_update_file(view, &stage_status, stage_line_type)) {
+ report("Failed to update file");
+ return;
}
- case REQ_TOGGLE_LINE_NUMBERS:
- opt_line_number = !opt_line_number;
- redraw_display();
- break;
- case REQ_PROMPT:
- /* Always reload^Wrerun commands from the prompt. */
- open_view(view, opt_request, OPEN_RELOAD);
- break;
+ open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
- case REQ_STOP_LOADING:
- foreach_view (view, i) {
- if (view->pipe)
- report("Stopped loaded the %s view", view->name),
- end_update(view);
- }
+ view = VIEW(REQ_VIEW_STATUS);
+ if (view_is_displayed(view))
+ status_enter(view, &view->line[view->lineno]);
+}
+
+static enum request
+stage_request(struct view *view, enum request request, struct line *line)
+{
+ switch (request) {
+ case REQ_STATUS_UPDATE:
+ stage_update(view, line);
break;
- case REQ_SHOW_VERSION:
- report("%s (built %s)", VERSION, __DATE__);
- return TRUE;
+ case REQ_EDIT:
+ if (!stage_status.new.name[0])
+ return request;
- case REQ_SCREEN_RESIZE:
- resize_display();
- /* Fall-through */
- case REQ_SCREEN_REDRAW:
- redraw_display();
+ open_editor(stage_status.status != '?', stage_status.new.name);
break;
- case REQ_SCREEN_UPDATE:
- doupdate();
- return TRUE;
-
- case REQ_VIEW_CLOSE:
- if (view->parent) {
- memset(display, 0, sizeof(display));
- current_view = 0;
- display[current_view] = view->parent;
- view->parent = NULL;
- resize_display();
- redraw_display();
- break;
+ case REQ_VIEW_BLAME:
+ if (stage_status.new.name[0]) {
+ string_copy(opt_file, stage_status.new.name);
+ opt_ref[0] = 0;
}
- /* Fall-through */
- case REQ_QUIT:
- return FALSE;
+ return request;
+
+ case REQ_ENTER:
+ pager_request(view, request, line);
+ break;
default:
- /* An unknown key will show most commonly used commands. */
- report("Unknown key, press 'h' for help");
- return TRUE;
+ return request;
}
- return TRUE;
+ return REQ_NONE;
}
+static struct view_ops stage_ops = {
+ "line",
+ NULL,
+ pager_read,
+ pager_draw,
+ stage_request,
+ pager_grep,
+ pager_select,
+};
+
/*
- * Pager backend
+ * Revision graph
*/
-static bool
-pager_draw(struct view *view, struct line *line, unsigned int lineno)
+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. */
+ chtype graph[SIZEOF_REVGRAPH]; /* Ancestry chain graphics. */
+ size_t graph_size; /* The width of the graph array. */
+ bool has_parents; /* Rewritten --parents seen. */
+};
+
+/* Size of rev graph with no "padding" columns */
+#define SIZEOF_REVITEMS (SIZEOF_REVGRAPH - (SIZEOF_REVGRAPH / 2))
+
+struct rev_graph {
+ struct rev_graph *prev, *next, *parents;
+ char rev[SIZEOF_REVITEMS][SIZEOF_REV];
+ size_t size;
+ struct commit *commit;
+ size_t pos;
+ unsigned int boundary:1;
+};
+
+/* Parents of the commit being visualized. */
+static struct rev_graph graph_parents[4];
+
+/* The current stack of revisions on the graph. */
+static struct rev_graph graph_stacks[4] = {
+ { &graph_stacks[3], &graph_stacks[1], &graph_parents[0] },
+ { &graph_stacks[0], &graph_stacks[2], &graph_parents[1] },
+ { &graph_stacks[1], &graph_stacks[3], &graph_parents[2] },
+ { &graph_stacks[2], &graph_stacks[0], &graph_parents[3] },
+};
+
+static inline bool
+graph_parent_is_merge(struct rev_graph *graph)
{
- char *text = line->data;
- enum line_type type = line->type;
- int textlen = strlen(text);
- int attr;
+ return graph->parents->size > 1;
+}
- wmove(view->win, lineno, 0);
+static inline void
+append_to_rev_graph(struct rev_graph *graph, chtype symbol)
+{
+ struct commit *commit = graph->commit;
- if (view->offset + lineno == view->lineno) {
- if (type == LINE_COMMIT) {
- string_copy(view->ref, text + 7);
- string_copy(ref_commit, view->ref);
- }
+ if (commit->graph_size < ARRAY_SIZE(commit->graph) - 1)
+ commit->graph[commit->graph_size++] = symbol;
+}
- type = LINE_CURSOR;
- wchgat(view->win, -1, 0, type, NULL);
+static void
+done_rev_graph(struct rev_graph *graph)
+{
+ if (graph_parent_is_merge(graph) &&
+ graph->pos < graph->size - 1 &&
+ graph->next->size == graph->size + graph->parents->size - 1) {
+ size_t i = graph->pos + graph->parents->size - 1;
+
+ graph->commit->graph_size = i * 2;
+ while (i < graph->next->size - 1) {
+ append_to_rev_graph(graph, ' ');
+ append_to_rev_graph(graph, '\\');
+ i++;
+ }
}
- attr = get_line_attr(type);
- wattrset(view->win, attr);
+ graph->size = graph->pos = 0;
+ graph->commit = NULL;
+ memset(graph->parents, 0, sizeof(*graph->parents));
+}
- if (opt_line_number || opt_tab_size < TABSIZE) {
- static char spaces[] = " ";
- int col_offset = 0, col = 0;
+static void
+push_rev_graph(struct rev_graph *graph, char *parent)
+{
+ int i;
- if (opt_line_number) {
- unsigned long real_lineno = view->offset + lineno + 1;
+ /* "Collapse" duplicate parents lines.
+ *
+ * FIXME: This needs to also update update the drawn graph but
+ * for now it just serves as a method for pruning graph lines. */
+ for (i = 0; i < graph->size; i++)
+ if (!strncmp(graph->rev[i], parent, SIZEOF_REV))
+ return;
- if (real_lineno == 1 ||
- (real_lineno % opt_num_interval) == 0) {
- wprintw(view->win, "%.*d", view->digits, real_lineno);
+ if (graph->size < SIZEOF_REVITEMS) {
+ string_copy_rev(graph->rev[graph->size++], parent);
+ }
+}
- } else {
- waddnstr(view->win, spaces,
- MIN(view->digits, STRING_SIZE(spaces)));
- }
- waddstr(view->win, ": ");
- col_offset = view->digits + 2;
- }
+static chtype
+get_rev_graph_symbol(struct rev_graph *graph)
+{
+ chtype symbol;
+
+ if (graph->boundary)
+ symbol = REVGRAPH_BOUND;
+ else if (graph->parents->size == 0)
+ symbol = REVGRAPH_INIT;
+ else if (graph_parent_is_merge(graph))
+ symbol = REVGRAPH_MERGE;
+ else if (graph->pos >= graph->size)
+ symbol = REVGRAPH_BRANCH;
+ else
+ symbol = REVGRAPH_COMMIT;
- while (text && col_offset + col < view->width) {
- int cols_max = view->width - col_offset - col;
- char *pos = text;
- int cols;
+ return symbol;
+}
- if (*text == '\t') {
- text++;
- assert(sizeof(spaces) > TABSIZE);
- pos = spaces;
- cols = opt_tab_size - (col % opt_tab_size);
+static void
+draw_rev_graph(struct rev_graph *graph)
+{
+ struct rev_filler {
+ chtype separator, line;
+ };
+ enum { DEFAULT, RSHARP, RDIAG, LDIAG };
+ static struct rev_filler fillers[] = {
+ { ' ', REVGRAPH_LINE },
+ { '`', '.' },
+ { '\'', ' ' },
+ { '/', ' ' },
+ };
+ chtype symbol = get_rev_graph_symbol(graph);
+ struct rev_filler *filler;
+ size_t i;
- } else {
- text = strchr(text, '\t');
- cols = line ? text - pos : strlen(pos);
- }
+ filler = &fillers[DEFAULT];
- waddnstr(view->win, pos, MIN(cols, cols_max));
- col += cols;
- }
+ for (i = 0; i < graph->pos; i++) {
+ append_to_rev_graph(graph, filler->line);
+ if (graph_parent_is_merge(graph->prev) &&
+ graph->prev->pos == i)
+ filler = &fillers[RSHARP];
- } else {
- int col = 0, pos = 0;
+ append_to_rev_graph(graph, filler->separator);
+ }
- for (; pos < textlen && col < view->width; pos++, col++)
- if (text[pos] == '\t')
- col += TABSIZE - (col % TABSIZE) - 1;
+ /* Place the symbol for this revision. */
+ append_to_rev_graph(graph, symbol);
- waddnstr(view->win, text, pos);
+ if (graph->prev->size > graph->size)
+ filler = &fillers[RDIAG];
+ else
+ filler = &fillers[DEFAULT];
+
+ i++;
+
+ for (; i < graph->size; i++) {
+ append_to_rev_graph(graph, filler->separator);
+ append_to_rev_graph(graph, filler->line);
+ if (graph_parent_is_merge(graph->prev) &&
+ i < graph->prev->pos + graph->parents->size)
+ filler = &fillers[RSHARP];
+ if (graph->prev->size > graph->size)
+ filler = &fillers[LDIAG];
}
- return TRUE;
+ if (graph->prev->size > graph->size) {
+ append_to_rev_graph(graph, filler->separator);
+ if (filler->line != ' ')
+ append_to_rev_graph(graph, filler->line);
+ }
}
-static bool
-pager_read(struct view *view, struct line *prev, char *line)
+/* Prepare the next rev graph */
+static void
+prepare_rev_graph(struct rev_graph *graph)
{
- /* Compress empty lines in the help view. */
- if (view == VIEW(REQ_VIEW_HELP) &&
- !*line && prev && !*((char *) prev->data))
- return TRUE;
+ size_t i;
- view->line[view->lines].data = strdup(line);
- if (!view->line[view->lines].data)
- return FALSE;
+ /* First, traverse all lines of revisions up to the active one. */
+ for (graph->pos = 0; graph->pos < graph->size; graph->pos++) {
+ if (!strcmp(graph->rev[graph->pos], graph->commit->id))
+ break;
- view->line[view->lines].type = get_line_type(line);
+ push_rev_graph(graph->next, graph->rev[graph->pos]);
+ }
- view->lines++;
- return TRUE;
+ /* Interleave the new revision parent(s). */
+ for (i = 0; !graph->boundary && i < graph->parents->size; i++)
+ push_rev_graph(graph->next, graph->parents->rev[i]);
+
+ /* Lastly, put any remaining revisions. */
+ for (i = graph->pos + 1; i < graph->size; i++)
+ push_rev_graph(graph->next, graph->rev[i]);
}
-static bool
-pager_enter(struct view *view, struct line *line)
+static void
+update_rev_graph(struct rev_graph *graph)
{
- 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);
+ /* If this is the finalizing update ... */
+ if (graph->commit)
+ prepare_rev_graph(graph);
- /* FIXME: A minor workaround. Scrolling the view will call report("")
- * but if we are scolling a non-current view this won't properly update
- * the view title. */
- if (split)
- update_view_title(view);
+ /* Graph visualization needs a one rev look-ahead,
+ * so the first update doesn't visualize anything. */
+ if (!graph->prev->commit)
+ return;
- return TRUE;
+ draw_rev_graph(graph->prev);
+ done_rev_graph(graph->prev->prev);
}
-static struct view_ops pager_ops = {
- "line",
- pager_draw,
- pager_read,
- pager_enter,
-};
-
/*
* Main view backend
*/
-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. */
-};
-
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;
enum line_type type;
int col = 0;
size_t timelen;
- size_t authorlen;
- int trimmed = 1;
+ int space;
if (!*commit->author)
return FALSE;
+ space = view->width;
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);
-
} else {
type = LINE_MAIN_COMMIT;
wattrset(view->win, get_line_attr(LINE_MAIN_DATE));
}
- timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
- waddnstr(view->win, buf, timelen);
- waddstr(view->win, " ");
+ if (opt_date) {
+ int n;
- col += DATE_COLS;
- wmove(view->win, lineno, col);
+ timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
+ n = draw_text(view, buf, view->width - col, FALSE, selected);
+ draw_text(view, " ", view->width - col - n, FALSE, selected);
+
+ col += DATE_COLS;
+ wmove(view->win, lineno, col);
+ if (col >= view->width)
+ return TRUE;
+ }
if (type != LINE_CURSOR)
wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));
- if (opt_utf8) {
- authorlen = utf8_length(commit->author, AUTHOR_COLS - 2, &col, &trimmed);
- } else {
- authorlen = strlen(commit->author);
- if (authorlen > AUTHOR_COLS - 2) {
- authorlen = AUTHOR_COLS - 2;
- trimmed = 1;
- }
+ if (opt_author) {
+ int max_len;
+
+ max_len = view->width - col;
+ if (max_len > AUTHOR_COLS - 1)
+ max_len = AUTHOR_COLS - 1;
+ draw_text(view, commit->author, max_len, TRUE, selected);
+ col += AUTHOR_COLS;
+ if (col >= view->width)
+ return TRUE;
}
- if (trimmed) {
- waddnstr(view->win, commit->author, authorlen);
+ if (opt_rev_graph && commit->graph_size) {
+ size_t graph_size = view->width - col;
+ size_t i;
+
if (type != LINE_CURSOR)
- wattrset(view->win, get_line_attr(LINE_MAIN_DELIM));
- waddch(view->win, '~');
- } else {
- waddstr(view->win, commit->author);
+ wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH));
+ wmove(view->win, lineno, col);
+ if (graph_size > commit->graph_size)
+ graph_size = commit->graph_size;
+ /* Using waddch() instead of waddnstr() ensures that
+ * they'll be rendered correctly for the cursor line. */
+ for (i = 0; i < graph_size; i++)
+ waddch(view->win, commit->graph[i]);
+
+ col += commit->graph_size + 1;
+ if (col >= view->width)
+ return TRUE;
+ waddch(view->win, ' ');
}
-
- col += AUTHOR_COLS;
if (type != LINE_CURSOR)
wattrset(view->win, A_NORMAL);
- mvwaddch(view->win, lineno, col, ACS_LTEE);
- wmove(view->win, lineno, col + 2);
- col += 2;
+ wmove(view->win, lineno, col);
- if (commit->refs) {
+ if (opt_show_refs && commit->refs) {
size_t i = 0;
do {
if (type == LINE_CURSOR)
;
+ else if (commit->refs[i]->head)
+ wattrset(view->win, get_line_attr(LINE_MAIN_HEAD));
+ else if (commit->refs[i]->ltag)
+ wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));
else if (commit->refs[i]->tag)
wattrset(view->win, get_line_attr(LINE_MAIN_TAG));
+ else if (commit->refs[i]->remote)
+ wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE));
else
wattrset(view->win, get_line_attr(LINE_MAIN_REF));
- waddstr(view->win, "[");
- waddstr(view->win, commit->refs[i]->name);
- waddstr(view->win, "]");
+
+ col += draw_text(view, "[", view->width - col, TRUE, selected);
+ col += draw_text(view, commit->refs[i]->name, view->width - col,
+ TRUE, selected);
+ col += draw_text(view, "]", view->width - col, TRUE, selected);
if (type != LINE_CURSOR)
wattrset(view->win, A_NORMAL);
- waddstr(view->win, " ");
- col += strlen(commit->refs[i]->name) + STRING_SIZE("[] ");
+ col += draw_text(view, " ", view->width - col, TRUE, selected);
+ if (col >= view->width)
+ return TRUE;
} while (commit->refs[i++]->next);
}
if (type != LINE_CURSOR)
wattrset(view->win, get_line_attr(type));
- {
- int titlelen = strlen(commit->title);
-
- if (col + titlelen > view->width)
- titlelen = view->width - col;
-
- waddnstr(view->win, commit->title, titlelen);
- }
-
+ draw_text(view, commit->title, view->width - col, TRUE, selected);
return TRUE;
}
/* 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);
+ static struct rev_graph *graph = graph_stacks;
+ enum line_type type;
struct commit *commit;
- switch (type) {
- case LINE_COMMIT:
+ if (!line) {
+ update_rev_graph(graph);
+ return TRUE;
+ }
+
+ type = get_line_type(line);
+ if (type == LINE_COMMIT) {
commit = calloc(1, sizeof(struct commit));
if (!commit)
return FALSE;
line += STRING_SIZE("commit ");
+ if (*line == '-') {
+ graph->boundary = 1;
+ line++;
+ }
- view->line[view->lines++].data = commit;
- string_copy(commit->id, line);
+ string_copy_rev(commit->id, line);
commit->refs = get_refs(commit->id);
+ graph->commit = commit;
+ add_line_data(view, commit, LINE_MAIN_COMMIT);
+
+ while ((line = strchr(line, ' '))) {
+ line++;
+ push_rev_graph(graph->parents, line);
+ commit->has_parents = TRUE;
+ }
+ return TRUE;
+ }
+
+ if (!view->lines)
+ return TRUE;
+ commit = view->line[view->lines - 1].data;
+
+ switch (type) {
+ case LINE_PARENT:
+ if (commit->has_parents)
+ break;
+ push_rev_graph(graph->parents, line + STRING_SIZE("parent "));
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 (!nameend || !emailend)
break;
- commit = prev->data;
+ update_rev_graph(graph);
+ graph = graph->next;
- 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);
+ string_ncopy(commit->author, ident, strlen(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)
- 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_ncopy(commit->title, line, strlen(line));
}
return TRUE;
}
-static bool
-main_enter(struct view *view, struct line *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;
- open_view(view, REQ_VIEW_DIFF, flags);
- 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 },
+ if (request == REQ_ENTER)
+ open_view(view, REQ_VIEW_DIFF, flags);
+ else
+ return request;
- /**
- * 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 },
+ return REQ_NONE;
+}
- /**
- * 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_rev(view->ref, commit->id);
+ string_copy_rev(ref_commit, view->ref);
}
+static struct view_ops main_ops = {
+ "commit",
+ NULL,
+ main_read,
+ main_draw,
+ main_request,
+ main_grep,
+ main_select,
+};
+
/*
* Unicode / UTF-8 handling
|| (c >= 0x30000 && c <= 0x3fffd)))
return 2;
+ if (c == '\t')
+ return opt_tab_size;
+
return 1;
}
/* 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.
- *
- * Additionally, adds to coloffset how many many columns to move to align with
- * the expected position. Takes into account how multi-byte and double-width
- * characters will effect the cursor position.
+ * 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, size_t max_width, int *coloffset, int *trimmed)
+utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve)
{
const char *start = string;
const char *end = strchr(string, '\0');
- size_t mbwidth = 0;
+ unsigned char last_bytes = 0;
size_t width = 0;
*trimmed = 0;
width += ucwidth;
if (width > max_width) {
*trimmed = 1;
+ if (reserve && width - ucwidth == max_width) {
+ string -= last_bytes;
+ }
break;
}
- /* The column offset collects the differences between the
- * number of bytes encoding a character and the number of
- * columns will be used for rendering said character.
- *
- * So if some character A is encoded in 2 bytes, but will be
- * represented on the screen using only 1 byte this will and up
- * adding 1 to the multi-byte column offset.
- *
- * Assumes that no double-width character can be encoding in
- * less than two bytes. */
- if (bytes > ucwidth)
- mbwidth += bytes - ucwidth;
-
string += bytes;
+ last_bytes = bytes;
}
- *coloffset += mbwidth;
-
return string - start;
}
/* 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 (!view) {
+ char buf[SIZEOF_STR];
+ va_list args;
+
+ va_start(args, msg);
+ if (vsnprintf(buf, sizeof(buf), msg, args) >= sizeof(buf)) {
+ buf[sizeof(buf) - 1] = 0;
+ buf[sizeof(buf) - 2] = '.';
+ buf[sizeof(buf) - 3] = '.';
+ buf[sizeof(buf) - 4] = '.';
+ }
+ va_end(args);
+ die("%s", buf);
+ }
+
+ 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);
-
- /* 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
- * the cursor does not jump around. */
- if (view->lines) {
- wmove(view->win, view->lineno - view->offset, view->width - 1);
- wrefresh(view->win);
- }
+ 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
*/
-static struct ref *refs;
-static size_t refs_size;
+static struct ref *refs = NULL;
+static size_t refs_alloc = 0;
+static size_t refs_size = 0;
/* Id <-> ref store */
-static struct ref ***id_refs;
-static size_t id_refs_size;
+static struct ref ***id_refs = NULL;
+static size_t id_refs_alloc = 0;
+static size_t id_refs_size = 0;
static struct ref **
get_refs(char *id)
{
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;
if (!strcmp(id, id_refs[i][0]->id))
return id_refs[i];
- tmp_id_refs = realloc(id_refs, (id_refs_size + 1) * sizeof(*id_refs));
+ tmp_id_refs = realloc_items(id_refs, &id_refs_alloc, id_refs_size + 1,
+ sizeof(*id_refs));
if (!tmp_id_refs)
return NULL;
if (strcmp(id, refs[i].id))
continue;
- tmp = realloc(ref_list, (ref_list_size + 1) * sizeof(*ref_list));
+ tmp = realloc_items(ref_list, &ref_list_alloc,
+ ref_list_size + 1, sizeof(*ref_list));
if (!tmp) {
if (ref_list)
free(ref_list);
}
static int
-read_ref(char *id, int idlen, char *name, int namelen)
+read_ref(char *id, size_t idlen, char *name, size_t namelen)
{
struct ref *ref;
bool tag = FALSE;
- bool tag_commit = FALSE;
-
- /* Commits referenced by tags has "^{}" appended. */
- if (name[namelen - 1] == '}') {
- while (namelen > 0 && name[namelen] != '^')
- namelen--;
- if (namelen > 0)
- tag_commit = TRUE;
- name[namelen] = 0;
- }
+ bool ltag = FALSE;
+ bool remote = FALSE;
+ bool check_replace = FALSE;
+ bool head = FALSE;
if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
- if (!tag_commit)
- return OK;
- name += STRING_SIZE("refs/tags/");
+ if (!strcmp(name + namelen - 3, "^{}")) {
+ namelen -= 3;
+ name[namelen] = 0;
+ if (refs_size > 0 && refs[refs_size - 1].ltag == TRUE)
+ check_replace = TRUE;
+ } else {
+ ltag = TRUE;
+ }
+
tag = TRUE;
+ namelen -= STRING_SIZE("refs/tags/");
+ name += STRING_SIZE("refs/tags/");
+
+ } else if (!strncmp(name, "refs/remotes/", STRING_SIZE("refs/remotes/"))) {
+ remote = TRUE;
+ namelen -= STRING_SIZE("refs/remotes/");
+ name += STRING_SIZE("refs/remotes/");
} 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/");
+ head = !strncmp(opt_head, name, namelen);
} else if (!strcmp(name, "HEAD")) {
+ opt_no_head = FALSE;
return OK;
}
- refs = realloc(refs, sizeof(*refs) * (refs_size + 1));
+ 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 beofre the commit id
+ * it points to. */
+ refs[refs_size - 1].ltag = ltag;
+ string_copy_rev(refs[refs_size - 1].id, id);
+
+ return OK;
+ }
+ refs = realloc_items(refs, &refs_alloc, refs_size + 1, sizeof(*refs));
if (!refs)
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);
+ ref->ltag = ltag;
+ ref->remote = remote;
+ ref->head = head;
+ string_copy_rev(ref->id, id);
return OK;
}
const char *cmd_env = getenv("TIG_LS_REMOTE");
const char *cmd = cmd_env && *cmd_env ? cmd_env : TIG_LS_REMOTE;
- return read_properties(cmd, '\t', read_ref);
+ return read_properties(popen(cmd, "r"), "\t", read_ref);
+}
+
+static int
+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"))
+ string_ncopy(opt_editor, value, valuelen);
+
+ return OK;
+}
+
+static int
+load_repo_config(void)
+{
+ return read_properties(popen(GIT_CONFIG " --list", "r"),
+ "=", read_repo_config_option);
}
static int
-read_config_option(char *name, int namelen, char *value, int valuelen)
+read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
{
- if (!strcmp(name, "i18n.commitencoding")) {
- string_copy(opt_encoding, value);
+ if (!opt_git_dir[0]) {
+ string_ncopy(opt_git_dir, name, namelen);
+
+ } else if (opt_is_inside_work_tree == -1) {
+ /* This can be 3 different values depending on the
+ * version of git being used. If git-rev-parse does not
+ * understand --is-inside-work-tree it will simply echo
+ * the option else either "true" or "false" is printed.
+ * Default to true for the unknown case. */
+ opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
+
+ } else if (opt_cdup[0] == ' ') {
+ string_ncopy(opt_cdup, name, namelen);
+ } else {
+ if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
+ namelen -= STRING_SIZE("refs/heads/");
+ name += STRING_SIZE("refs/heads/");
+ string_ncopy(opt_head, name, namelen);
+ }
}
return OK;
}
static int
-load_config(void)
+load_repo_info(void)
{
- return read_properties("git repo-config --list", '=',
- read_config_option);
+ int result;
+ FILE *pipe = popen("git rev-parse --git-dir --is-inside-work-tree "
+ " --show-cdup --symbolic-full-name HEAD 2>/dev/null", "r");
+
+ /* XXX: The line outputted by "--show-cdup" can be empty so
+ * initialize it to something invalid to make it possible to
+ * detect whether it has been set or not. */
+ opt_cdup[0] = ' ';
+
+ result = read_properties(pipe, "=", read_repo_info);
+ if (opt_cdup[0] == ' ')
+ opt_cdup[0] = 0;
+
+ return result;
}
static int
-read_properties(const char *cmd, int separator,
- int (*read_property)(char *, int, char *, int))
+read_properties(FILE *pipe, const char *separators,
+ int (*read_property)(char *, size_t, char *, size_t))
{
- FILE *pipe = popen(cmd, "r");
char buffer[BUFSIZ];
char *name;
int state = OK;
return ERR;
while (state == OK && (name = fgets(buffer, sizeof(buffer), pipe))) {
- char *value = strchr(name, separator);
- int namelen;
- int valuelen;
+ char *value;
+ size_t namelen;
+ size_t valuelen;
- if (value) {
- namelen = value - name;
- *value++ = 0;
+ name = chomp_string(name);
+ namelen = strcspn(name, separators);
+
+ if (name[namelen]) {
+ name[namelen] = 0;
+ value = chomp_string(name + namelen + 1);
valuelen = strlen(value);
- if (valuelen > 0)
- value[valuelen - 1] = 0;
} else {
- namelen = strlen(name);
value = "";
valuelen = 0;
}
* Main
*/
-#if __GNUC__ >= 3
-#define __NORETURN __attribute__((__noreturn__))
-#else
-#define __NORETURN
-#endif
-
static void __NORETURN
quit(int sig)
{
exit(1);
}
+static void
+warn(const char *msg, ...)
+{
+ va_list args;
+
+ va_start(args, msg);
+ fputs("tig warning: ", stderr);
+ vfprintf(stderr, msg, args);
+ fputs("\n", stderr);
+ va_end(args);
+}
+
int
main(int argc, char *argv[])
{
signal(SIGINT, quit);
- /* Load the repo config file first so options can be overwritten from
- * the command line. */
- if (load_config() == ERR)
+ if (setlocale(LC_ALL, "")) {
+ char *codeset = nl_langinfo(CODESET);
+
+ string_ncopy(opt_codeset, codeset, strlen(codeset));
+ }
+
+ if (load_repo_info() == ERR)
+ die("Failed to load repo info.");
+
+ if (load_options() == ERR)
+ die("Failed to load user config.");
+
+ /* Load the repo config file so options can be overwritten from
+ * the command line. */
+ if (load_repo_config() == ERR)
die("Failed to load repo config.");
if (!parse_options(argc, argv))
return 0;
- if (load_refs() == ERR)
- die("Failed to load refs.");
-
/* Require a git repository unless when running in pager mode. */
- if (refs_size == 0 && opt_request != REQ_VIEW_PAGER)
+ if (!opt_git_dir[0])
die("Not a git repository");
+ if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
+ opt_utf8 = FALSE;
+
+ 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.");
+
for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
view->cmd_env = getenv(view->cmd_env);
/* 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 {
- request = ERR;
+ {
+ 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_ncopy(opt_search, search, strlen(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 <<view-commands, "View 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.
- *
- * TODO
- * ----
- * Features that should be explored.
- *
- * - Searching.
- *
- * - Locale support.
- *
- * 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