![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ca380a30a6d3b9eac6eed506a78c3b09ee96cf66..0390b3a00276a2ce4060daf9bd323aedd45e6f04 100644 (file)
--- a/tig.c
+++ b/tig.c
-/* Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2007 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
* GNU General Public License for more details.
*/
-#ifndef VERSION
-#define VERSION "tig-0.6.git"
+#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 <sys/types.h>
#include <regex.h>
#include <locale.h>
static void __NORETURN die(const char *err, ...);
static void report(const char *msg, ...);
-static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, int, char *, int));
+static 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);
#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#ifndef GIT_CONFIG
+#define GIT_CONFIG "git config"
+#endif
+
#define TIG_LS_REMOTE \
"git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
/* 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 ""
/* Some ascii-shorthands fitted into the ncurses namespace. */
#define KEY_TAB '\t'
/* Shorthands for safely copying into a fixed buffer. */
#define string_copy(dst, src) \
- string_ncopy_do(dst, sizeof(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)
{
REQ_(VIEW_BLOB, "Show blob 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_(SHOW_VERSION, "Show version information"), \
REQ_(STOP_LOADING, "Stop all loading views"), \
REQ_(TOGGLE_LINENO, "Toggle line numbers"), \
- REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization")
+ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \
+ REQ_(STATUS_UPDATE, "Update file status"), \
+ REQ_(EDIT, "Open in editor")
/* User action requests. */
*/
static const char usage[] =
-VERSION " (" __DATE__ ")\n"
+"tig " TIG_VERSION " (" __DATE__ ")\n"
"\n"
"Usage: tig [options]\n"
" or: tig [options] [--] [git log options]\n"
"Options:\n"
" -l Start up in log view\n"
" -d Start up in diff view\n"
+" -S Start up in status view\n"
" -n[I], --line-number[=I] Show line numbers with given interval\n"
" -b[N], --tab-size[=N] Set number of spaces for tab expansion\n"
" -- Mark end of tig options\n"
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 char opt_editor[SIZEOF_STR] = "";
enum option_type {
OPT_NONE,
continue;
}
+ if (!strcmp(opt, "-S")) {
+ opt_request = REQ_VIEW_STATUS;
+ continue;
+ }
+
if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
opt_line_number = TRUE;
continue;
}
if (check_option(opt, 'v', "version", OPT_NONE)) {
- printf("tig version %s\n", VERSION);
+ printf("tig version %s\n", TIG_VERSION);
return FALSE;
}
LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \
LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \
LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
-LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL)
+LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
+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)
enum line_type {
#define LINE(type, line, fg, bg, attr) \
{ 'f', REQ_VIEW_BLOB },
{ 'p', REQ_VIEW_PAGER },
{ 'h', REQ_VIEW_HELP },
+ { 'S', REQ_VIEW_STATUS },
+ { 'c', REQ_VIEW_STAGE },
/* View manipulation */
{ 'q', REQ_VIEW_CLOSE },
{ '.', REQ_TOGGLE_LINENO },
{ 'g', REQ_TOGGLE_REV_GRAPH },
{ ':', REQ_PROMPT },
+ { 'u', REQ_STATUS_UPDATE },
+ { 'e', REQ_EDIT },
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
KEYMAP_(TREE), \
KEYMAP_(BLOB), \
KEYMAP_(PAGER), \
- KEYMAP_(HELP) \
+ KEYMAP_(HELP), \
+ KEYMAP_(STATUS), \
+ KEYMAP_(STAGE)
enum keymap {
#define KEYMAP_(name) KEYMAP_##name
break;
}
default:
- string_copy(opt_encoding, arg);
+ string_ncopy(opt_encoding, arg, strlen(arg));
return OK;
}
}
}
static int
-read_option(char *opt, int optlen, char *value, int valuelen)
+read_option(char *opt, size_t optlen, char *value, size_t valuelen)
{
int status = OK;
} else {
/* Look for comment endings in the value. */
- int len = strcspn(value, "#");
+ size_t len = strcspn(value, "#");
if (len < valuelen) {
valuelen = len;
if (status == ERR) {
fprintf(stderr, "Error on line %d, near '%.*s': %s\n",
- config_lineno, optlen, opt, config_msg);
+ config_lineno, (int) optlen, opt, config_msg);
config_errors = TRUE;
}
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, change display based on current line. */
- bool (*enter)(struct view *view, struct line *line);
+ /* 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 */
static struct view_ops tree_ops;
static struct view_ops blob_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}
static struct view views[] = {
- VIEW_(MAIN, "main", &main_ops, ref_head),
- VIEW_(DIFF, "diff", &pager_ops, ref_commit),
- VIEW_(LOG, "log", &pager_ops, ref_head),
- VIEW_(TREE, "tree", &tree_ops, ref_commit),
- VIEW_(BLOB, "blob", &blob_ops, ref_blob),
- VIEW_(HELP, "help", &help_ops, ""),
- VIEW_(PAGER, "pager", &pager_ops, ""),
+ VIEW_(MAIN, "main", &main_ops, ref_head),
+ VIEW_(DIFF, "diff", &pager_ops, ref_commit),
+ VIEW_(LOG, "log", &pager_ops, ref_head),
+ VIEW_(TREE, "tree", &tree_ops, ref_commit),
+ VIEW_(BLOB, "blob", &blob_ops, ref_blob),
+ VIEW_(HELP, "help", &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])
assert(view_is_displayed(view));
- if (view->lines || view->pipe) {
+ 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
if (minsize < view->width)
refsize = view->width - minsize + 7;
- string_format_from(buf, &bufpos, " %.*s", refsize, view->ref);
+ string_format_from(buf, &bufpos, " %.*s", (int) refsize, view->ref);
}
if (statelen && bufpos < view->width) {
static bool
begin_update(struct view *view)
{
- const char *id = view->id;
-
if (view->pipe)
end_update(view);
/* When running random commands, initially show the
* command in the title. However, it maybe later be
* overwritten if a commit line is selected. */
- string_copy(view->ref, view->cmd);
+ 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;
else if (sq_quote(path, 0, opt_path) >= sizeof(path))
return FALSE;
- if (!string_format(view->cmd, format, id, path))
+ 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;
* 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(view->ref, id);
+ string_copy_rev(view->ref, view->id);
}
/* Special case for the pager view. */
view->offset = 0;
view->lines = 0;
view->lineno = 0;
- string_copy_rev(view->vid, id);
+ string_copy_rev(view->vid, view->id);
if (view->line) {
int i;
line[linelen - 1] = 0;
if (opt_iconv != ICONV_NONE) {
- char *inbuf = line;
+ ICONV_CONST char *inbuf = line;
size_t inlen = linelen;
char *outbuf = out_buffer;
update_view_title(view);
}
+static void
+open_editor(struct view *view, char *file)
+{
+ char cmd[SIZEOF_STR];
+ char file_sq[SIZEOF_STR];
+ char *editor;
+
+ 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", editor, file_sq)) {
+ def_prog_mode(); /* save current tty modes */
+ endwin(); /* restore original tty modes */
+ system(cmd);
+ reset_prog_mode();
+ redraw_display();
+ }
+}
/*
* User request switch noodle
{
int i;
+ 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:
break;
case REQ_VIEW_PAGER:
- if (!VIEW(REQ_VIEW_PAGER)->lines) {
+ 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_MAIN:
case REQ_VIEW_DIFF:
case REQ_VIEW_LOG:
case REQ_VIEW_TREE:
case REQ_VIEW_HELP:
+ case REQ_VIEW_STATUS:
open_view(view, request, OPEN_DEFAULT);
break;
if ((view == VIEW(REQ_VIEW_DIFF) &&
view->parent == VIEW(REQ_VIEW_MAIN)) ||
+ (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;
}
- /* Fall-through */
-
- case REQ_ENTER:
- if (!view->lines) {
- report("Nothing to enter");
- break;
- }
- return view->ops->enter(view, &view->line[view->lineno]);
+ break;
case REQ_VIEW_NEXT:
{
break;
case REQ_SHOW_VERSION:
- report("%s (built %s)", VERSION, __DATE__);
+ report("tig-%s (built %s)", TIG_VERSION, __DATE__);
return TRUE;
case REQ_SCREEN_RESIZE:
redraw_display();
break;
+ case REQ_EDIT:
+ report("Nothing to edit");
+ break;
+
+ case REQ_ENTER:
+ report("Nothing to enter");
+ break;
+
case REQ_NONE:
doupdate();
return TRUE;
return TRUE;
}
-static bool
-pager_enter(struct view *view, struct line *line)
+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))) {
if (split)
update_view_title(view);
- return TRUE;
+ return REQ_NONE;
}
static bool
NULL,
pager_read,
pager_draw,
- pager_enter,
+ pager_request,
pager_grep,
pager_select,
};
help_open,
NULL,
pager_draw,
- pager_enter,
+ 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
if (!add_line_text(view, text, type))
return FALSE;
- /* Move the current line to the first tree entry. */
- if (first_read)
- view->lineno++;
+ if (tree_lineno > view->lineno) {
+ view->lineno = tree_lineno;
+ tree_lineno = 0;
+ }
return TRUE;
}
-static bool
-tree_enter(struct view *view, struct line *line)
+static enum request
+tree_request(struct view *view, enum request request, struct line *line)
{
enum open_flags flags;
- enum request request;
+
+ 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) {
- size_t path_len = strlen(opt_path);
- char *dirsep = opt_path + path_len - 1;
-
- while (dirsep > opt_path && dirsep[-1] != '/')
- dirsep--;
-
- dirsep[0] = 0;
+ pop_tree_stack_entry();
} else {
- size_t pathlen = strlen(opt_path);
- size_t origlen = pathlen;
char *data = line->data;
char *basename = data + SIZEOF_TREE_ATTR;
- if (!string_format_from(opt_path, &pathlen, "%s/", basename)) {
- opt_path[origlen] = 0;
- return TRUE;
- }
+ push_tree_stack_entry(basename, view->lineno);
}
/* Trees and subtrees share the same ID, so they are not not
}
open_view(view, request, flags);
+ if (request == REQ_VIEW_TREE) {
+ view->lineno = tree_lineno;
+ }
- return TRUE;
+ return REQ_NONE;
}
static void
NULL,
tree_read,
pager_draw,
- tree_enter,
+ tree_request,
pager_grep,
tree_select,
};
static bool
blob_read(struct view *view, char *line)
{
- return add_line_text(view, line, LINE_DEFAULT);
+ return add_line_text(view, line, LINE_DEFAULT) != NULL;
}
static struct view_ops blob_ops = {
NULL,
blob_read,
pager_draw,
- pager_enter,
+ pager_request,
+ pager_grep,
+ pager_select,
+};
+
+
+/*
+ * Status backend
+ */
+
+struct status {
+ char status;
+ struct {
+ mode_t mode;
+ char rev[SIZEOF_REV];
+ } old;
+ struct {
+ mode_t mode;
+ char rev[SIZEOF_REV];
+ } new;
+ char name[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->name[0] = 0;
+
+ return TRUE;
+}
+
+static bool
+status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
+{
+ struct status *file = 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 (!diff) {
+ file->status = '?';
+
+ } 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;
+ }
+
+ /* 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->name, buf, sepsize);
+ 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;
+}
+
+#define STATUS_DIFF_INDEX_CMD "git diff-index -z --cached 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_DIFF_SHOW_CMD \
+ "git diff --root --patch-with-stat --find-copies-harder -B -C %s -- %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];
+ size_t i;
+
+ for (i = 0; i < view->lines; i++)
+ free(view->line[i].data);
+ free(view->line);
+ view->lines = view->line_size = 0;
+ view->line = NULL;
+
+ if (!realloc_lines(view, view->line_size + 6))
+ return FALSE;
+
+ if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+ return FALSE;
+
+ string_copy(cmd, STATUS_LIST_OTHER_CMD);
+
+ if (stat(exclude, &statbuf) >= 0) {
+ size_t cmdsize = strlen(cmd);
+
+ if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") ||
+ sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd))
+ return FALSE;
+ }
+
+ 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))
+ return FALSE;
+
+ 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 (!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;
+
+ default:
+ return FALSE;
+ }
+
+ waddstr(view->win, text);
+ return TRUE;
+ }
+
+ waddch(view->win, status->status);
+ if (!selected)
+ wattrset(view->win, A_NORMAL);
+ wmove(view->win, lineno, 4);
+ waddstr(view->win, status->name);
+
+ return TRUE;
+}
+
+static enum request
+status_enter(struct view *view, struct line *line)
+{
+ struct status *status = line->data;
+ char path[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 && sq_quote(path, 0, status->name) >= sizeof(path))
+ 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 (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
+ "--cached", path))
+ return REQ_QUIT;
+ if (status)
+ info = "Staged changes to %s";
+ else
+ info = "Staged changes";
+ break;
+
+ case LINE_STAT_UNSTAGED:
+ if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
+ "", path))
+ return REQ_QUIT;
+ if (status)
+ info = "Unstaged changes to %s";
+ else
+ info = "Unstaged changes";
+ break;
+
+ case LINE_STAT_UNTRACKED:
+ if (opt_pipe)
+ return REQ_QUIT;
+
+
+ if (!status) {
+ report("No file to show");
+ return REQ_NONE;
+ }
+
+ opt_pipe = fopen(status->name, "r");
+ info = "Untracked file %s";
+ break;
+
+ default:
+ die("w00t");
+ }
+
+ 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));
+ }
+
+ stage_line_type = line->type;
+ string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.name);
+ }
+
+ return REQ_NONE;
+}
+
+
+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;
+
+ if (opt_cdup[0] &&
+ type != LINE_STAT_UNTRACKED &&
+ !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
+ return FALSE;
+
+ switch (type) {
+ case LINE_STAT_STAGED:
+ if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c",
+ status->old.mode,
+ status->old.rev,
+ status->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->name, 0))
+ return FALSE;
+
+ string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
+ break;
+
+ default:
+ die("w00t");
+ }
+
+ pipe = popen(cmd, "w");
+ if (!pipe)
+ return FALSE;
+
+ while (!ferror(pipe) && written < bufsize) {
+ written += fwrite(buf + written, 1, bufsize - written, pipe);
+ }
+
+ pclose(pipe);
+
+ if (written != bufsize)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+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");
+ }
+
+ if (!line[-1].data) {
+ report("Nothing to update");
+ return;
+ }
+
+ } else if (!status_update_file(view, line->data, line->type)) {
+ report("Failed to update file status");
+ }
+
+ open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
+}
+
+static enum request
+status_request(struct view *view, enum request request, struct line *line)
+{
+ struct status *status = line->data;
+
+ switch (request) {
+ case REQ_STATUS_UPDATE:
+ status_update(view);
+ break;
+
+ case REQ_EDIT:
+ if (!status)
+ return request;
+
+ open_editor(view, status->name);
+ break;
+
+ case REQ_ENTER:
+ status_enter(view, line);
+ break;
+
+ default:
+ return request;
+ }
+
+ return REQ_NONE;
+}
+
+static void
+status_select(struct view *view, struct line *line)
+{
+ struct status *status = line->data;
+ char file[SIZEOF_STR] = "all files";
+ char *text;
+
+ if (status && !string_format(file, "'%s'", status->name))
+ return;
+
+ if (!status && line[1].type == LINE_STAT_NONE)
+ line++;
+
+ switch (line->type) {
+ case LINE_STAT_STAGED:
+ text = "Press %s to unstage %s for commit";
+ break;
+
+ case LINE_STAT_UNSTAGED:
+ text = "Press %s to stage %s for commit";
+ break;
+
+ case LINE_STAT_UNTRACKED:
+ text = "Press %s to stage %s for addition";
+ break;
+
+ case LINE_STAT_NONE:
+ text = "Nothing to update";
+ break;
+
+ default:
+ die("w00t");
+ }
+
+ string_format(view->ref, text, get_key(REQ_STATUS_UPDATE), file);
+}
+
+static bool
+status_grep(struct view *view, struct line *line)
+{
+ struct status *status = line->data;
+ enum { S_STATUS, S_NAME, S_END } state;
+ char buf[2] = "?";
+ regmatch_t pmatch;
+
+ if (!status)
+ return FALSE;
+
+ for (state = S_STATUS; state < S_END; state++) {
+ char *text;
+
+ switch (state) {
+ case S_NAME: text = status->name; break;
+ case S_STATUS:
+ buf[0] = status->status;
+ text = buf;
+ break;
+
+ default:
+ return FALSE;
+ }
+
+ if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static struct view_ops status_ops = {
+ "file",
+ status_open,
+ NULL,
+ status_draw,
+ status_request,
+ status_grep,
+ status_select,
+};
+
+
+static bool
+stage_diff_line(FILE *pipe, struct line *line)
+{
+ char *buf = line->data;
+ size_t bufsize = strlen(buf);
+ size_t written = 0;
+
+ while (!ferror(pipe) && written < bufsize) {
+ written += fwrite(buf + written, 1, bufsize - written, pipe);
+ }
+
+ fputc('\n', pipe);
+
+ return written == bufsize;
+}
+
+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 (line->type == LINE_DIFF_CHUNK)
+ diff_hdr = line - 1;
+ else
+ diff_hdr = view->line + 1;
+
+ while (diff_hdr > view->line && diff_hdr < view->line + view->lines) {
+ if (diff_hdr->type == LINE_DIFF_HEADER)
+ return diff_hdr;
+
+ diff_hdr += diff_hdr_dir;
+ }
+
+ return NULL;
+}
+
+static bool
+stage_update_chunk(struct view *view, struct line *line)
+{
+ char cmd[SIZEOF_STR];
+ size_t cmdsize = 0;
+ struct line *diff_hdr, *diff_chunk, *diff_end;
+ FILE *pipe;
+
+ diff_hdr = stage_diff_hdr(view, line);
+ if (!diff_hdr)
+ return FALSE;
+
+ if (opt_cdup[0] &&
+ !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
+ return FALSE;
+
+ 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;
+
+ pipe = popen(cmd, "w");
+ if (!pipe)
+ return FALSE;
+
+ diff_end = view->line + view->lines;
+ if (line->type != LINE_DIFF_CHUNK) {
+ diff_chunk = diff_hdr;
+
+ } 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;
+
+ default:
+ diff_hdr++;
+ continue;
+ }
+
+ if (!stage_diff_line(pipe, diff_hdr++)) {
+ pclose(pipe);
+ return FALSE;
+ }
+ }
+ }
+
+ while (diff_chunk < diff_end && stage_diff_line(pipe, diff_chunk))
+ diff_chunk++;
+
+ pclose(pipe);
+
+ if (diff_chunk != diff_end)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+stage_update(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;
+ }
+
+ } else if (!status_update_file(view, &stage_status, stage_line_type)) {
+ report("Failed to update file");
+ return;
+ }
+
+ 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 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_EDIT:
+ if (!stage_status.name[0])
+ return request;
+
+ open_editor(view, stage_status.name);
+ break;
+
+ case REQ_ENTER:
+ pager_request(view, request, line);
+ break;
+
+ default:
+ return request;
+ }
+
+ return REQ_NONE;
+}
+
+static struct view_ops stage_ops = {
+ "line",
+ NULL,
+ pager_read,
+ pager_draw,
+ stage_request,
pager_grep,
pager_select,
};
return;
if (graph->size < SIZEOF_REVITEMS) {
- string_ncopy(graph->rev[graph->size++], parent, SIZEOF_REV);
+ string_copy_rev(graph->rev[graph->size++], parent);
}
}
{
static struct rev_graph *graph = graph_stacks;
enum line_type type;
- struct commit *commit = view->lines
- ? view->line[view->lines - 1].data : NULL;
+ struct commit *commit;
if (!line) {
update_rev_graph(graph);
}
type = get_line_type(line);
-
- switch (type) {
- case LINE_COMMIT:
+ if (type == LINE_COMMIT) {
commit = calloc(1, sizeof(struct commit));
if (!commit)
return FALSE;
- line += STRING_SIZE("commit ");
-
- string_copy_rev(commit->id, line);
+ string_copy_rev(commit->id, line + STRING_SIZE("commit "));
commit->refs = get_refs(commit->id);
graph->commit = commit;
add_line_data(view, commit, LINE_MAIN_COMMIT);
- break;
+ return TRUE;
+ }
+ if (!view->lines)
+ return TRUE;
+ commit = view->line[view->lines - 1].data;
+
+ switch (type) {
case LINE_PARENT:
- if (commit) {
- line += STRING_SIZE("parent ");
- push_rev_graph(graph->parents, line);
- }
+ push_rev_graph(graph->parents, line + STRING_SIZE("parent "));
break;
case LINE_AUTHOR:
char *nameend = strchr(ident, '<');
char *emailend = strchr(ident, '>');
- if (!commit || !nameend || !emailend)
+ if (!nameend || !emailend)
break;
update_rev_graph(graph);
ident = "Unknown";
}
- string_copy(commit->author, ident);
+ string_ncopy(commit->author, ident, strlen(ident));
/* Parse epoch and timezone */
if (emailend[1] == ' ') {
break;
}
default:
- if (!commit)
- break;
-
/* Fill in the commit title if it has not already been set. */
if (commit->title[0])
break;
/* FIXME: More graceful handling of titles; append "..." to
* shortened titles, etc. */
- string_copy(commit->title, line);
+ 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;
+ if (request == REQ_ENTER)
+ open_view(view, REQ_VIEW_DIFF, flags);
+ else
+ return request;
+
+ return REQ_NONE;
}
static bool
NULL,
main_read,
main_draw,
- main_enter,
+ main_request,
main_grep,
main_select,
};
}
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;
}
static int
-read_repo_config_option(char *name, int namelen, char *value, int valuelen)
+read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen)
{
if (!strcmp(name, "i18n.commitencoding"))
- string_copy(opt_encoding, value);
+ 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 repo-config --list", "r"),
+ return read_properties(popen(GIT_CONFIG " --list", "r"),
"=", read_repo_config_option);
}
+static int
+read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
+{
+ if (!opt_git_dir[0])
+ string_ncopy(opt_git_dir, name, namelen);
+ else
+ string_ncopy(opt_cdup, 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 --show-cdup 2>/dev/null", "r"),
+ "=", read_repo_info);
+}
+
static int
read_properties(FILE *pipe, const char *separators,
- int (*read_property)(char *, int, char *, int))
+ int (*read_property)(char *, size_t, char *, size_t))
{
char buffer[BUFSIZ];
char *name;
signal(SIGINT, quit);
if (setlocale(LC_ALL, "")) {
- string_copy(opt_codeset, nl_langinfo(CODESET));
+ char *codeset = nl_langinfo(CODESET);
+
+ string_ncopy(opt_codeset, codeset, strlen(codeset));
}
+ if (load_repo_info() == ERR)
+ die("Failed to load repo info.");
+
+ /* Require a git repository unless when running in pager mode. */
+ if (!opt_git_dir[0])
+ die("Not a git repository");
+
if (load_options() == ERR)
die("Failed to load user config.");
/* Load the repo config file so options can be overwritten from
- * the command line. */
+ * the command line. */
if (load_repo_config() == ERR)
die("Failed to load repo config.");
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)
- die("Not a git repository");
-
for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
view->cmd_env = getenv(view->cmd_env);
char *search = read_prompt(prompt);
if (search)
- string_copy(opt_search, search);
+ string_ncopy(opt_search, search, strlen(search));
else
request = REQ_NONE;
break;