![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 5524a07ac3ef2d46eb000fba9a8b52cc6161b262..3394d407472d3317d9cf9cc9d311db445706944b 100644 (file)
--- a/tig.c
+++ b/tig.c
/* ncurses(3): Must be defined to have extended wide-character functions. */
#define _XOPEN_SOURCE_EXTENDED
-#include <curses.h>
+#ifdef HAVE_NCURSESW_NCURSES_H
+#include <ncursesw/ncurses.h>
+#else
+#ifdef HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#else
+#include <ncurses.h>
+#endif
+#endif
#if __GNUC__ >= 3
#define __NORETURN __attribute__((__noreturn__))
static void report(const char *msg, ...);
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 *trimmed, bool reserve);
+static size_t utf8_length(const char *string, int *width, size_t max_width, int *trimmed, bool reserve);
+static bool prompt_yesno(const char *prompt);
+static int load_refs(void);
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#define SIZEOF_STR 1024 /* Default string size. */
#define SIZEOF_REF 256 /* Size of symbolic or SHA1 ID. */
-#define SIZEOF_REV 41 /* Holds a SHA-1 and an ending NUL */
+#define SIZEOF_REV 41 /* Holds a SHA-1 and an ending NUL. */
+#define SIZEOF_ARG 32 /* Default argument array size. */
/* Revision graph */
#define REVGRAPH_BRANCH '+'
#define REVGRAPH_COMMIT '*'
#define REVGRAPH_BOUND '^'
-#define REVGRAPH_LINE '|'
#define SIZEOF_REVGRAPH 19 /* Size of revision ancestry graphics. */
@@ -99,16 +109,18 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
/* The default interval between line numbers. */
#define NUMBER_INTERVAL 5
-#define TABSIZE 8
+#define TAB_SIZE 8
#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#define NULL_ID "0000000000000000000000000000000000000000"
+
#ifndef GIT_CONFIG
-#define GIT_CONFIG "git config"
+#define GIT_CONFIG "config"
#endif
#define TIG_LS_REMOTE \
- "git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
+ "git ls-remote . 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"
@@ -116,8 +128,11 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
#define TIG_LOG_CMD \
"git log --no-color --cc --stat -n100 %s 2>/dev/null"
+#define TIG_MAIN_BASE \
+ "git log --no-color --pretty=raw --parents --topo-order"
+
#define TIG_MAIN_CMD \
- "git log --no-color --topo-order --parents --boundary --pretty=raw %s 2>/dev/null"
+ TIG_MAIN_BASE " %s 2>/dev/null"
#define TIG_TREE_CMD \
"git ls-tree %s %s"
@@ -141,13 +156,15 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
struct ref {
char *name; /* Ref name; tag or head names are shortened. */
char id[SIZEOF_REV]; /* Commit SHA1 ID */
+ unsigned int head:1; /* Is it the current HEAD? */
unsigned int tag:1; /* Is it a tag? */
unsigned int ltag:1; /* If so, is the tag local? */
unsigned int remote:1; /* Is it a remote ref? */
+ unsigned int tracked:1; /* Is it the remote for the current HEAD? */
unsigned int next:1; /* For ref lists: are there more refs? */
};
-static struct ref **get_refs(char *id);
+static struct ref **get_refs(const char *id);
struct int_map {
const char *name;
return 0;
}
+#define prefixcmp(str1, str2) \
+ strncmp(str1, str2, STRING_SIZE(str2))
+
/* Shell quoting
*
* NOTE: The following is a slightly modified copy of the git project's shell
REQ_(PREVIOUS, "Move to previous"), \
REQ_(VIEW_NEXT, "Move focus to next view"), \
REQ_(REFRESH, "Reload and refresh"), \
+ REQ_(MAXIMIZE, "Maximize the current view"), \
REQ_(VIEW_CLOSE, "Close the current view"), \
REQ_(QUIT, "Close all views and quit"), \
\
+ REQ_GROUP("View specific requests") \
+ REQ_(STATUS_UPDATE, "Update file status"), \
+ REQ_(STATUS_REVERT, "Revert file changes"), \
+ REQ_(STATUS_MERGE, "Merge file using external tool"), \
+ REQ_(STAGE_NEXT, "Find next chunk to stage"), \
+ REQ_(TREE_PARENT, "Switch to parent directory in tree view"), \
+ \
REQ_GROUP("Cursor navigation") \
REQ_(MOVE_UP, "Move cursor one line up"), \
REQ_(MOVE_DOWN, "Move cursor one line down"), \
REQ_(FIND_NEXT, "Find next search match"), \
REQ_(FIND_PREV, "Find previous search match"), \
\
+ REQ_GROUP("Option manipulation") \
+ 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_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")
struct request_info {
enum request request;
- char *name;
+ const char *name;
int namelen;
- char *help;
+ const char *help;
};
static struct request_info req_info[] = {
static bool opt_date = TRUE;
static bool opt_author = TRUE;
static bool opt_line_number = FALSE;
+static bool opt_line_graphics = TRUE;
static bool opt_rev_graph = FALSE;
static bool opt_show_refs = TRUE;
static int opt_num_interval = NUMBER_INTERVAL;
-static int opt_tab_size = TABSIZE;
-static enum request opt_request = REQ_VIEW_MAIN;
+static int opt_tab_size = TAB_SIZE;
+static int opt_author_cols = AUTHOR_COLS-1;
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 char opt_remote[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_git_dir[SIZEOF_STR] = "";
static signed char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */
static char opt_editor[SIZEOF_STR] = "";
+static FILE *opt_tty = NULL;
-static bool
-parse_options(int argc, char *argv[])
+static enum request
+parse_options(int argc, const char *argv[])
{
+ enum request request = REQ_VIEW_MAIN;
size_t buf_size;
- char *subcommand;
+ const char *subcommand;
bool seen_dashdash = FALSE;
int i;
+ if (!isatty(STDIN_FILENO)) {
+ opt_pipe = stdin;
+ return REQ_VIEW_PAGER;
+ }
+
if (argc <= 1)
- return TRUE;
+ return REQ_VIEW_MAIN;
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;
+ return REQ_VIEW_STATUS;
} 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);
}
string_ncopy(opt_file, argv[i], strlen(argv[i]));
- return TRUE;
+ return REQ_VIEW_BLAME;
} else if (!strcmp(subcommand, "show")) {
- opt_request = REQ_VIEW_DIFF;
+ request = REQ_VIEW_DIFF;
} else if (!strcmp(subcommand, "log") || !strcmp(subcommand, "diff")) {
- opt_request = subcommand[0] == 'l'
- ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+ request = subcommand[0] == 'l' ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
warn("`tig %s' has been deprecated", subcommand);
} else {
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");
+ string_copy(opt_cmd, TIG_MAIN_BASE);
else
string_format(opt_cmd, "git %s", subcommand);
buf_size = strlen(opt_cmd);
for (i = 1 + !!subcommand; i < argc; i++) {
- char *opt = argv[i];
+ const char *opt = argv[i];
if (seen_dashdash || !strcmp(opt, "--")) {
seen_dashdash = TRUE;
} else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) {
printf("tig version %s\n", TIG_VERSION);
- return FALSE;
+ return REQ_NONE;
} else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
- printf(usage);
- return FALSE;
+ printf("%s\n", usage);
+ return REQ_NONE;
}
opt_cmd[buf_size++] = ' ';
die("command too long");
}
- if (!isatty(STDIN_FILENO)) {
- opt_request = REQ_VIEW_PAGER;
- opt_pipe = stdin;
- buf_size = 0;
- }
-
opt_cmd[buf_size] = 0;
- return TRUE;
+ return request;
}
LINE(DEFAULT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
LINE(CURSOR, "", COLOR_WHITE, COLOR_GREEN, A_BOLD), \
LINE(STATUS, "", COLOR_GREEN, COLOR_DEFAULT, 0), \
+LINE(DELIMITER, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
+LINE(DATE, "", COLOR_BLUE, COLOR_DEFAULT, 0), \
+LINE(LINE_NUMBER, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
LINE(TITLE_BLUR, "", COLOR_WHITE, COLOR_BLUE, 0), \
LINE(TITLE_FOCUS, "", COLOR_WHITE, COLOR_BLUE, A_BOLD), \
-LINE(MAIN_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_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_LOCAL_TAG,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
+LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(MAIN_TRACKED, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \
+LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
+LINE(MAIN_HEAD, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \
LINE(MAIN_REVGRAPH,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \
LINE(TREE_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)
+LINE(BLAME_ID, "", COLOR_MAGENTA, COLOR_DEFAULT, 0)
enum line_type {
#define LINE(type, line, fg, bg, attr) \
LINE_##type
- LINE_INFO
+ LINE_INFO,
+ LINE_NONE
#undef LINE
};
};
static enum line_type
-get_line_type(char *line)
+get_line_type(const char *line)
{
int linelen = strlen(line);
enum line_type type;
}
static struct line_info *
-get_line_info(char *name, int namelen)
+get_line_info(const char *name)
{
+ size_t namelen = strlen(name);
enum line_type type;
for (type = 0; type < ARRAY_SIZE(line_info); type++)
{ KEY_UP, REQ_PREVIOUS },
{ KEY_DOWN, REQ_NEXT },
{ 'R', REQ_REFRESH },
+ { KEY_F(5), REQ_REFRESH },
+ { 'O', REQ_MAXIMIZE },
/* Cursor navigation */
{ 'k', REQ_MOVE_UP },
{ 'F', REQ_TOGGLE_REFS },
{ ':', REQ_PROMPT },
{ 'u', REQ_STATUS_UPDATE },
+ { '!', REQ_STATUS_REVERT },
{ 'M', REQ_STATUS_MERGE },
+ { '@', REQ_STAGE_NEXT },
{ ',', REQ_TREE_PARENT },
{ 'e', REQ_EDIT },
struct key {
- char *name;
+ const char *name;
int value;
};
return ERR;
}
-static char *
+static const char *
get_key_name(int key_value)
{
static char key_char[] = "'X'";
- char *seq = NULL;
+ const char *seq = NULL;
int key;
for (key = 0; key < ARRAY_SIZE(key_table); key++)
seq = key_char;
}
- return seq ? seq : "'?'";
+ return seq ? seq : "(no key)";
}
-static char *
+static const char *
get_key(enum request request)
{
static char buf[BUFSIZ];
static size_t run_requests;
static enum request
-add_run_request(enum keymap keymap, int key, int argc, char **argv)
+add_run_request(enum keymap keymap, int key, int argc, const char **argv)
{
- struct run_request *tmp;
- struct run_request req = { keymap, key };
+ struct run_request *req;
+ char cmd[SIZEOF_STR];
size_t bufpos;
for (bufpos = 0; argc > 0; argc--, argv++)
- if (!string_format_from(req.cmd, &bufpos, "%s ", *argv))
+ if (!string_format_from(cmd, &bufpos, "%s ", *argv))
return REQ_NONE;
- req.cmd[bufpos - 1] = 0;
-
- tmp = realloc(run_request, (run_requests + 1) * sizeof(*run_request));
- if (!tmp)
+ req = realloc(run_request, (run_requests + 1) * sizeof(*run_request));
+ if (!req)
return REQ_NONE;
- run_request = tmp;
- run_request[run_requests++] = req;
+ run_request = req;
+ req = &run_request[run_requests++];
+ string_copy(req->cmd, cmd);
+ req->keymap = keymap;
+ req->key = key;
return REQ_NONE + run_requests;
}
struct {
enum keymap keymap;
int key;
- char *argv[1];
+ const char *argv[1];
} reqs[] = {
{ KEYMAP_MAIN, 'C', { "git cherry-pick %(commit)" } },
{ KEYMAP_GENERIC, 'G', { "git gc" } },
static int config_lineno;
static bool config_errors;
-static char *config_msg;
+static const char *config_msg;
/* Wants: object fgcolor bgcolor [attr] */
static int
-option_color_command(int argc, char *argv[])
+option_color_command(int argc, const char *argv[])
{
struct line_info *info;
return ERR;
}
- info = get_line_info(argv[0], strlen(argv[0]));
+ info = get_line_info(argv[0]);
if (!info) {
- config_msg = "Unknown color name";
- return ERR;
+ if (!string_enum_compare(argv[0], "main-delim", strlen("main-delim"))) {
+ info = get_line_info("delimiter");
+
+ } else if (!string_enum_compare(argv[0], "main-date", strlen("main-date"))) {
+ info = get_line_info("date");
+
+ } else {
+ config_msg = "Unknown color name";
+ return ERR;
+ }
}
if (set_color(&info->fg, argv[1]) == ERR ||
!strcmp(s, "yes")) ? TRUE : FALSE;
}
+static int
+parse_int(const char *s, int default_value, int min, int max)
+{
+ int value = atoi(s);
+
+ return (value < min || value > max) ? default_value : value;
+}
+
/* Wants: name = value */
static int
-option_set_command(int argc, char *argv[])
+option_set_command(int argc, const char *argv[])
{
if (argc != 3) {
config_msg = "Wrong number of arguments given to set command";
return OK;
}
+ if (!strcmp(argv[0], "line-graphics")) {
+ opt_line_graphics = parse_bool(argv[2]);
+ return OK;
+ }
+
if (!strcmp(argv[0], "line-number-interval")) {
- opt_num_interval = atoi(argv[2]);
+ opt_num_interval = parse_int(argv[2], opt_num_interval, 1, 1024);
+ return OK;
+ }
+
+ if (!strcmp(argv[0], "author-width")) {
+ opt_author_cols = parse_int(argv[2], opt_author_cols, 0, 1024);
return OK;
}
if (!strcmp(argv[0], "tab-size")) {
- opt_tab_size = atoi(argv[2]);
+ opt_tab_size = parse_int(argv[2], opt_tab_size, 1, 1024);
return OK;
}
if (!strcmp(argv[0], "commit-encoding")) {
- char *arg = argv[2];
- int delimiter = *arg;
- int i;
+ const char *arg = argv[2];
+ int arglen = strlen(arg);
- switch (delimiter) {
+ switch (arg[0]) {
case '"':
case '\'':
- for (arg++, i = 0; arg[i]; i++)
- if (arg[i] == delimiter) {
- arg[i] = 0;
- break;
- }
+ if (arglen == 1 || arg[arglen - 1] != arg[0]) {
+ config_msg = "Unmatched quotation";
+ return ERR;
+ }
+ arg += 1; arglen -= 2;
default:
string_ncopy(opt_encoding, arg, strlen(arg));
return OK;
/* Wants: mode request key */
static int
-option_bind_command(int argc, char *argv[])
+option_bind_command(int argc, const char *argv[])
{
enum request request;
int keymap;
}
static int
-set_option(char *opt, char *value)
+set_option(const char *opt, char *value)
{
- char *argv[16];
+ const char *argv[SIZEOF_ARG];
int valuelen;
int argc = 0;
static int
load_options(void)
{
- char *home = getenv("HOME");
- char *tigrc_user = getenv("TIGRC_USER");
- char *tigrc_system = getenv("TIGRC_SYSTEM");
+ const char *home = getenv("HOME");
+ const char *tigrc_user = getenv("TIGRC_USER");
+ const char *tigrc_system = getenv("TIGRC_SYSTEM");
char buf[SIZEOF_STR];
add_builtin_run_requests();
struct view_ops *ops; /* View operations */
enum keymap keymap; /* What keymap does this view have */
+ bool git_dir; /* Whether the view requires a git directory. */
char cmd[SIZEOF_STR]; /* Command buffer */
char ref[SIZEOF_REF]; /* Hovered commit reference */
size_t line_size; /* Total number of used lines */
unsigned int digits; /* Number of digits in the lines member. */
+ /* Drawing */
+ struct line *curline; /* Line currently being drawn. */
+ enum line_type curtype; /* Attribute currently used for drawing. */
+ unsigned long col; /* Column when drawing. */
+
/* Loading */
FILE *pipe;
time_t start_time;
/* 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);
+ bool (*draw)(struct view *view, struct line *line, unsigned int lineno);
/* Depending on view handle a special requests. */
enum request (*request)(struct view *view, enum request request, struct line *line);
/* Search for regex in a line. */
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 blob_ops;
static struct view_ops help_ops;
-static struct view_ops status_ops;
+static struct view_ops log_ops;
+static struct view_ops main_ops;
+static struct view_ops pager_ops;
static struct view_ops stage_ops;
+static struct view_ops status_ops;
+static struct view_ops tree_ops;
-#define VIEW_STR(name, cmd, env, ref, ops, map) \
- { name, cmd, #env, ref, ops, map}
+#define VIEW_STR(name, cmd, env, ref, ops, map, git) \
+ { name, cmd, #env, ref, ops, map, git }
-#define VIEW_(id, name, ops, ref) \
- VIEW_STR(name, TIG_##id##_CMD, TIG_##id##_CMD, ref, ops, KEYMAP_##id)
+#define VIEW_(id, name, ops, git, ref) \
+ VIEW_STR(name, TIG_##id##_CMD, TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
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, ""),
+ VIEW_(MAIN, "main", &main_ops, TRUE, ref_head),
+ VIEW_(DIFF, "diff", &pager_ops, TRUE, ref_commit),
+ VIEW_(LOG, "log", &log_ops, TRUE, ref_head),
+ VIEW_(TREE, "tree", &tree_ops, TRUE, ref_commit),
+ VIEW_(BLOB, "blob", &blob_ops, TRUE, ref_blob),
+ VIEW_(BLAME, "blame", &blame_ops, TRUE, ref_commit),
+ VIEW_(HELP, "help", &help_ops, FALSE, ""),
+ VIEW_(PAGER, "pager", &pager_ops, FALSE, "stdin"),
+ VIEW_(STATUS, "status", &status_ops, TRUE, ""),
+ VIEW_(STAGE, "stage", &stage_ops, TRUE, ""),
};
-#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
+#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
+#define VIEW_REQ(view) ((view) - views + REQ_OFFSET + 1)
#define foreach_view(view, i) \
for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
#define view_is_displayed(view) \
(view == display[0] || view == display[1])
+
+enum line_graphic {
+ LINE_GRAPHIC_VLINE
+};
+
+static int line_graphics[] = {
+ /* LINE_GRAPHIC_VLINE: */ '|'
+};
+
+static inline void
+set_view_attr(struct view *view, enum line_type type)
+{
+ if (!view->curline->selected && view->curtype != type) {
+ wattrset(view->win, get_line_attr(type));
+ wchgat(view->win, -1, 0, type, NULL);
+ view->curtype = type;
+ }
+}
+
static int
-draw_text(struct view *view, const char *string, int max_len,
- bool use_tilde, int tilde_attr)
+draw_chars(struct view *view, enum line_type type, const char *string,
+ int max_len, bool use_tilde)
{
int len = 0;
+ int col = 0;
int trimmed = FALSE;
if (max_len <= 0)
return 0;
if (opt_utf8) {
- len = utf8_length(string, max_len, &trimmed, use_tilde);
+ len = utf8_length(string, &col, max_len, &trimmed, use_tilde);
} else {
- len = strlen(string);
+ col = len = strlen(string);
if (len > max_len) {
if (use_tilde) {
max_len -= 1;
}
- len = max_len;
+ col = len = max_len;
trimmed = TRUE;
}
}
+ set_view_attr(view, type);
waddnstr(view->win, string, len);
if (trimmed && use_tilde) {
- if (tilde_attr != -1)
- wattrset(view->win, tilde_attr);
+ set_view_attr(view, LINE_DELIMITER);
waddch(view->win, '~');
- len++;
+ col++;
+ }
+
+ return col;
+}
+
+static int
+draw_space(struct view *view, enum line_type type, int max, int spaces)
+{
+ static char space[] = " ";
+ int col = 0;
+
+ spaces = MIN(max, spaces);
+
+ while (spaces > 0) {
+ int len = MIN(spaces, sizeof(space) - 1);
+
+ col += draw_chars(view, type, space, spaces, FALSE);
+ spaces -= len;
+ }
+
+ return col;
+}
+
+static bool
+draw_lineno(struct view *view, unsigned int lineno)
+{
+ char number[10];
+ int digits3 = view->digits < 3 ? 3 : view->digits;
+ int max_number = MIN(digits3, STRING_SIZE(number));
+ int max = view->width - view->col;
+ int col;
+
+ if (max < max_number)
+ max_number = max;
+
+ lineno += view->offset + 1;
+ if (lineno == 1 || (lineno % opt_num_interval) == 0) {
+ static char fmt[] = "%1ld";
+
+ if (view->digits <= 9)
+ fmt[1] = '0' + digits3;
+
+ if (!string_format(number, fmt, lineno))
+ number[0] = 0;
+ col = draw_chars(view, LINE_LINE_NUMBER, number, max_number, TRUE);
+ } else {
+ col = draw_space(view, LINE_LINE_NUMBER, max_number, max_number);
+ }
+
+ if (col < max) {
+ set_view_attr(view, LINE_DEFAULT);
+ waddch(view->win, line_graphics[LINE_GRAPHIC_VLINE]);
+ col++;
+ }
+
+ if (col < max)
+ col += draw_space(view, LINE_DEFAULT, max - col, 1);
+ view->col += col;
+
+ return view->width - view->col <= 0;
+}
+
+static bool
+draw_text(struct view *view, enum line_type type, const char *string, bool trim)
+{
+ view->col += draw_chars(view, type, string, view->width - view->col, trim);
+ return view->width - view->col <= 0;
+}
+
+static bool
+draw_graphic(struct view *view, enum line_type type, chtype graphic[], size_t size)
+{
+ int max = view->width - view->col;
+ int i;
+
+ if (max < size)
+ size = max;
+
+ set_view_attr(view, type);
+ /* Using waddch() instead of waddnstr() ensures that
+ * they'll be rendered correctly for the cursor line. */
+ for (i = 0; i < size; i++)
+ waddch(view->win, graphic[i]);
+
+ view->col += size;
+ if (size < max) {
+ waddch(view->win, ' ');
+ view->col++;
}
- return len;
+ return view->width - view->col <= 0;
+}
+
+static bool
+draw_field(struct view *view, enum line_type type, const char *text, int len, bool trim)
+{
+ int max = MIN(view->width - view->col, len);
+ int col;
+
+ if (text)
+ col = draw_chars(view, type, text, max - 1, trim);
+ else
+ col = draw_space(view, type, max - 1, max - 1);
+
+ view->col += col + draw_space(view, LINE_DEFAULT, max - col, max - col);
+ return view->width - view->col <= 0;
+}
+
+static bool
+draw_date(struct view *view, struct tm *time)
+{
+ char buf[DATE_COLS];
+ char *date;
+ int timelen = 0;
+
+ if (time)
+ timelen = strftime(buf, sizeof(buf), DATE_FORMAT, time);
+ date = timelen ? buf : NULL;
+
+ return draw_field(view, LINE_DATE, date, DATE_COLS, FALSE);
}
static bool
line = &view->line[view->offset + lineno];
+ wmove(view->win, lineno, 0);
+ view->col = 0;
+ view->curline = line;
+ view->curtype = LINE_NONE;
+ line->selected = FALSE;
+
if (selected) {
+ set_view_attr(view, LINE_CURSOR);
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);
+ draw_ok = view->ops->draw(view, line, lineno);
scrollok(view->win, TRUE);
return draw_ok;
*/
static void
-end_update(struct view *view)
+reset_view(struct view *view)
+{
+ int i;
+
+ for (i = 0; i < view->lines; i++)
+ free(view->line[i].data);
+ free(view->line);
+
+ view->line = NULL;
+ view->offset = 0;
+ view->lines = 0;
+ view->lineno = 0;
+ view->line_size = 0;
+ view->line_alloc = 0;
+ view->vid[0] = 0;
+}
+
+static void
+end_update(struct view *view, bool force)
{
if (!view->pipe)
return;
+ while (!view->ops->read(view, NULL))
+ if (!force)
+ return;
set_nonblocking_input(FALSE);
if (view->pipe == stdin)
fclose(view->pipe);
}
static bool
-begin_update(struct view *view)
+begin_update(struct view *view, bool refresh)
{
- if (view->pipe)
- end_update(view);
-
if (opt_cmd[0]) {
string_copy(view->cmd, opt_cmd);
opt_cmd[0] = 0;
if (!string_format(view->cmd, format, view->id, path))
return FALSE;
- } else {
+ } else if (!refresh) {
const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
const char *id = view->id;
return FALSE;
set_nonblocking_input(TRUE);
-
- view->offset = 0;
- view->lines = 0;
- view->lineno = 0;
+ reset_view(view);
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;
}
}
- if (!view_is_displayed(view))
- goto check_pipe;
+ if (ferror(view->pipe) && errno != 0) {
+ report("Failed to read: %s", strerror(errno));
+ end_update(view, TRUE);
+
+ } else if (feof(view->pipe)) {
+ report("");
+ end_update(view, FALSE);
+ }
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
/* 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);
+ end_update(view, TRUE);
return FALSE;
}
}
static struct line *
-add_line_text(struct view *view, char *data, enum line_type type)
+add_line_text(struct view *view, const char *text, enum line_type type)
{
- if (data)
- data = strdup(data);
+ char *data = text ? strdup(text) : NULL;
return data ? add_line_data(view, data, type) : NULL;
}
OPEN_SPLIT = 1, /* Split current view. */
OPEN_BACKGROUNDED = 2, /* Backgrounded. */
OPEN_RELOAD = 4, /* Reload view even if it is the current. */
+ OPEN_NOMAXIMIZE = 8, /* Do not maximize the current view. */
+ OPEN_REFRESH = 16, /* Refresh view using previous command. */
};
static void
{
bool backgrounded = !!(flags & OPEN_BACKGROUNDED);
bool split = !!(flags & OPEN_SPLIT);
- bool reload = !!(flags & OPEN_RELOAD);
+ bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH));
+ bool nomaximize = !!(flags & (OPEN_NOMAXIMIZE | OPEN_REFRESH));
struct view *view = VIEW(request);
int nviews = displayed_views();
struct view *base_view = display[0];
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);
+ if (view->git_dir && !opt_git_dir[0]) {
+ report("The %s view is disabled in pager view", view->name);
return;
}
display[1] = view;
if (!backgrounded)
current_view = 1;
- } else {
+ } else if (!nomaximize) {
/* Maximize the current view. */
memset(display, 0, sizeof(display));
current_view = 0;
(nviews == 1 && base_view != display[0]))
resize_display();
+ if (view->pipe)
+ end_update(view, TRUE);
+
+ 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, flags & OPEN_REFRESH)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+
if (split && prev->lineno - prev->offset >= prev->height) {
/* Take the title line into account. */
int lines = prev->lineno - prev->offset - prev->height + 1;
if (view->pipe && view->lines == 0) {
/* Clear the old view and let the incremental updating refill
* the screen. */
- wclear(view->win);
+ werase(view->win);
report("");
- } else {
+ } else if (view_is_displayed(view)) {
redraw_view(view);
report("");
}
update_view_title(view);
}
+static bool
+run_confirm(const char *cmd, const char *prompt)
+{
+ bool confirmation = prompt_yesno(prompt);
+
+ if (confirmation)
+ system(cmd);
+
+ return confirmation;
+}
+
static void
open_external_viewer(const char *cmd)
{
endwin(); /* restore original tty modes */
system(cmd);
fprintf(stderr, "Press Enter to continue");
- getc(stdin);
+ getc(opt_tty);
reset_prog_mode();
redraw_display();
}
{
char cmd[SIZEOF_STR];
char file_sq[SIZEOF_STR];
- char *editor;
+ const char *editor;
char *prefix = from_root ? opt_cdup : "";
editor = getenv("GIT_EDITOR");
if (request > REQ_NONE) {
open_run_request(request);
- return TRUE;
+ /* FIXME: When all views can refresh always do this. */
+ if (view == VIEW(REQ_VIEW_STATUS) ||
+ view == VIEW(REQ_VIEW_MAIN) ||
+ view == VIEW(REQ_VIEW_LOG) ||
+ view == VIEW(REQ_VIEW_STAGE))
+ request = REQ_REFRESH;
+ else
+ return TRUE;
}
if (view && view->lines) {
report("Refreshing is not yet supported for the %s view", view->name);
break;
+ case REQ_MAXIMIZE:
+ if (displayed_views() == 2)
+ open_view(view, VIEW_REQ(view), OPEN_DEFAULT);
+ break;
+
case REQ_TOGGLE_LINENO:
opt_line_number = !opt_line_number;
redraw_display();
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);
view = &views[i];
if (view->pipe)
report("Stopped loading the %s view", view->name),
- end_update(view);
+ end_update(view, TRUE);
}
break;
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
view->parent = view;
resize_display();
redraw_display();
+ report("");
break;
}
/* Fall-through */
return FALSE;
default:
- /* An unknown key will show most commonly used commands. */
report("Unknown key, press 'h' for help");
return TRUE;
}
*/
static bool
-pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+pager_draw(struct view *view, struct line *line, unsigned int lineno)
{
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 {
- int tilde_attr = get_line_attr(LINE_MAIN_DELIM);
-
- draw_text(view, text, view->width, TRUE, tilde_attr);
- }
+ if (opt_line_number && draw_lineno(view, lineno))
+ return TRUE;
+ draw_text(view, line->type, text, TRUE);
return TRUE;
}
static bool
-add_describe_ref(char *buf, size_t *bufpos, char *commit_id, const char *sep)
+add_describe_ref(char *buf, size_t *bufpos, const char *commit_id, const char *sep)
{
char refbuf[SIZEOF_STR];
char *ref = NULL;
do {
struct ref *ref = refs[refpos];
- char *fmt = ref->tag ? "%s[%s]" :
- ref->remote ? "%s<%s>" : "%s%s";
+ const char *fmt = ref->tag ? "%s[%s]" :
+ ref->remote ? "%s<%s>" : "%s%s";
if (!string_format_from(buf, &bufpos, fmt, sep, ref->name))
return;
pager_select,
};
+static enum request
+log_request(struct view *view, enum request request, struct line *line)
+{
+ switch (request) {
+ case REQ_REFRESH:
+ load_refs();
+ open_view(view, REQ_VIEW_LOG, OPEN_REFRESH);
+ return REQ_NONE;
+ default:
+ return pager_request(view, request, line);
+ }
+}
+
+static struct view_ops log_ops = {
+ "line",
+ NULL,
+ pager_read,
+ pager_draw,
+ log_request,
+ pager_grep,
+ pager_select,
+};
+
/*
* Help backend
add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
for (i = 0; i < ARRAY_SIZE(req_info); i++) {
- char *key;
+ const char *key;
if (req_info[i].request == REQ_NONE)
continue;
for (i = 0; i < run_requests; i++) {
struct run_request *req = get_run_request(REQ_NONE + i + 1);
- char *key;
+ const char *key;
if (!req)
continue;
}
static void
-push_tree_stack_entry(char *name, unsigned long lineno)
+push_tree_stack_entry(const char *name, unsigned long lineno)
{
struct tree_stack_entry *entry = calloc(1, sizeof(*entry));
size_t pathlen = strlen(opt_path);
#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)
+tree_compare_entry(enum line_type type1, const char *name1,
+ enum line_type type2, const char *name2)
{
if (type1 != type2) {
if (type1 == LINE_TREE_DIR)
return strcmp(name1, name2);
}
-static char *
+static const char *
tree_path(struct line *line)
{
- char *path = line->data;
+ const char *path = line->data;
return path + SIZEOF_TREE_ATTR;
}
/* Skip "Directory ..." and ".." line. */
for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
struct line *line = &view->line[pos];
- char *path1 = tree_path(line);
+ const char *path1 = tree_path(line);
char *path2 = text + SIZEOF_TREE_ATTR;
int cmp = tree_compare_entry(line->type, path1, type, path2);
enum open_flags flags;
if (request == REQ_VIEW_BLAME) {
- char *filename = tree_path(line);
+ const char *filename = tree_path(line);
if (line->type == LINE_TREE_DIR) {
report("Cannot show blame for directory %s", opt_path);
pop_tree_stack_entry();
} else {
- char *basename = tree_path(line);
+ const char *basename = tree_path(line);
push_tree_stack_entry(basename, view->lineno);
}
};
#define BLAME_CAT_FILE_CMD "git cat-file blob %s:%s"
-#define BLAME_INCREMENTAL_CMD "git blame --incremental %s %s"
+#define BLAME_INCREMENTAL_CMD "git blame --incremental %s -- %s"
static bool
blame_open(struct view *view)
if (!string_format(view->cmd, BLAME_INCREMENTAL_CMD, ref, path))
return FALSE;
+ reset_view(view);
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 bool
-parse_number(char **posref, size_t *number, size_t min, size_t max)
+parse_number(const char **posref, size_t *number, size_t min, size_t max)
{
- char *pos = *posref;
+ const char *pos = *posref;
*posref = NULL;
pos = strchr(pos + 1, ' ');
}
static struct blame_commit *
-parse_blame_commit(struct view *view, char *text, int *blamed)
+parse_blame_commit(struct view *view, const char *text, int *blamed)
{
struct blame_commit *commit;
struct blame *blame;
- char *pos = text + SIZEOF_REV - 1;
+ const char *pos = text + SIZEOF_REV - 1;
size_t lineno;
size_t group;
blame = line->data;
blame->commit = commit;
+ blame->header = !group;
line->dirty = 1;
}
- blame->header = 1;
return commit;
}
static bool
-blame_read_file(struct view *view, char *line)
+blame_read_file(struct view *view, const char *line)
{
if (!line) {
FILE *pipe = NULL;
if (view->lines > 0)
pipe = popen(view->cmd, "r");
+ else if (!view->parent)
+ die("No blame exist for %s", view->vid);
view->cmd[0] = 0;
if (!pipe) {
report("Failed to load blame data");
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;
+ return add_line_data(view, blame, LINE_BLAME_ID) != NULL;
}
}
}
static bool
-blame_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+blame_draw(struct view *view, struct line *line, unsigned int lineno)
{
- int tilde_attr = -1;
struct blame *blame = line->data;
- int col = 0;
+ struct tm *time = NULL;
+ const char *id = NULL, *author = NULL;
- 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);
- tilde_attr = get_line_attr(LINE_MAIN_DELIM);
- }
-
- 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, tilde_attr);
- draw_text(view, " ", view->width - col - n, FALSE, tilde_attr);
- }
-
- 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, tilde_attr);
- col += AUTHOR_COLS;
- if (col >= view->width)
- return TRUE;
- wmove(view->win, lineno, col);
+ if (blame->commit && *blame->commit->filename) {
+ id = blame->commit->id;
+ author = blame->commit->author;
+ time = &blame->commit->time;
}
- {
- 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, tilde_attr);
- if (col >= view->width)
- return TRUE;
- }
+ if (opt_date && draw_date(view, time))
+ return TRUE;
- if (!selected)
- wattrset(view->win, A_NORMAL);
+ if (opt_author &&
+ draw_field(view, LINE_MAIN_AUTHOR, author, opt_author_cols, TRUE))
+ return TRUE;
- if (col >= view->width)
+ if (draw_field(view, LINE_BLAME_ID, id, ID_COLS, FALSE))
return TRUE;
- waddch(view->win, ACS_VLINE);
- col++;
- if (col >= view->width)
+
+ if (draw_lineno(view, lineno))
return TRUE;
- waddch(view->win, ' ');
- col++;
- col += draw_text(view, blame->text, view->width - col, TRUE, tilde_attr);
+ draw_text(view, LINE_DEFAULT, blame->text, TRUE);
return TRUE;
}
break;
}
- if (!strcmp(blame->commit->id, "0000000000000000000000000000000000000000")) {
+ if (!strcmp(blame->commit->id, NULL_ID)) {
char path[SIZEOF_STR];
if (sq_quote(path, 0, view->vid) >= sizeof(path))
struct blame_commit *commit = blame->commit;
regmatch_t pmatch;
-#define MATCH(text) \
- (*text && regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+#define MATCH(text, on) \
+ (on && *text && regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
if (commit) {
char buf[DATE_COLS + 1];
- if (MATCH(commit->title) ||
- MATCH(commit->author) ||
- MATCH(commit->id))
+ if (MATCH(commit->title, 1) ||
+ MATCH(commit->author, opt_author) ||
+ MATCH(commit->id, opt_date))
return TRUE;
if (strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time) &&
- MATCH(buf))
+ MATCH(buf, 1))
return TRUE;
}
- return MATCH(blame->text);
+ return MATCH(blame->text, 1);
#undef MATCH
}
if (!commit)
return;
- if (!strcmp(commit->id, "0000000000000000000000000000000000000000"))
+ if (!strcmp(commit->id, NULL_ID))
string_ncopy(ref_commit, "HEAD", 4);
else
string_copy_rev(ref_commit, commit->id);
} new;
};
+static char status_onbranch[SIZEOF_STR];
static struct status stage_status;
static enum line_type stage_line_type;
+static size_t stage_chunks;
+static int *stage_chunk;
+
+/* This should work even for the "On branch" line. */
+static inline bool
+status_has_none(struct view *view, struct line *line)
+{
+ return line < view->line + view->lines && !line[1].data;
+}
/* 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)
+status_get_diff(struct status *file, const 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;
+ const char *old_mode = buf + 1;
+ const char *new_mode = buf + 8;
+ const char *old_rev = buf + 15;
+ const char *new_rev = buf + 56;
+ const char *status = buf + 97;
if (bufsize < 99 ||
old_mode[-1] != ':' ||
}
static bool
-status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
+status_run(struct view *view, const char cmd[], char status, enum line_type type)
{
struct status *file = NULL;
struct status *unmerged = NULL;
@@ -3797,8 +3921,10 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
}
/* Parse diff info part. */
- if (!diff) {
- file->status = '?';
+ 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))
#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"
+ "git ls-files -z --others --exclude-standard"
+#define STATUS_LIST_NO_HEAD_CMD \
+ "git ls-files -z --cached --exclude-standard"
#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 cmd[SIZEOF_STR];
unsigned long prev_lineno = view->lineno;
- 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;
+ reset_view(view);
- if (!realloc_lines(view, view->line_size + 6))
+ if (!realloc_lines(view, view->line_size + 7))
return FALSE;
- if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+ 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;
- string_copy(cmd, STATUS_LIST_OTHER_CMD);
-
- if (stat(exclude, &statbuf) >= 0) {
- size_t cmdsize = strlen(cmd);
+ system("git update-index -q --refresh >/dev/null 2>/dev/null");
- if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") ||
- sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd))
+ if (opt_no_head) {
+ if (!status_run(view, STATUS_LIST_NO_HEAD_CMD, 'A', LINE_STAT_STAGED))
return FALSE;
+ } else if (!status_run(view, STATUS_DIFF_INDEX_CMD, 0, LINE_STAT_STAGED)) {
+ return FALSE;
}
- system("git update-index -q --refresh");
-
- if (!status_run(view, STATUS_DIFF_INDEX_CMD, TRUE, LINE_STAT_STAGED) ||
- !status_run(view, STATUS_DIFF_FILES_CMD, TRUE, LINE_STAT_UNSTAGED) ||
- !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED))
+ if (!status_run(view, STATUS_DIFF_FILES_CMD, 0, LINE_STAT_UNSTAGED) ||
+ !status_run(view, STATUS_LIST_OTHER_CMD, '?', LINE_STAT_UNTRACKED))
return FALSE;
/* If all went well restore the previous line number to stay in
- * the context. */
+ * 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++;
+ while (prev_lineno > 0 && !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 = view->lines - 1;
+ view->lineno = 1;
+
+ if (view->lineno < view->offset)
+ view->offset = view->lineno;
+ else if (view->offset + view->height <= view->lineno)
+ view->offset = view->lineno - view->height + 1;
return TRUE;
}
static bool
-status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+status_draw(struct view *view, struct line *line, unsigned int lineno)
{
struct status *status = line->data;
- int tilde_attr = get_line_attr(LINE_MAIN_DELIM);
-
- wmove(view->win, lineno, 0);
-
- if (selected) {
- wattrset(view->win, get_line_attr(LINE_CURSOR));
- wchgat(view->win, -1, 0, LINE_CURSOR, NULL);
- tilde_attr = -1;
-
- } 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));
- }
+ enum line_type type;
+ const char *text;
if (!status) {
- char *text;
-
switch (line->type) {
case LINE_STAT_STAGED:
+ type = LINE_STAT_SECTION;
text = "Changes to be committed:";
break;
case LINE_STAT_UNSTAGED:
+ type = LINE_STAT_SECTION;
text = "Changed but not updated:";
break;
case LINE_STAT_UNTRACKED:
+ type = LINE_STAT_SECTION;
text = "Untracked files:";
break;
case LINE_STAT_NONE:
+ type = LINE_DEFAULT;
text = " (no files)";
break;
+ case LINE_STAT_HEAD:
+ type = LINE_STAT_HEAD;
+ text = status_onbranch;
+ break;
+
default:
return FALSE;
}
+ } else {
+ static char buf[] = { '?', ' ', ' ', ' ', 0 };
- draw_text(view, text, view->width, TRUE, tilde_attr);
- return TRUE;
+ buf[0] = status->status;
+ if (draw_text(view, line->type, buf, TRUE))
+ return TRUE;
+ type = LINE_DEFAULT;
+ text = status->new.name;
}
- 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, tilde_attr);
+ draw_text(view, type, text, TRUE);
return TRUE;
}
struct status *status = line->data;
char oldpath[SIZEOF_STR] = "";
char newpath[SIZEOF_STR] = "";
- char *info;
+ const char *info;
size_t cmdsize = 0;
+ enum open_flags split;
if (line->type == LINE_STAT_NONE ||
(!status && line[1].type == LINE_STAT_NONE)) {
switch (line->type) {
case LINE_STAT_STAGED:
- if (!string_format_from(opt_cmd, &cmdsize,
- STATUS_DIFF_INDEX_SHOW_CMD, oldpath, newpath))
- return REQ_QUIT;
+ 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
if (opt_pipe)
return REQ_QUIT;
-
if (!status) {
report("No file to show");
return REQ_NONE;
info = "Untracked file %s";
break;
+ case LINE_STAT_HEAD:
+ return REQ_NONE;
+
default:
die("line type %d not handled in switch", line->type);
}
- open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT);
+ split = view_is_displayed(view) ? OPEN_SPLIT : 0;
+ open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | split);
if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
if (status) {
stage_status = *status;
}
stage_line_type = line->type;
+ stage_chunks = 0;
string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.new.name);
}
return REQ_NONE;
}
-
static bool
-status_update_file(struct view *view, struct status *status, enum line_type type)
+status_exists(struct status *status, enum line_type type)
+{
+ struct view *view = VIEW(REQ_VIEW_STATUS);
+ struct line *line;
+
+ for (line = view->line; line < view->line + view->lines; line++) {
+ struct status *pos = line->data;
+
+ if (line->type == type && pos &&
+ !strcmp(status->new.name, pos->new.name))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+static FILE *
+status_update_prepare(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;
if (opt_cdup[0] &&
type != LINE_STAT_UNTRACKED &&
!string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
- return FALSE;
+ return NULL;
+
+ switch (type) {
+ case LINE_STAT_STAGED:
+ string_add(cmd, cmdsize, "git update-index -z --index-info");
+ break;
+
+ case LINE_STAT_UNSTAGED:
+ case LINE_STAT_UNTRACKED:
+ string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
+ break;
+
+ default:
+ die("line type %d not handled in switch", type);
+ }
+
+ return popen(cmd, "w");
+}
+
+static bool
+status_update_write(FILE *pipe, struct status *status, enum line_type type)
+{
+ char buf[SIZEOF_STR];
+ size_t bufsize = 0;
+ size_t written = 0;
switch (type) {
case LINE_STAT_STAGED:
if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c",
- status->old.mode,
+ status->old.mode,
status->old.rev,
status->old.name, 0))
return FALSE;
-
- 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;
default:
die("line type %d not handled in switch", type);
}
- pipe = popen(cmd, "w");
- if (!pipe)
- return FALSE;
-
while (!ferror(pipe) && written < bufsize) {
written += fwrite(buf + written, 1, bufsize - written, pipe);
}
+ return written == bufsize;
+}
+
+static bool
+status_update_file(struct status *status, enum line_type type)
+{
+ FILE *pipe = status_update_prepare(type);
+ bool result;
+
+ if (!pipe)
+ return FALSE;
+
+ result = status_update_write(pipe, status, type);
pclose(pipe);
+ return result;
+}
+
+static bool
+status_update_files(struct view *view, struct line *line)
+{
+ FILE *pipe = status_update_prepare(line->type);
+ bool result = TRUE;
+ struct line *pos = view->line + view->lines;
+ int files = 0;
+ int file, done;
- if (written != bufsize)
+ if (!pipe)
return FALSE;
- return TRUE;
+ for (pos = line; pos < view->line + view->lines && pos->data; pos++)
+ files++;
+
+ for (file = 0, done = 0; result && file < files; line++, file++) {
+ int almost_done = file * 100 / files;
+
+ if (almost_done > done) {
+ done = almost_done;
+ string_format(view->ref, "updating file %u of %u (%d%% done)",
+ file, files, done);
+ update_view_title(view);
+ }
+ result = status_update_write(pipe, line->data, line->type);
+ }
+
+ pclose(pipe);
+ return result;
}
-static void
+static bool
status_update(struct view *view)
{
struct line *line = &view->line[view->lineno];
assert(view->lines);
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");
+ /* This should work even for the "On branch" line. */
+ if (line < view->line + view->lines && !line[1].data) {
+ report("Nothing to update");
+ return FALSE;
}
- if (!line[-1].data) {
- report("Nothing to update");
- return;
+ if (!status_update_files(view, line + 1)) {
+ report("Failed to update file status");
+ return FALSE;
}
- } else if (!status_update_file(view, line->data, line->type)) {
+ } else if (!status_update_file(line->data, line->type)) {
report("Failed to update file status");
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static bool
+status_revert(struct status *status, enum line_type type, bool has_none)
+{
+ if (!status || type != LINE_STAT_UNSTAGED) {
+ if (type == LINE_STAT_STAGED) {
+ report("Cannot revert changes to staged files");
+ } else if (type == LINE_STAT_UNTRACKED) {
+ report("Cannot revert changes to untracked files");
+ } else if (has_none) {
+ report("Nothing to revert");
+ } else {
+ report("Cannot revert changes to multiple files");
+ }
+ return FALSE;
+
+ } else {
+ char cmd[SIZEOF_STR];
+ char file_sq[SIZEOF_STR];
+
+ if (sq_quote(file_sq, 0, status->old.name) >= sizeof(file_sq) ||
+ !string_format(cmd, "git checkout -- %s%s", opt_cdup, file_sq))
+ return FALSE;
+
+ return run_confirm(cmd, "Are you sure you want to overwrite any changes?");
}
}
switch (request) {
case REQ_STATUS_UPDATE:
- status_update(view);
+ if (!status_update(view))
+ return REQ_NONE;
+ break;
+
+ case REQ_STATUS_REVERT:
+ if (!status_revert(status, line->type, status_has_none(view, line)))
+ return REQ_NONE;
break;
case REQ_STATUS_MERGE:
{
struct status *status = line->data;
char file[SIZEOF_STR] = "all files";
- char *text;
- char *key;
+ const char *text;
+ const char *key;
if (status && !string_format(file, "'%s'", status->new.name))
return;
text = "Press %s to stage %s for addition";
break;
+ case LINE_STAT_HEAD:
case LINE_STAT_NONE:
text = "Nothing to update";
break;
return FALSE;
for (state = S_STATUS; state < S_END; state++) {
- char *text;
+ const char *text;
switch (state) {
case S_NAME: text = status->new.name; break;
static bool
stage_diff_line(FILE *pipe, struct line *line)
{
- char *buf = line->data;
+ const char *buf = line->data;
size_t bufsize = strlen(buf);
size_t written = 0;
return written == bufsize;
}
-static struct line *
-stage_diff_hdr(struct view *view, struct line *line)
+static bool
+stage_diff_write(FILE *pipe, struct line *line, struct line *end)
{
- int diff_hdr_dir = line->type == LINE_DIFF_CHUNK ? -1 : 1;
- struct line *diff_hdr;
-
- if (line->type == LINE_DIFF_CHUNK)
- diff_hdr = line - 1;
- else
- diff_hdr = view->line + 1;
+ while (line < end) {
+ if (!stage_diff_line(pipe, line++))
+ return FALSE;
+ if (line->type == LINE_DIFF_CHUNK ||
+ line->type == LINE_DIFF_HEADER)
+ break;
+ }
- while (diff_hdr > view->line && diff_hdr < view->line + view->lines) {
- if (diff_hdr->type == LINE_DIFF_HEADER)
- return diff_hdr;
+ return TRUE;
+}
- diff_hdr += diff_hdr_dir;
- }
+static struct line *
+stage_diff_find(struct view *view, struct line *line, enum line_type type)
+{
+ for (; view->line < line; line--)
+ if (line->type == type)
+ return line;
return NULL;
}
static bool
-stage_update_chunk(struct view *view, struct line *line)
+stage_apply_chunk(struct view *view, struct line *chunk, bool revert)
{
char cmd[SIZEOF_STR];
size_t cmdsize = 0;
- struct line *diff_hdr, *diff_chunk, *diff_end;
+ struct line *diff_hdr;
FILE *pipe;
- diff_hdr = stage_diff_hdr(view, line);
+ diff_hdr = stage_diff_find(view, chunk, LINE_DIFF_HEADER);
if (!diff_hdr)
return FALSE;
return FALSE;
if (!string_format_from(cmd, &cmdsize,
- "git apply --cached %s - && "
+ "git apply --whitespace=nowarn %s %s - && "
"git update-index -q --unmerged --refresh 2>/dev/null",
- stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
+ revert ? "" : "--cached",
+ revert || stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
return FALSE;
pipe = popen(cmd, "w");
if (!pipe)
return FALSE;
- diff_end = view->line + view->lines;
- if (line->type != LINE_DIFF_CHUNK) {
- diff_chunk = diff_hdr;
+ if (!stage_diff_write(pipe, diff_hdr, chunk) ||
+ !stage_diff_write(pipe, chunk, view->line + view->lines))
+ chunk = NULL;
- } 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;
+ pclose(pipe);
- default:
- diff_hdr++;
- continue;
- }
+ return chunk ? TRUE : FALSE;
+}
- if (!stage_diff_line(pipe, diff_hdr++)) {
- pclose(pipe);
- return FALSE;
- }
+static bool
+stage_update(struct view *view, struct line *line)
+{
+ struct line *chunk = NULL;
+
+ if (!opt_no_head && stage_line_type != LINE_STAT_UNTRACKED)
+ chunk = stage_diff_find(view, line, LINE_DIFF_CHUNK);
+
+ if (chunk) {
+ if (!stage_apply_chunk(view, chunk, FALSE)) {
+ report("Failed to apply chunk");
+ return FALSE;
}
- }
- while (diff_chunk < diff_end && stage_diff_line(pipe, diff_chunk))
- diff_chunk++;
+ } else if (!stage_status.status) {
+ view = VIEW(REQ_VIEW_STATUS);
- pclose(pipe);
+ for (line = view->line; line < view->line + view->lines; line++)
+ if (line->type == stage_line_type)
+ break;
- if (diff_chunk != diff_end)
+ if (!status_update_files(view, line + 1)) {
+ report("Failed to update files");
+ return FALSE;
+ }
+
+ } else if (!status_update_file(&stage_status, stage_line_type)) {
+ report("Failed to update file");
return FALSE;
+ }
return TRUE;
}
-static void
-stage_update(struct view *view, struct line *line)
+static bool
+stage_revert(struct view *view, struct line *line)
{
- if (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;
+ struct line *chunk = NULL;
+
+ if (!opt_no_head && stage_line_type == LINE_STAT_UNSTAGED)
+ chunk = stage_diff_find(view, line, LINE_DIFF_CHUNK);
+
+ if (chunk) {
+ if (!prompt_yesno("Are you sure you want to revert changes?"))
+ return FALSE;
+
+ if (!stage_apply_chunk(view, chunk, TRUE)) {
+ report("Failed to revert chunk");
+ return FALSE;
}
+ return TRUE;
- } else if (!status_update_file(view, &stage_status, stage_line_type)) {
- report("Failed to update file");
- return;
+ } else {
+ return status_revert(stage_status.status ? &stage_status : NULL,
+ stage_line_type, FALSE);
}
+}
- open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
- view = VIEW(REQ_VIEW_STATUS);
- if (view_is_displayed(view))
- status_enter(view, &view->line[view->lineno]);
+static void
+stage_next(struct view *view, struct line *line)
+{
+ int i;
+
+ if (!stage_chunks) {
+ static size_t alloc = 0;
+ int *tmp;
+
+ for (line = view->line; line < view->line + view->lines; line++) {
+ if (line->type != LINE_DIFF_CHUNK)
+ continue;
+
+ tmp = realloc_items(stage_chunk, &alloc,
+ stage_chunks, sizeof(*tmp));
+ if (!tmp) {
+ report("Allocation failure");
+ return;
+ }
+
+ stage_chunk = tmp;
+ stage_chunk[stage_chunks++] = line - view->line;
+ }
+ }
+
+ for (i = 0; i < stage_chunks; i++) {
+ if (stage_chunk[i] > view->lineno) {
+ do_scroll_view(view, stage_chunk[i] - view->lineno);
+ report("Chunk %d of %d", i + 1, stage_chunks);
+ return;
+ }
+ }
+
+ report("No next chunk found");
}
static enum request
{
switch (request) {
case REQ_STATUS_UPDATE:
- stage_update(view, line);
+ if (!stage_update(view, line))
+ return REQ_NONE;
+ break;
+
+ case REQ_STATUS_REVERT:
+ if (!stage_revert(view, line))
+ return REQ_NONE;
break;
+ case REQ_STAGE_NEXT:
+ if (stage_line_type == LINE_STAT_UNTRACKED) {
+ report("File is untracked; press %s to add",
+ get_key(REQ_STATUS_UPDATE));
+ return REQ_NONE;
+ }
+ stage_next(view, line);
+ return REQ_NONE;
+
case REQ_EDIT:
if (!stage_status.new.name[0])
return request;
open_editor(stage_status.status != '?', stage_status.new.name);
break;
+ case REQ_REFRESH:
+ /* Reload everything ... */
+ break;
+
case REQ_VIEW_BLAME:
if (stage_status.new.name[0]) {
string_copy(opt_file, stage_status.new.name);
return request;
case REQ_ENTER:
- pager_request(view, request, line);
- break;
+ return pager_request(view, request, line);
default:
return request;
}
+ open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD | OPEN_NOMAXIMIZE);
+
+ /* Check whether the staged entry still exists, and close the
+ * stage view if it doesn't. */
+ if (!status_exists(&stage_status, stage_line_type))
+ return REQ_VIEW_CLOSE;
+
+ if (stage_line_type == LINE_STAT_UNTRACKED)
+ opt_pipe = fopen(stage_status.new.name, "r");
+ open_view(view, REQ_VIEW_STAGE, OPEN_REFRESH);
+
return REQ_NONE;
}
commit->graph[commit->graph_size++] = symbol;
}
+static void
+clear_rev_graph(struct rev_graph *graph)
+{
+ graph->boundary = 0;
+ graph->size = graph->pos = 0;
+ graph->commit = NULL;
+ memset(graph->parents, 0, sizeof(*graph->parents));
+}
+
static void
done_rev_graph(struct rev_graph *graph)
{
}
}
- graph->size = graph->pos = 0;
- graph->commit = NULL;
- memset(graph->parents, 0, sizeof(*graph->parents));
+ clear_rev_graph(graph);
}
static void
-push_rev_graph(struct rev_graph *graph, char *parent)
+push_rev_graph(struct rev_graph *graph, const char *parent)
{
int i;
};
enum { DEFAULT, RSHARP, RDIAG, LDIAG };
static struct rev_filler fillers[] = {
- { ' ', REVGRAPH_LINE },
+ { ' ', '|' },
{ '`', '.' },
{ '\'', ' ' },
{ '/', ' ' },
struct rev_filler *filler;
size_t i;
+ if (opt_line_graphics)
+ fillers[DEFAULT].line = line_graphics[LINE_GRAPHIC_VLINE];
+
filler = &fillers[DEFAULT];
for (i = 0; i < graph->pos; i++) {
*/
static bool
-main_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+main_draw(struct view *view, struct line *line, unsigned int lineno)
{
- char buf[DATE_COLS + 1];
struct commit *commit = line->data;
- enum line_type type;
- int col = 0;
- size_t timelen;
- int tilde_attr;
- int space;
if (!*commit->author)
return FALSE;
- space = view->width;
- wmove(view->win, lineno, col);
-
- if (selected) {
- type = LINE_CURSOR;
- wattrset(view->win, get_line_attr(type));
- wchgat(view->win, -1, 0, type, NULL);
- tilde_attr = -1;
- } else {
- type = LINE_MAIN_COMMIT;
- wattrset(view->win, get_line_attr(LINE_MAIN_DATE));
- tilde_attr = get_line_attr(LINE_MAIN_DELIM);
- }
-
- if (opt_date) {
- int n;
-
- timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
- n = draw_text(view, buf, view->width - col, FALSE, tilde_attr);
- draw_text(view, " ", view->width - col - n, FALSE, tilde_attr);
-
- 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_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, tilde_attr);
- col += AUTHOR_COLS;
- if (col >= view->width)
- return TRUE;
- }
-
- 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_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]);
+ if (opt_date && draw_date(view, &commit->time))
+ return TRUE;
- col += commit->graph_size + 1;
- if (col >= view->width)
- return TRUE;
- waddch(view->win, ' ');
- }
- if (type != LINE_CURSOR)
- wattrset(view->win, A_NORMAL);
+ if (opt_author &&
+ draw_field(view, LINE_MAIN_AUTHOR, commit->author, opt_author_cols, TRUE))
+ return TRUE;
- wmove(view->win, lineno, col);
+ if (opt_rev_graph && commit->graph_size &&
+ draw_graphic(view, LINE_MAIN_REVGRAPH, commit->graph, commit->graph_size))
+ return TRUE;
if (opt_show_refs && commit->refs) {
size_t i = 0;
do {
- if (type == LINE_CURSOR)
- ;
+ enum line_type type;
+
+ if (commit->refs[i]->head)
+ type = LINE_MAIN_HEAD;
else if (commit->refs[i]->ltag)
- wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));
+ type = LINE_MAIN_LOCAL_TAG;
else if (commit->refs[i]->tag)
- wattrset(view->win, get_line_attr(LINE_MAIN_TAG));
+ type = LINE_MAIN_TAG;
+ else if (commit->refs[i]->tracked)
+ type = LINE_MAIN_TRACKED;
else if (commit->refs[i]->remote)
- wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE));
+ type = LINE_MAIN_REMOTE;
else
- wattrset(view->win, get_line_attr(LINE_MAIN_REF));
-
- col += draw_text(view, "[", view->width - col, TRUE, tilde_attr);
- col += draw_text(view, commit->refs[i]->name, view->width - col,
- TRUE, tilde_attr);
- col += draw_text(view, "]", view->width - col, TRUE, tilde_attr);
- if (type != LINE_CURSOR)
- wattrset(view->win, A_NORMAL);
- col += draw_text(view, " ", view->width - col, TRUE, tilde_attr);
- if (col >= view->width)
+ type = LINE_MAIN_REF;
+
+ if (draw_text(view, type, "[", TRUE) ||
+ draw_text(view, type, commit->refs[i]->name, TRUE) ||
+ draw_text(view, type, "]", TRUE))
+ return TRUE;
+
+ if (draw_text(view, LINE_DEFAULT, " ", TRUE))
return TRUE;
} while (commit->refs[i++]->next);
}
- if (type != LINE_CURSOR)
- wattrset(view->win, get_line_attr(type));
-
- draw_text(view, commit->title, view->width - col, TRUE, tilde_attr);
+ draw_text(view, LINE_DEFAULT, commit->title, TRUE);
return TRUE;
}
struct commit *commit;
if (!line) {
+ int i;
+
+ if (!view->lines && !view->parent)
+ die("No revisions match the given arguments.");
+ if (view->lines > 0) {
+ commit = view->line[view->lines - 1].data;
+ if (!*commit->author) {
+ view->lines--;
+ free(commit);
+ graph->commit = NULL;
+ }
+ }
update_rev_graph(graph);
+
+ for (i = 0; i < ARRAY_SIZE(graph_stacks); i++)
+ clear_rev_graph(&graph_stacks[i]);
return TRUE;
}
{
enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
- if (request == REQ_ENTER)
+ switch (request) {
+ case REQ_ENTER:
open_view(view, REQ_VIEW_DIFF, flags);
- else
+ break;
+ case REQ_REFRESH:
+ load_refs();
+ open_view(view, REQ_VIEW_MAIN, OPEN_REFRESH);
+ break;
+ default:
return request;
+ }
return REQ_NONE;
}
+static bool
+grep_refs(struct ref **refs, regex_t *regex)
+{
+ regmatch_t pmatch;
+ size_t i = 0;
+
+ if (!refs)
+ return FALSE;
+ do {
+ if (regexec(regex, refs[i]->name, 1, &pmatch, 0) != REG_NOMATCH)
+ return TRUE;
+ } while (refs[i++]->next);
+
+ return FALSE;
+}
+
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;
+ enum { S_TITLE, S_AUTHOR, S_DATE, S_REFS, S_END } state;
char buf[DATE_COLS + 1];
regmatch_t pmatch;
switch (state) {
case S_TITLE: text = commit->title; break;
- case S_AUTHOR: text = commit->author; break;
+ case S_AUTHOR:
+ if (!opt_author)
+ continue;
+ text = commit->author;
+ break;
case S_DATE:
+ if (!opt_date)
+ continue;
if (!strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time))
continue;
text = buf;
break;
-
+ case S_REFS:
+ if (!opt_show_refs)
+ continue;
+ if (grep_refs(commit->refs, view->regex) == TRUE)
+ return TRUE;
+ continue;
default:
return FALSE;
}
*
* 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 *trimmed, bool reserve)
+utf8_length(const char *string, int *width, size_t max_width, int *trimmed, bool reserve)
{
const char *start = string;
const char *end = strchr(string, '\0');
unsigned char last_bytes = 0;
- size_t width = 0;
+ size_t last_ucwidth = 0;
+ *width = 0;
*trimmed = 0;
while (string < end) {
@@ -5110,17 +5431,20 @@ utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve)
break;
ucwidth = unicode_width(unicode);
- width += ucwidth;
- if (width > max_width) {
+ *width += ucwidth;
+ if (*width > max_width) {
*trimmed = 1;
- if (reserve && width - ucwidth == max_width) {
+ *width -= ucwidth;
+ if (reserve && *width == max_width) {
string -= last_bytes;
+ *width -= last_ucwidth;
}
break;
}
string += bytes;
last_bytes = bytes;
+ last_ucwidth = ucwidth;
}
return string - start;
/* Initialize the curses library */
if (isatty(STDIN_FILENO)) {
cursed = !!initscr();
+ opt_tty = stdin;
} else {
/* Leave stdin and stdout alone when acting as a pager. */
- FILE *io = fopen("/dev/tty", "r+");
-
- if (!io)
+ opt_tty = fopen("/dev/tty", "r+");
+ if (!opt_tty)
die("Failed to open /dev/tty");
- cursed = !!newterm(NULL, io, io);
+ cursed = !!newterm(NULL, opt_tty, opt_tty);
}
if (!cursed)
/* Enable keyboard mapping */
keypad(status_win, TRUE);
wbkgdset(status_win, get_line_attr(LINE_STATUS));
+
+ TABSIZE = opt_tab_size;
+ if (opt_line_graphics) {
+ line_graphics[LINE_GRAPHIC_VLINE] = ACS_VLINE;
+ }
+}
+
+static bool
+prompt_yesno(const char *prompt)
+{
+ enum { WAIT, STOP, CANCEL } status = WAIT;
+ bool answer = FALSE;
+
+ while (status == WAIT) {
+ 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 [Yy]/[Nn]", prompt);
+ wclrtoeol(status_win);
+
+ /* Refresh, accept single keystroke of input */
+ key = wgetch(status_win);
+ switch (key) {
+ case ERR:
+ break;
+
+ case 'y':
+ case 'Y':
+ answer = TRUE;
+ status = STOP;
+ break;
+
+ case KEY_ESC:
+ case KEY_RETURN:
+ case KEY_ENTER:
+ case KEY_BACKSPACE:
+ case 'n':
+ case 'N':
+ case '\n':
+ default:
+ answer = FALSE;
+ status = CANCEL;
+ }
+ }
+
+ /* Clear the status window */
+ status_empty = FALSE;
+ report("");
+
+ return answer;
}
static char *
static size_t id_refs_alloc = 0;
static size_t id_refs_size = 0;
+static int
+compare_refs(const void *ref1_, const void *ref2_)
+{
+ const struct ref *ref1 = *(const struct ref **)ref1_;
+ const struct ref *ref2 = *(const struct ref **)ref2_;
+
+ if (ref1->tag != ref2->tag)
+ return ref2->tag - ref1->tag;
+ if (ref1->ltag != ref2->ltag)
+ return ref2->ltag - ref2->ltag;
+ if (ref1->head != ref2->head)
+ return ref2->head - ref1->head;
+ if (ref1->tracked != ref2->tracked)
+ return ref2->tracked - ref1->tracked;
+ if (ref1->remote != ref2->remote)
+ return ref2->remote - ref1->remote;
+ return strcmp(ref1->name, ref2->name);
+}
+
static struct ref **
-get_refs(char *id)
+get_refs(const char *id)
{
struct ref ***tmp_id_refs;
struct ref **ref_list = NULL;
}
ref_list = tmp;
- if (ref_list_size > 0)
- ref_list[ref_list_size - 1]->next = 1;
ref_list[ref_list_size] = &refs[i];
-
/* XXX: The properties of the commit chains ensures that we can
* safely modify the shared ref. The repo references will
* always be similar for the same id. */
- ref_list[ref_list_size]->next = 0;
+ ref_list[ref_list_size]->next = 1;
+
ref_list_size++;
}
- if (ref_list)
+ if (ref_list) {
+ qsort(ref_list, ref_list_size, sizeof(*ref_list), compare_refs);
+ ref_list[ref_list_size - 1]->next = 0;
id_refs[id_refs_size++] = ref_list;
+ }
return ref_list;
}
bool tag = FALSE;
bool ltag = FALSE;
bool remote = FALSE;
+ bool tracked = FALSE;
bool check_replace = FALSE;
+ bool head = FALSE;
- if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
+ if (!prefixcmp(name, "refs/tags/")) {
if (!strcmp(name + namelen - 3, "^{}")) {
namelen -= 3;
name[namelen] = 0;
namelen -= STRING_SIZE("refs/tags/");
name += STRING_SIZE("refs/tags/");
- } else if (!strncmp(name, "refs/remotes/", STRING_SIZE("refs/remotes/"))) {
+ } else if (!prefixcmp(name, "refs/remotes/")) {
remote = TRUE;
namelen -= STRING_SIZE("refs/remotes/");
name += STRING_SIZE("refs/remotes/");
+ tracked = !strcmp(opt_remote, name);
- } else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
+ } else if (!prefixcmp(name, "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;
}
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
+ * the commit id of an annotated tag right before the commit id
* it points to. */
refs[refs_size - 1].ltag = ltag;
string_copy_rev(refs[refs_size - 1].id, id);
strncpy(ref->name, name, namelen);
ref->name[namelen] = 0;
+ ref->head = head;
ref->tag = tag;
ref->ltag = ltag;
ref->remote = remote;
+ ref->tracked = tracked;
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;
+ if (!*opt_git_dir)
+ return OK;
+
+ while (refs_size > 0)
+ free(refs[--refs_size].name);
+ while (id_refs_size > 0)
+ free(id_refs[--id_refs_size]);
+
return read_properties(popen(cmd, "r"), "\t", read_ref);
}
@@ -5449,13 +5865,35 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
if (!strcmp(name, "core.editor"))
string_ncopy(opt_editor, value, valuelen);
+ /* branch.<head>.remote */
+ if (*opt_head &&
+ !strncmp(name, "branch.", 7) &&
+ !strncmp(name + 7, opt_head, strlen(opt_head)) &&
+ !strcmp(name + 7 + strlen(opt_head), ".remote"))
+ string_ncopy(opt_remote, value, valuelen);
+
+ if (*opt_head && *opt_remote &&
+ !strncmp(name, "branch.", 7) &&
+ !strncmp(name + 7, opt_head, strlen(opt_head)) &&
+ !strcmp(name + 7 + strlen(opt_head), ".merge")) {
+ size_t from = strlen(opt_remote);
+
+ if (!prefixcmp(value, "refs/heads/")) {
+ value += STRING_SIZE("refs/heads/");
+ valuelen -= STRING_SIZE("refs/heads/");
+ }
+
+ if (!string_format_from(opt_remote, &from, "/%s", value))
+ opt_remote[0] = 0;
+ }
+
return OK;
}
static int
-load_repo_config(void)
+load_git_config(void)
{
- return read_properties(popen(GIT_CONFIG " --list", "r"),
+ return read_properties(popen("git " GIT_CONFIG " --list", "r"),
"=", read_repo_config_option);
}
* Default to true for the unknown case. */
opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
- } else {
+ } else if (opt_cdup[0] == ' ') {
string_ncopy(opt_cdup, name, namelen);
+ } else {
+ if (!prefixcmp(name, "refs/heads/")) {
+ namelen -= STRING_SIZE("refs/heads/");
+ name += STRING_SIZE("refs/heads/");
+ string_ncopy(opt_head, name, namelen);
+ }
}
return OK;
}
-/* XXX: The line outputted by "--show-cdup" can be empty so the option
- * must be the last one! */
static int
load_repo_info(void)
{
- return read_properties(popen("git rev-parse --git-dir --is-inside-work-tree --show-cdup 2>/dev/null", "r"),
- "=", read_repo_info);
+ int result;
+ FILE *pipe = popen("(git rev-parse --git-dir --is-inside-work-tree "
+ " --show-cdup; git symbolic-ref 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
}
int
-main(int argc, char *argv[])
+main(int argc, const char *argv[])
{
struct view *view;
enum request request;
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)
+ if (load_git_config() == ERR)
die("Failed to load repo config.");
- if (!parse_options(argc, argv))
+ request = parse_options(argc, argv);
+ if (request == REQ_NONE)
return 0;
/* Require a git repository unless when running in pager mode. */
- if (!opt_git_dir[0])
+ if (!opt_git_dir[0] && request != REQ_VIEW_PAGER)
die("Not a git repository");
if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
if (load_refs() == ERR)
die("Failed to load refs.");
- for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
+ foreach_view (view, i)
view->cmd_env = getenv(view->cmd_env);
- request = opt_request;
-
init_display();
while (view_driver(display[current_view], request)) {
foreach_view (view, i)
update_view(view);
+ view = display[current_view];
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
continue;
}
- request = get_keybinding(display[current_view]->keymap, key);
+ request = get_keybinding(view->keymap, key);
/* Some low-level request handling. This keeps access to
* status_win restricted. */
if (cmd && string_format(opt_cmd, "git %s", cmd)) {
if (strncmp(cmd, "show", 4) && isspace(cmd[4])) {
- opt_request = REQ_VIEW_DIFF;
+ request = REQ_VIEW_DIFF;
} else {
- opt_request = REQ_VIEW_PAGER;
+ request = REQ_VIEW_PAGER;
}
- break;
+
+ /* Always reload^Wrerun commands from the prompt. */
+ open_view(view, request, OPEN_RELOAD);
}
request = REQ_NONE;
case REQ_SEARCH:
case REQ_SEARCH_BACK:
{
- const char *prompt = request == REQ_SEARCH
- ? "/" : "?";
+ const char *prompt = request == REQ_SEARCH ? "/" : "?";
char *search = read_prompt(prompt);
if (search)