![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 3449c5a92fb64327aae8455418504abe0ea8f31c..f72932144b4d893db73720d3946da34d15b97ee7 100644 (file)
--- a/tig.c
+++ b/tig.c
-/* Copyright (c) 2006-2008 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2009 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
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/stat.h>
+#include <sys/select.h>
#include <unistd.h>
#include <time.h>
+#include <fcntl.h>
#include <regex.h>
FORMAT_NONE /* No replacement should be performed. */
};
-static bool format_command(char dst[], const char *src[], enum format_flags flags);
static bool format_argv(const char *dst[], const char *src[], enum format_flags flags);
struct int_map {
return suffixlen < len ? strcmp(str + len - suffixlen, suffix) : -1;
}
-/* Shell quoting
- *
- * NOTE: The following is a slightly modified copy of the git project's shell
- * quoting routines found in the quote.c file.
- *
- * Help to copy the thing properly quoted for the shell safety. any single
- * quote is replaced with '\'', any exclamation point is replaced with '\!',
- * and the whole thing is enclosed in a
- *
- * E.g.
- * original sq_quote result
- * name ==> name ==> 'name'
- * a b ==> a b ==> 'a b'
- * a'b ==> a'\''b ==> 'a'\''b'
- * a!b ==> a'\!'b ==> 'a'\!'b'
- */
-
-static size_t
-sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
-{
- char c;
-
-#define BUFPUT(x) do { if (bufsize < SIZEOF_STR) buf[bufsize++] = (x); } while (0)
-
- BUFPUT('\'');
- while ((c = *src++)) {
- if (c == '\'' || c == '!') {
- BUFPUT('\'');
- BUFPUT('\\');
- BUFPUT(c);
- BUFPUT('\'');
- } else {
- BUFPUT(c);
- }
- }
- BUFPUT('\'');
-
- if (bufsize < SIZEOF_STR)
- buf[bufsize] = 0;
-
- return bufsize;
-}
static bool
argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd)
IO_FG, /* Execute command with same std{in,out,err}. */
IO_RD, /* Read only fork+exec IO. */
IO_WR, /* Write only fork+exec IO. */
+ IO_AP, /* Append fork+exec output to file. */
};
struct io {
enum io_type type; /* The requested type of pipe. */
const char *dir; /* Directory from which to execute. */
- FILE *pipe; /* Pipe for reading or writing. */
+ pid_t pid; /* Pipe for reading or writing. */
+ int pipe; /* Pipe end for reading or writing. */
int error; /* Error status. */
- char sh[SIZEOF_STR]; /* Shell command buffer. */
- char *buf; /* Read/write buffer. */
+ const char *argv[SIZEOF_ARG]; /* Shell command arguments. */
+ char *buf; /* Read buffer. */
size_t bufalloc; /* Allocated buffer size. */
+ size_t bufsize; /* Buffer content size. */
+ char *bufpos; /* Current buffer position. */
+ unsigned int eof:1; /* Has end of file been reached. */
};
static void
reset_io(struct io *io)
{
- io->pipe = NULL;
- io->buf = NULL;
- io->bufalloc = 0;
+ io->pipe = -1;
+ io->pid = 0;
+ io->buf = io->bufpos = NULL;
+ io->bufalloc = io->bufsize = 0;
io->error = 0;
+ io->eof = 0;
}
static void
enum format_flags flags)
{
init_io(io, dir, IO_RD);
- return format_command(io->sh, argv, flags);
+ return format_argv(io->argv, argv, flags);
}
static bool
-init_io_fd(struct io *io, FILE *pipe)
+io_open(struct io *io, const char *name)
{
init_io(io, NULL, IO_FD);
- io->pipe = pipe;
- return io->pipe != NULL;
+ io->pipe = *name ? open(name, O_RDONLY) : STDIN_FILENO;
+ return io->pipe != -1;
+}
+
+static bool
+kill_io(struct io *io)
+{
+ return io->pid == 0 || kill(io->pid, SIGKILL) != -1;
}
static bool
done_io(struct io *io)
{
+ pid_t pid = io->pid;
+
+ if (io->pipe != -1)
+ close(io->pipe);
free(io->buf);
- if (io->type == IO_FD)
- fclose(io->pipe);
- else if (io->type == IO_RD || io->type == IO_WR)
- pclose(io->pipe);
reset_io(io);
+
+ while (pid > 0) {
+ int status;
+ pid_t waiting = waitpid(pid, &status, 0);
+
+ if (waiting < 0) {
+ if (errno == EINTR)
+ continue;
+ report("waitpid failed (%s)", strerror(errno));
+ return FALSE;
+ }
+
+ return waiting == pid &&
+ !WIFSIGNALED(status) &&
+ WIFEXITED(status) &&
+ !WEXITSTATUS(status);
+ }
+
return TRUE;
}
static bool
start_io(struct io *io)
{
- char buf[SIZEOF_STR * 2];
- size_t bufpos = 0;
+ int pipefds[2] = { -1, -1 };
if (io->type == IO_FD)
return TRUE;
- if (io->dir && *io->dir &&
- !string_format_from(buf, &bufpos, "cd %s;", io->dir))
+ if ((io->type == IO_RD || io->type == IO_WR) &&
+ pipe(pipefds) < 0)
return FALSE;
+ else if (io->type == IO_AP)
+ pipefds[1] = io->pipe;
+
+ if ((io->pid = fork())) {
+ if (pipefds[!(io->type == IO_WR)] != -1)
+ close(pipefds[!(io->type == IO_WR)]);
+ if (io->pid != -1) {
+ io->pipe = pipefds[!!(io->type == IO_WR)];
+ return TRUE;
+ }
- if (!string_format_from(buf, &bufpos, "%s", io->sh))
- return FALSE;
+ } else {
+ if (io->type != IO_FG) {
+ int devnull = open("/dev/null", O_RDWR);
+ int readfd = io->type == IO_WR ? pipefds[0] : devnull;
+ int writefd = (io->type == IO_RD || io->type == IO_AP)
+ ? pipefds[1] : devnull;
+
+ dup2(readfd, STDIN_FILENO);
+ dup2(writefd, STDOUT_FILENO);
+ dup2(devnull, STDERR_FILENO);
+
+ close(devnull);
+ if (pipefds[0] != -1)
+ close(pipefds[0]);
+ if (pipefds[1] != -1)
+ close(pipefds[1]);
+ }
+
+ if (io->dir && *io->dir && chdir(io->dir) == -1)
+ die("Failed to change directory: %s", strerror(errno));
- if (io->type == IO_FG || io->type == IO_BG)
- return system(buf) == 0;
+ execvp(io->argv[0], (char *const*) io->argv);
+ die("Failed to execute program: %s", strerror(errno));
+ }
- io->pipe = popen(io->sh, io->type == IO_RD ? "r" : "w");
- return io->pipe != NULL;
+ if (pipefds[!!(io->type == IO_WR)] != -1)
+ close(pipefds[!!(io->type == IO_WR)]);
+ return FALSE;
}
static bool
run_io(struct io *io, const char **argv, const char *dir, enum io_type type)
{
init_io(io, dir, type);
- if (!format_command(io->sh, argv, FORMAT_NONE))
+ if (!format_argv(io->argv, argv, FORMAT_NONE))
return FALSE;
return start_io(io);
}
struct io io = {};
init_io(&io, NULL, IO_BG);
- if (!format_command(io.sh, argv, FORMAT_NONE))
+ if (!format_argv(io.argv, argv, FORMAT_NONE))
return FALSE;
return run_io_do(&io);
}
struct io io = {};
init_io(&io, dir, IO_FG);
- if (!format_command(io.sh, argv, FORMAT_NONE))
+ if (!format_argv(io.argv, argv, FORMAT_NONE))
return FALSE;
return run_io_do(&io);
}
+static bool
+run_io_append(const char **argv, enum format_flags flags, int fd)
+{
+ struct io io = {};
+
+ init_io(&io, NULL, IO_AP);
+ io.pipe = fd;
+ if (format_argv(io.argv, argv, flags))
+ return run_io_do(&io);
+ close(fd);
+ return FALSE;
+}
+
static bool
run_io_rd(struct io *io, const char **argv, enum format_flags flags)
{
static bool
io_eof(struct io *io)
{
- return feof(io->pipe);
+ return io->eof;
}
static int
return strerror(io->error);
}
+static bool
+io_can_read(struct io *io)
+{
+ struct timeval tv = { 0, 500 };
+ fd_set fds;
+
+ FD_ZERO(&fds);
+ FD_SET(io->pipe, &fds);
+
+ return select(io->pipe + 1, &fds, NULL, NULL, &tv) > 0;
+}
+
+static ssize_t
+io_read(struct io *io, void *buf, size_t bufsize)
+{
+ do {
+ ssize_t readsize = read(io->pipe, buf, bufsize);
+
+ if (readsize < 0 && (errno == EAGAIN || errno == EINTR))
+ continue;
+ else if (readsize == -1)
+ io->error = errno;
+ else if (readsize == 0)
+ io->eof = 1;
+ return readsize;
+ } while (1);
+}
+
static char *
-io_gets(struct io *io)
+io_get(struct io *io, int c, bool can_read)
{
+ char *eol;
+ ssize_t readsize;
+
if (!io->buf) {
- io->buf = malloc(BUFSIZ);
+ io->buf = io->bufpos = malloc(BUFSIZ);
if (!io->buf)
return NULL;
io->bufalloc = BUFSIZ;
+ io->bufsize = 0;
}
- if (!fgets(io->buf, io->bufalloc, io->pipe)) {
- if (ferror(io->pipe))
- io->error = errno;
- return NULL;
- }
+ while (TRUE) {
+ if (io->bufsize > 0) {
+ eol = memchr(io->bufpos, c, io->bufsize);
+ if (eol) {
+ char *line = io->bufpos;
- return io->buf;
+ *eol = 0;
+ io->bufpos = eol + 1;
+ io->bufsize -= io->bufpos - line;
+ return line;
+ }
+ }
+
+ if (io_eof(io)) {
+ if (io->bufsize) {
+ io->bufpos[io->bufsize] = 0;
+ io->bufsize = 0;
+ return io->bufpos;
+ }
+ return NULL;
+ }
+
+ if (!can_read)
+ return NULL;
+
+ if (io->bufsize > 0 && io->bufpos > io->buf)
+ memmove(io->buf, io->bufpos, io->bufsize);
+
+ io->bufpos = io->buf;
+ readsize = io_read(io, io->buf + io->bufsize, io->bufalloc - io->bufsize);
+ if (io_error(io))
+ return NULL;
+ io->bufsize += readsize;
+ }
}
static bool
size_t written = 0;
while (!io_error(io) && written < bufsize) {
- written += fwrite(buf + written, 1, bufsize - written, io->pipe);
- if (ferror(io->pipe))
+ ssize_t size;
+
+ size = write(io->pipe, buf + written, bufsize - written);
+ if (size < 0 && (errno == EAGAIN || errno == EINTR))
+ continue;
+ else if (size == -1)
io->error = errno;
+ else
+ written += size;
}
return written == bufsize;
if (!run_io_rd(&io, argv, FORMAT_NONE))
return FALSE;
- io.buf = buf;
+ io.buf = io.bufpos = buf;
io.bufalloc = bufsize;
- error = !io_gets(&io) && io_error(&io);
+ error = !io_get(&io, '\n', TRUE) && io_error(&io);
io.buf = NULL;
return done_io(&io) || error;
@@ -568,6 +666,7 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch
REQ_(ENTER, "Enter current line and scroll"), \
REQ_(NEXT, "Move to next"), \
REQ_(PREVIOUS, "Move to previous"), \
+ REQ_(PARENT, "Move to parent"), \
REQ_(VIEW_NEXT, "Move focus to next view"), \
REQ_(REFRESH, "Reload and refresh"), \
REQ_(MAXIMIZE, "Maximize the current view"), \
@@ -579,7 +678,6 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch
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"), \
@@ -611,7 +709,6 @@ static int read_properties(struct io *io, const char *separators, int (*read)(ch
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_(EDIT, "Open in editor"), \
static iconv_t opt_iconv = ICONV_NONE;
static char opt_search[SIZEOF_STR] = "";
static char opt_cdup[SIZEOF_STR] = "";
+static char opt_prefix[SIZEOF_STR] = "";
static char opt_git_dir[SIZEOF_STR] = "";
static signed char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */
static char opt_editor[SIZEOF_STR] = "";
bool seen_dashdash = FALSE;
/* XXX: This is vulnerable to the user overriding options
* required for the main view parser. */
- const char *custom_argv[SIZEOF_ARG] = {
+ static const char *custom_argv[SIZEOF_ARG] = {
"git", "log", "--no-color", "--pretty=raw", "--parents",
"--topo-order", NULL
};
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_PARENT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_BOLD), \
+LINE(TREE_MODE, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
+LINE(TREE_DIR, "", COLOR_YELLOW, COLOR_DEFAULT, A_NORMAL), \
LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \
LINE(STAT_HEAD, "", COLOR_YELLOW, COLOR_DEFAULT, 0), \
LINE(STAT_SECTION, "", COLOR_CYAN, COLOR_DEFAULT, 0), \
/* State flags */
unsigned int selected:1;
unsigned int dirty:1;
+ unsigned int cleareol:1;
void *data; /* User data */
};
{ '!', REQ_STATUS_REVERT },
{ 'M', REQ_STATUS_MERGE },
{ '@', REQ_STAGE_NEXT },
- { ',', REQ_TREE_PARENT },
+ { ',', REQ_PARENT },
{ 'e', REQ_EDIT },
-
- /* Using the ncurses SIGWINCH handler. */
- { KEY_RESIZE, REQ_SCREEN_RESIZE },
};
#define KEYMAP_INFO \
request = get_request(argv[2]);
if (request == REQ_NONE) {
- const char *obsolete[] = { "cherry-pick" };
+ struct {
+ const char *name;
+ enum request request;
+ } obsolete[] = {
+ { "cherry-pick", REQ_NONE },
+ { "screen-resize", REQ_NONE },
+ { "tree-parent", REQ_PARENT },
+ };
size_t namelen = strlen(argv[2]);
int i;
for (i = 0; i < ARRAY_SIZE(obsolete); i++) {
- if (namelen == strlen(obsolete[i]) &&
- !string_enum_compare(obsolete[i], argv[2], namelen)) {
- config_msg = "Obsolete request name";
- return ERR;
- }
+ if (namelen != strlen(obsolete[i].name) ||
+ string_enum_compare(obsolete[i].name, argv[2], namelen))
+ continue;
+ if (obsolete[i].request != REQ_NONE)
+ add_keybinding(keymap, obsolete[i].request, key);
+ config_msg = "Obsolete request name";
+ return ERR;
}
}
if (request == REQ_NONE && *argv[2]++ == '!')
struct io io = {};
/* It's ok that the file doesn't exist. */
- if (!init_io_fd(&io, fopen(path, "r")))
+ if (!io_open(&io, path))
return;
config_lineno = 0;
/* Navigation */
unsigned long offset; /* Offset of the window top */
unsigned long lineno; /* Current line number */
+ unsigned long p_offset; /* Previous offset of the window top */
+ unsigned long p_lineno; /* Previous current line number */
+ bool p_restore; /* Should the previous position be restored. */
/* Searching */
char grep[SIZEOF_STR]; /* Search string */
size_t lines; /* Total number of lines */
struct line *line; /* Line index */
size_t line_alloc; /* Total number of allocated lines */
- size_t line_size; /* Total number of used lines */
unsigned int digits; /* Number of digits in the lines member. */
/* Drawing */
struct io io;
struct io *pipe;
time_t start_time;
+ time_t update_secs;
};
struct view_ops {
line = &view->line[view->offset + lineno];
wmove(view->win, lineno, 0);
+ if (line->cleareol)
+ wclrtoeol(view->win);
view->col = 0;
view->curline = line;
view->curtype = LINE_NONE;
line->selected = FALSE;
+ line->dirty = line->cleareol = 0;
if (selected) {
set_view_attr(view, LINE_CURSOR);
line->selected = TRUE;
view->ops->select(view, line);
- } else if (line->selected) {
- wclrtoeol(view->win);
}
scrollok(view->win, FALSE);
int lineno;
for (lineno = 0; lineno < view->height; lineno++) {
- struct line *line = &view->line[view->offset + lineno];
-
- if (!line->dirty)
+ if (view->offset + lineno >= view->lines)
+ break;
+ if (!view->line[view->offset + lineno].dirty)
continue;
- line->dirty = 0;
dirty = TRUE;
if (!draw_view_line(view, lineno))
break;
static void
redraw_view(struct view *view)
{
- wclear(view->win);
+ werase(view->win);
redraw_view_from(view, 0);
}
assert(view_is_displayed(view));
- if (view != VIEW(REQ_VIEW_STATUS) && (view->lines || view->pipe)) {
+ if (view != VIEW(REQ_VIEW_STATUS) && view->lines) {
unsigned int view_lines = view->offset + view->height;
unsigned int lines = view->lines
? MIN(view_lines, view->lines) * 100 / view->lines
: 0;
- string_format_from(state, &statelen, "- %s %d of %d (%d%%)",
+ string_format_from(state, &statelen, " - %s %d of %d (%d%%)",
view->ops->type,
view->lineno + 1,
view->lines,
lines);
- if (view->pipe) {
- time_t secs = time(NULL) - view->start_time;
+ }
- /* Three git seconds are a long time ... */
- if (secs > 2)
- string_format_from(state, &statelen, " %lds", secs);
- }
+ if (view->pipe) {
+ time_t secs = time(NULL) - view->start_time;
+
+ /* Three git seconds are a long time ... */
+ if (secs > 2)
+ string_format_from(state, &statelen, " loading %lds", secs);
}
string_format_from(buf, &bufpos, "[%s]", view->name);
}
if (statelen && bufpos < view->width) {
- string_format_from(buf, &bufpos, " %s", state);
+ string_format_from(buf, &bufpos, "%s", state);
}
if (view == display[current_view])
}
static void
-redraw_display(void)
+redraw_display(bool clear)
{
struct view *view;
int i;
foreach_displayed_view (view, i) {
+ if (clear)
+ wclear(view->win);
redraw_view(view);
update_view_title(view);
}
}
}
+static void
+toggle_view_option(bool *option, const char *help)
+{
+ *option = !*option;
+ redraw_display(FALSE);
+ report("%sabling %s", *option ? "En" : "Dis", help);
+}
+
/*
* Navigation
*/
static void search_view(struct view *view, enum request request);
-static bool
-find_next_line(struct view *view, unsigned long lineno, struct line *line)
+static void
+select_view_line(struct view *view, unsigned long lineno)
{
- assert(view_is_displayed(view));
-
- if (!view->ops->grep(view, line))
- return FALSE;
-
if (lineno - view->offset >= view->height) {
view->offset = lineno;
view->lineno = lineno;
- redraw_view(view);
+ if (view_is_displayed(view))
+ redraw_view(view);
} else {
unsigned long old_lineno = view->lineno - view->offset;
view->lineno = lineno;
- draw_view_line(view, old_lineno);
-
- draw_view_line(view, view->lineno - view->offset);
- redrawwin(view->win);
- wrefresh(view->win);
+ if (view_is_displayed(view)) {
+ draw_view_line(view, old_lineno);
+ draw_view_line(view, view->lineno - view->offset);
+ redrawwin(view->win);
+ wrefresh(view->win);
+ } else {
+ view->ops->select(view, &view->line[view->lineno]);
+ }
}
-
- report("Line %ld matches '%s'", lineno + 1, view->grep);
- return TRUE;
}
static void
/* Note, lineno is unsigned long so will wrap around in which case it
* will become bigger than view->lines. */
for (; lineno < view->lines; lineno += direction) {
- struct line *line = &view->line[lineno];
-
- if (find_next_line(view, lineno, line))
+ if (view->ops->grep(view, &view->line[lineno])) {
+ select_view_line(view, lineno);
+ report("Line %ld matches '%s'", lineno + 1, view->grep);
return;
+ }
}
report("No match found for '%s'", view->grep);
free(view->line[i].data);
free(view->line);
+ view->p_offset = view->offset;
+ view->p_lineno = view->lineno;
+
view->line = NULL;
view->offset = 0;
view->lines = 0;
view->lineno = 0;
- view->line_size = 0;
view->line_alloc = 0;
view->vid[0] = 0;
+ view->update_secs = 0;
}
static void
@@ -2495,28 +2616,40 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
}
static bool
-format_command(char dst[], const char *src_argv[], enum format_flags flags)
+restore_view_position(struct view *view)
{
- const char *dst_argv[SIZEOF_ARG * 2] = { NULL };
- int bufsize = 0;
- int argc;
+ if (!view->p_restore || (view->pipe && view->lines <= view->p_lineno))
+ return FALSE;
- if (!format_argv(dst_argv, src_argv, flags)) {
- free_argv(dst_argv);
+ /* Changing the view position cancels the restoring. */
+ /* FIXME: Changing back to the first line is not detected. */
+ if (view->offset != 0 || view->lineno != 0) {
+ view->p_restore = FALSE;
return FALSE;
}
- for (argc = 0; dst_argv[argc] && bufsize < SIZEOF_STR; argc++) {
- if (bufsize > 0)
- dst[bufsize++] = ' ';
- bufsize = sq_quote(dst, bufsize, dst_argv[argc]);
+ if (view->p_lineno >= view->lines) {
+ view->p_lineno = view->lines > 0 ? view->lines - 1 : 0;
+ if (view->p_offset >= view->p_lineno) {
+ unsigned long half = view->height / 2;
+
+ if (view->p_lineno > half)
+ view->p_offset = view->p_lineno - half;
+ else
+ view->p_offset = 0;
+ }
}
- if (bufsize < SIZEOF_STR)
- dst[bufsize] = 0;
- free_argv(dst_argv);
+ if (view_is_displayed(view) &&
+ view->offset != view->p_offset &&
+ view->lineno != view->p_lineno)
+ werase(view->win);
+
+ view->offset = view->p_offset;
+ view->lineno = view->p_lineno;
+ view->p_restore = FALSE;
- return src_argv[argc] == NULL && bufsize < SIZEOF_STR;
+ return TRUE;
}
static void
if (!force)
return;
set_nonblocking_input(FALSE);
+ if (force)
+ kill_io(view->pipe);
done_io(view->pipe);
view->pipe = NULL;
}
{
if (view->pipe)
end_update(view, TRUE);
- return init_io_fd(&view->io, fopen(name, "r"));
+ return io_open(&view->io, name);
}
static bool
begin_update(struct view *view, bool refresh)
{
+ if (view->pipe)
+ end_update(view, TRUE);
+
if (refresh) {
if (!start_io(&view->io))
return FALSE;
view->line = tmp;
view->line_alloc = alloc;
- view->line_size = line_size;
return view->line;
}
{
char out_buffer[BUFSIZ * 2];
char *line;
- /* The number of lines to read. If too low it will cause too much
- * redrawing (and possible flickering), if too high responsiveness
- * will suffer. */
- unsigned long lines = view->height;
- int redraw_from = -1;
+ /* Clear the view and redraw everything since the tree sorting
+ * might have rearranged things. */
+ bool redraw = view->lines == 0;
+ bool can_read = TRUE;
if (!view->pipe)
return TRUE;
- /* Only redraw if lines are visible. */
- if (view->offset + view->height >= view->lines)
- redraw_from = view->lines - view->offset;
-
- /* FIXME: This is probably not perfect for backgrounded views. */
- if (!realloc_lines(view, view->lines + lines))
- goto alloc_error;
-
- while ((line = io_gets(view->pipe))) {
- size_t linelen = strlen(line);
+ if (!io_can_read(view->pipe)) {
+ if (view->lines == 0) {
+ time_t secs = time(NULL) - view->start_time;
- if (linelen)
- line[linelen - 1] = 0;
+ if (secs > view->update_secs) {
+ if (view->update_secs == 0)
+ redraw_view(view);
+ update_view_title(view);
+ view->update_secs = secs;
+ }
+ }
+ return TRUE;
+ }
+ for (; (line = io_get(view->pipe, '\n', can_read)); can_read = FALSE) {
if (opt_iconv != ICONV_NONE) {
ICONV_CONST char *inbuf = line;
- size_t inlen = linelen;
+ size_t inlen = strlen(line) + 1;
char *outbuf = out_buffer;
size_t outlen = sizeof(out_buffer);
size_t ret;
ret = iconv(opt_iconv, &inbuf, &inlen, &outbuf, &outlen);
- if (ret != (size_t) -1) {
+ if (ret != (size_t) -1)
line = out_buffer;
- linelen = strlen(out_buffer);
- }
}
- if (!view->ops->read(view, line))
- goto alloc_error;
-
- if (lines-- == 1)
- break;
+ if (!view->ops->read(view, line)) {
+ report("Allocation failure");
+ end_update(view, TRUE);
+ return FALSE;
+ }
}
{
+ unsigned long lines = view->lines;
int digits;
- lines = view->lines;
for (digits = 0; lines; digits++)
lines /= 10;
/* Keep the displayed view in sync with line number scaling. */
if (digits != view->digits) {
view->digits = digits;
- redraw_from = 0;
+ if (opt_line_number || view == VIEW(REQ_VIEW_BLAME))
+ redraw = TRUE;
}
}
end_update(view, FALSE);
}
+ if (restore_view_position(view))
+ redraw = TRUE;
+
if (!view_is_displayed(view))
return TRUE;
- if (view == VIEW(REQ_VIEW_TREE)) {
- /* Clear the view and redraw everything since the tree sorting
- * might have rearranged things. */
- redraw_view(view);
-
- } else if (redraw_from >= 0) {
- /* If this is an incremental update, redraw the previous line
- * since for commits some members could have changed when
- * loading the main view. */
- if (redraw_from > 0)
- redraw_from--;
-
- /* Since revision graph visualization requires knowledge
- * about the parent commit, it causes a further one-off
- * needed to be redrawn for incremental updates. */
- if (redraw_from > 0 && opt_rev_graph)
- redraw_from--;
-
- /* Incrementally draw avoids flickering. */
- redraw_view_from(view, redraw_from);
- }
-
- if (view == VIEW(REQ_VIEW_BLAME))
+ if (redraw)
+ redraw_view_from(view, 0);
+ else
redraw_view_dirty(view);
/* Update the title _after_ the redraw so that if the redraw picks up a
* commit reference in view->ref it'll be available here. */
update_view_title(view);
return TRUE;
-
-alloc_error:
- report("Allocation failure");
- end_update(view, TRUE);
- return FALSE;
}
static struct line *
add_line_data(struct view *view, void *data, enum line_type type)
{
- struct line *line = &view->line[view->lines++];
+ struct line *line;
+
+ if (!realloc_lines(view, view->lines + 1))
+ return NULL;
+ line = &view->line[view->lines++];
memset(line, 0, sizeof(*line));
line->type = type;
line->data = data;
+ line->dirty = 1;
return line;
}
return data ? add_line_data(view, data, type) : NULL;
}
+static struct line *
+add_line_format(struct view *view, enum line_type type, const char *fmt, ...)
+{
+ char buf[SIZEOF_STR];
+ va_list args;
+
+ va_start(args, fmt);
+ if (vsnprintf(buf, sizeof(buf), fmt, args) >= sizeof(buf))
+ buf[0] = 0;
+ va_end(args);
+
+ return buf[0] ? add_line_text(view, buf, type) : NULL;
+}
/*
* View opening
(nviews == 1 && base_view != display[0]))
resize_display();
- if (view->pipe)
- end_update(view, TRUE);
-
if (view->ops->open) {
+ if (view->pipe)
+ end_update(view, TRUE);
if (!view->ops->open(view)) {
report("Failed to load %s view", view->name);
return;
}
+ restore_view_position(view);
} else if ((reload || strcmp(view->vid, view->id)) &&
!begin_update(view, flags & (OPEN_REFRESH | OPEN_PREPARED))) {
/* Clear the old view and let the incremental updating refill
* the screen. */
werase(view->win);
+ view->p_restore = flags & (OPEN_RELOAD | OPEN_REFRESH);
report("");
} else if (view_is_displayed(view)) {
redraw_view(view);
fprintf(stderr, "Press Enter to continue");
getc(opt_tty);
reset_prog_mode();
- redraw_display();
+ redraw_display(TRUE);
}
static void
{
const char *mergetool_argv[] = { "git", "mergetool", file, NULL };
- open_external_viewer(mergetool_argv, NULL);
+ open_external_viewer(mergetool_argv, opt_cdup);
}
static void
break;
case REQ_TOGGLE_LINENO:
- opt_line_number = !opt_line_number;
- redraw_display();
+ toggle_view_option(&opt_line_number, "line numbers");
break;
case REQ_TOGGLE_DATE:
- opt_date = !opt_date;
- redraw_display();
+ toggle_view_option(&opt_date, "date display");
break;
case REQ_TOGGLE_AUTHOR:
- opt_author = !opt_author;
- redraw_display();
+ toggle_view_option(&opt_author, "author display");
break;
case REQ_TOGGLE_REV_GRAPH:
- opt_rev_graph = !opt_rev_graph;
- redraw_display();
+ toggle_view_option(&opt_rev_graph, "revision graph display");
break;
case REQ_TOGGLE_REFS:
- opt_show_refs = !opt_show_refs;
- redraw_display();
+ toggle_view_option(&opt_show_refs, "reference display");
break;
case REQ_SEARCH:
report("tig-%s (built %s)", TIG_VERSION, __DATE__);
return TRUE;
- case REQ_SCREEN_RESIZE:
- resize_display();
- /* Fall-through */
case REQ_SCREEN_REDRAW:
- redraw_display();
+ redraw_display(TRUE);
break;
case REQ_EDIT:
display[current_view] = view->parent;
view->parent = view;
resize_display();
- redraw_display();
+ redraw_display(FALSE);
report("");
break;
}
}
+/*
+ * View backend utilities
+ */
+
+/* Parse author lines where the name may be empty:
+ * author <email@address.tld> 1138474660 +0100
+ */
+static void
+parse_author_line(char *ident, char *author, size_t authorsize, struct tm *tm)
+{
+ char *nameend = strchr(ident, '<');
+ char *emailend = strchr(ident, '>');
+
+ if (nameend && emailend)
+ *nameend = *emailend = 0;
+ ident = chomp_string(ident);
+ if (!*ident) {
+ if (nameend)
+ ident = chomp_string(nameend + 1);
+ if (!*ident)
+ ident = "Unknown";
+ }
+
+ string_ncopy_do(author, authorsize, ident, strlen(ident));
+
+ /* Parse epoch and timezone */
+ if (emailend && emailend[1] == ' ') {
+ char *secs = emailend + 2;
+ char *zone = strchr(secs, ' ');
+ time_t time = (time_t) atol(secs);
+
+ if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
+ long tz;
+
+ zone++;
+ tz = ('0' - zone[1]) * 60 * 60 * 10;
+ tz += ('0' - zone[2]) * 60 * 60;
+ tz += ('0' - zone[3]) * 60;
+ tz += ('0' - zone[4]) * 60;
+
+ if (zone[0] == '-')
+ tz = -tz;
+
+ time -= tz;
+ }
+
+ gmtime_r(&time, tm);
+ }
+}
+
/*
* Pager backend
*/
if (bufpos == 0)
return;
- if (!realloc_lines(view, view->line_size + 1))
- return;
-
add_line_text(view, buf, LINE_PP_REFS);
}
static bool
help_open(struct view *view)
{
- char buf[BUFSIZ];
int lines = ARRAY_SIZE(req_info) + 2;
int i;
if (!*key)
key = "(no key defined)";
- if (!string_format(buf, " %-25s %s", key, req_info[i].help))
- continue;
-
- add_line_text(view, buf, LINE_DEFAULT);
+ add_line_format(view, LINE_DEFAULT, " %-25s %s",
+ key, req_info[i].help);
}
if (run_requests) {
argc ? " " : "", req->argv[argc]))
return REQ_NONE;
- if (!string_format(buf, " %-10s %-14s `%s`",
- keymap_table[req->keymap].name, key, cmd))
- continue;
-
- add_line_text(view, buf, LINE_DEFAULT);
+ add_line_format(view, LINE_DEFAULT, " %-10s %-14s `%s`",
+ keymap_table[req->keymap].name, key, cmd);
}
return TRUE;
#define SIZEOF_TREE_ATTR \
STRING_SIZE("100644 blob ed09fe897f3c7c9af90bcf80cae92558ea88ae38\t")
-#define TREE_UP_FORMAT "040000 tree %s\t.."
+#define SIZEOF_TREE_MODE \
+ STRING_SIZE("100644 ")
-static int
-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 -1;
- return 1;
- }
+#define TREE_ID_OFFSET \
+ STRING_SIZE("100644 blob ")
- return strcmp(name1, name2);
-}
+struct tree_entry {
+ char id[SIZEOF_REV];
+ mode_t mode;
+ struct tm time; /* Date from the author ident. */
+ char author[75]; /* Author of the commit. */
+ char name[1];
+};
static const char *
tree_path(struct line *line)
{
- const char *path = line->data;
+ return ((struct tree_entry *) line->data)->name;
+}
+
+
+static int
+tree_compare_entry(struct line *line1, struct line *line2)
+{
+ if (line1->type != line2->type)
+ return line1->type == LINE_TREE_DIR ? -1 : 1;
+ return strcmp(tree_path(line1), tree_path(line2));
+}
+
+static struct line *
+tree_entry(struct view *view, enum line_type type, const char *path,
+ const char *mode, const char *id)
+{
+ struct tree_entry *entry = calloc(1, sizeof(*entry) + strlen(path));
+ struct line *line = entry ? add_line_data(view, entry, type) : NULL;
+
+ if (!entry || !line) {
+ free(entry);
+ return NULL;
+ }
+
+ strncpy(entry->name, path, strlen(path));
+ if (mode)
+ entry->mode = strtoul(mode, NULL, 8);
+ if (id)
+ string_copy_rev(entry->id, id);
- return path + SIZEOF_TREE_ATTR;
+ return line;
}
static bool
-tree_read(struct view *view, char *text)
+tree_read_date(struct view *view, char *text, bool *read_date)
{
- size_t textlen = text ? strlen(text) : 0;
- char buf[SIZEOF_STR];
- unsigned long pos;
- enum line_type type;
- bool first_read = view->lines == 0;
+ static char author_name[SIZEOF_STR];
+ static struct tm author_time;
- if (!text)
+ if (!text && *read_date) {
+ *read_date = FALSE;
return TRUE;
- if (textlen <= SIZEOF_TREE_ATTR)
+
+ } else if (!text) {
+ char *path = *opt_path ? opt_path : ".";
+ /* Find next entry to process */
+ const char *log_file[] = {
+ "git", "log", "--no-color", "--pretty=raw",
+ "--cc", "--raw", view->id, "--", path, NULL
+ };
+ struct io io = {};
+
+ if (!run_io_rd(&io, log_file, FORMAT_NONE)) {
+ report("Failed to load tree data");
+ return TRUE;
+ }
+
+ done_io(view->pipe);
+ view->io = io;
+ *read_date = TRUE;
return FALSE;
- type = text[STRING_SIZE("100644 ")] == 't'
- ? LINE_TREE_DIR : LINE_TREE_FILE;
+ } else if (*text == 'a' && get_line_type(text) == LINE_AUTHOR) {
+ parse_author_line(text + STRING_SIZE("author "),
+ author_name, sizeof(author_name), &author_time);
- if (first_read) {
- /* Add path info line */
- if (!string_format(buf, "Directory path /%s", opt_path) ||
- !realloc_lines(view, view->line_size + 1) ||
- !add_line_text(view, buf, LINE_DEFAULT))
- return FALSE;
+ } else if (*text == ':') {
+ char *pos;
+ size_t annotated = 1;
+ size_t i;
- /* Insert "link" to parent directory. */
- if (*opt_path) {
- if (!string_format(buf, TREE_UP_FORMAT, view->ref) ||
- !realloc_lines(view, view->line_size + 1) ||
- !add_line_text(view, buf, LINE_TREE_DIR))
- return FALSE;
+ pos = strchr(text, '\t');
+ if (!pos)
+ return TRUE;
+ text = pos + 1;
+ if (*opt_prefix && !strncmp(text, opt_prefix, strlen(opt_prefix)))
+ text += strlen(opt_prefix);
+ if (*opt_path && !strncmp(text, opt_path, strlen(opt_path)))
+ text += strlen(opt_path);
+ pos = strchr(text, '/');
+ if (pos)
+ *pos = 0;
+
+ for (i = 1; i < view->lines; i++) {
+ struct line *line = &view->line[i];
+ struct tree_entry *entry = line->data;
+
+ annotated += !!*entry->author;
+ if (*entry->author || strcmp(entry->name, text))
+ continue;
+
+ string_copy(entry->author, author_name);
+ memcpy(&entry->time, &author_time, sizeof(entry->time));
+ line->dirty = 1;
+ break;
}
+
+ if (annotated == view->lines)
+ kill_io(view->pipe);
}
+ return TRUE;
+}
+
+static bool
+tree_read(struct view *view, char *text)
+{
+ static bool read_date = FALSE;
+ struct tree_entry *data;
+ struct line *entry, *line;
+ enum line_type type;
+ size_t textlen = text ? strlen(text) : 0;
+ char *path = text + SIZEOF_TREE_ATTR;
+
+ if (read_date || !text)
+ return tree_read_date(view, text, &read_date);
+
+ if (textlen <= SIZEOF_TREE_ATTR)
+ return FALSE;
+ if (view->lines == 0 &&
+ !tree_entry(view, LINE_TREE_PARENT, opt_path, NULL, NULL))
+ return FALSE;
/* Strip the path part ... */
if (*opt_path) {
size_t pathlen = textlen - SIZEOF_TREE_ATTR;
size_t striplen = strlen(opt_path);
- char *path = text + SIZEOF_TREE_ATTR;
if (pathlen > striplen)
memmove(path, path + striplen,
pathlen - striplen + 1);
+
+ /* Insert "link" to parent directory. */
+ if (view->lines == 1 &&
+ !tree_entry(view, LINE_TREE_DIR, "..", "040000", view->ref))
+ return FALSE;
}
- /* Skip "Directory ..." and ".." line. */
- for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
- struct line *line = &view->line[pos];
- const char *path1 = tree_path(line);
- char *path2 = text + SIZEOF_TREE_ATTR;
- int cmp = tree_compare_entry(line->type, path1, type, path2);
+ type = text[SIZEOF_TREE_MODE] == 't' ? LINE_TREE_DIR : LINE_TREE_FILE;
+ entry = tree_entry(view, type, path, text, text + TREE_ID_OFFSET);
+ if (!entry)
+ return FALSE;
+ data = entry->data;
- if (cmp <= 0)
+ /* Skip "Directory ..." and ".." line. */
+ for (line = &view->line[1 + !!*opt_path]; line < entry; line++) {
+ if (tree_compare_entry(line, entry) <= 0)
continue;
- text = strdup(text);
- if (!text)
- return FALSE;
+ memmove(line + 1, line, (entry - line) * sizeof(*entry));
- if (view->lines > pos)
- memmove(&view->line[pos + 1], &view->line[pos],
- (view->lines - pos) * sizeof(*line));
-
- line = &view->line[pos];
- line->data = text;
+ line->data = data;
line->type = type;
- view->lines++;
+ for (; line <= entry; line++)
+ line->dirty = line->cleareol = 1;
return TRUE;
}
- if (!add_line_text(view, text, type))
- return FALSE;
-
if (tree_lineno > view->lineno) {
view->lineno = tree_lineno;
tree_lineno = 0;
return TRUE;
}
+static bool
+tree_draw(struct view *view, struct line *line, unsigned int lineno)
+{
+ struct tree_entry *entry = line->data;
+
+ if (line->type == LINE_TREE_PARENT) {
+ if (draw_text(view, line->type, "Directory path /", TRUE))
+ return TRUE;
+ } else {
+ char mode[11] = "-r--r--r--";
+
+ if (S_ISDIR(entry->mode)) {
+ mode[3] = mode[6] = mode[9] = 'x';
+ mode[0] = 'd';
+ }
+ if (S_ISLNK(entry->mode))
+ mode[0] = 'l';
+ if (entry->mode & S_IWUSR)
+ mode[2] = 'w';
+ if (entry->mode & S_IXUSR)
+ mode[3] = 'x';
+ if (entry->mode & S_IXGRP)
+ mode[6] = 'x';
+ if (entry->mode & S_IXOTH)
+ mode[9] = 'x';
+ if (draw_field(view, LINE_TREE_MODE, mode, 11, TRUE))
+ return TRUE;
+
+ if (opt_author &&
+ draw_field(view, LINE_MAIN_AUTHOR, entry->author, opt_author_cols, TRUE))
+ return TRUE;
+
+ if (opt_date && draw_date(view, *entry->author ? &entry->time : NULL))
+ return TRUE;
+ }
+ if (draw_text(view, line->type, entry->name, TRUE))
+ return TRUE;
+ return TRUE;
+}
+
+static void
+open_blob_editor()
+{
+ char file[SIZEOF_STR] = "/tmp/tigblob.XXXXXX";
+ int fd = mkstemp(file);
+
+ if (fd == -1)
+ report("Failed to create temporary file");
+ else if (!run_io_append(blob_ops.argv, FORMAT_ALL, fd))
+ report("Failed to save blob data to file");
+ else
+ open_editor(FALSE, file);
+ if (fd != -1)
+ unlink(file);
+}
+
static enum request
tree_request(struct view *view, enum request request, struct line *line)
{
if (line->type != LINE_TREE_FILE) {
report("Edit only supported for files");
} else if (!is_head_commit(view->vid)) {
- report("Edit only supported for files in the current work tree");
+ open_blob_editor();
} else {
open_editor(TRUE, opt_file);
}
return REQ_NONE;
- case REQ_TREE_PARENT:
+ case REQ_PARENT:
if (!*opt_path) {
/* quit view if at top of tree */
return REQ_VIEW_CLOSE;
break;
default:
- return TRUE;
+ return REQ_NONE;
}
open_view(view, request, flags);
- if (request == REQ_VIEW_TREE) {
+ if (request == REQ_VIEW_TREE)
view->lineno = tree_lineno;
- }
return REQ_NONE;
}
static void
tree_select(struct view *view, struct line *line)
{
- char *text = (char *)line->data + STRING_SIZE("100644 blob ");
+ struct tree_entry *entry = line->data;
if (line->type == LINE_TREE_FILE) {
- string_copy_rev(ref_blob, text);
+ string_copy_rev(ref_blob, entry->id);
string_format(opt_file, "%s%s", opt_path, tree_path(line));
} else if (line->type != LINE_TREE_DIR) {
return;
}
- string_copy_rev(view->ref, text);
+ string_copy_rev(view->ref, entry->id);
}
static const char *tree_argv[SIZEOF_ARG] = {
tree_argv,
NULL,
tree_read,
- pager_draw,
+ tree_draw,
tree_request,
pager_grep,
tree_select,
return add_line_text(view, line, LINE_DEFAULT) != NULL;
}
+static enum request
+blob_request(struct view *view, enum request request, struct line *line)
+{
+ switch (request) {
+ case REQ_EDIT:
+ open_blob_editor();
+ return REQ_NONE;
+ default:
+ return pager_request(view, request, line);
+ }
+}
+
static const char *blob_argv[SIZEOF_ARG] = {
"git", "cat-file", "blob", "%(blob)", NULL
};
NULL,
blob_read,
pager_draw,
- pager_request,
+ blob_request,
pager_grep,
pager_select,
};
char author[75]; /* Author of the commit. */
struct tm time; /* Date from the author ident. */
char filename[128]; /* Name of file. */
+ bool has_previous; /* Was a "previous" line detected. */
};
struct blame {
static bool
blame_open(struct view *view)
{
- if (*opt_ref || !init_io_fd(&view->io, fopen(opt_file, "r"))) {
+ if (*opt_ref || !io_open(&view->io, opt_file)) {
if (!run_io_rd(&view->io, blame_cat_file_argv, FORMAT_ALL))
return FALSE;
}
if (!commit) {
commit = parse_blame_commit(view, line, &blamed);
string_format(view->ref, "%s %2d%%", view->vid,
- blamed * 100 / view->lines);
+ view->lines ? blamed * 100 / view->lines : 0);
} else if (match_blame_header("author ", &line)) {
string_ncopy(commit->author, line, strlen(line));
} else if (match_blame_header("summary ", &line)) {
string_ncopy(commit->title, line, strlen(line));
+ } else if (match_blame_header("previous ", &line)) {
+ commit->has_previous = TRUE;
+
} else if (match_blame_header("filename ", &line)) {
string_ncopy(commit->filename, line, strlen(line));
commit = NULL;
return TRUE;
}
+static bool
+check_blame_commit(struct blame *blame)
+{
+ if (!blame->commit)
+ report("Commit data not loaded yet");
+ else if (!strcmp(blame->commit->id, NULL_ID))
+ report("No commit exist for the selected line");
+ else
+ return TRUE;
+ return FALSE;
+}
+
static enum request
blame_request(struct view *view, enum request request, struct line *line)
{
switch (request) {
case REQ_VIEW_BLAME:
- if (!blame->commit || !strcmp(blame->commit->id, NULL_ID)) {
- report("Commit ID unknown");
- break;
+ if (check_blame_commit(blame)) {
+ string_copy(opt_ref, blame->commit->id);
+ open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH);
}
- string_copy(opt_ref, blame->commit->id);
- open_view(view, REQ_VIEW_BLAME, OPEN_REFRESH);
- return request;
+ break;
case REQ_ENTER:
if (!blame->commit) {
if (!strcmp(blame->commit->id, NULL_ID)) {
struct view *diff = VIEW(REQ_VIEW_DIFF);
const char *diff_index_argv[] = {
- "git", "diff-index", "--root", "--cached",
- "--patch-with-stat", "-C", "-M",
- "HEAD", "--", view->vid, NULL
+ "git", "diff-index", "--root", "--patch-with-stat",
+ "-C", "-M", "HEAD", "--", view->vid, NULL
};
+ if (!blame->commit->has_previous) {
+ diff_index_argv[1] = "diff";
+ diff_index_argv[2] = "--no-color";
+ diff_index_argv[6] = "--";
+ diff_index_argv[7] = "/dev/null";
+ }
+
if (!prepare_update(diff, diff_index_argv, NULL, FORMAT_DASH)) {
report("Failed to allocate diff command");
break;
}
open_view(view, REQ_VIEW_DIFF, flags);
+ if (VIEW(REQ_VIEW_DIFF)->pipe && !strcmp(blame->commit->id, NULL_ID))
+ string_copy_rev(VIEW(REQ_VIEW_DIFF)->ref, NULL_ID);
break;
default:
const char *new_rev = buf + 56;
const char *status = buf + 97;
- if (bufsize < 99 ||
+ if (bufsize < 98 ||
old_mode[-1] != ':' ||
new_mode[-1] != ' ' ||
old_rev[-1] != ' ' ||
}
static bool
-status_run(struct view *view, const char cmd[], char status, enum line_type type)
+status_run(struct view *view, const char *argv[], char status, enum line_type type)
{
struct status *file = NULL;
struct status *unmerged = NULL;
- char buf[SIZEOF_STR * 4];
- size_t bufsize = 0;
- FILE *pipe;
+ char *buf;
+ struct io io = {};
- pipe = popen(cmd, "r");
- if (!pipe)
+ if (!run_io(&io, argv, NULL, IO_RD))
return FALSE;
add_line_data(view, NULL, type);
- while (!feof(pipe) && !ferror(pipe)) {
- char *sep;
- size_t readsize;
+ while ((buf = io_get(&io, 0, TRUE))) {
+ if (!file) {
+ file = calloc(1, sizeof(*file));
+ if (!file || !add_line_data(view, file, type))
+ goto error_out;
+ }
- readsize = fread(buf + bufsize, 1, sizeof(buf) - bufsize, pipe);
- if (!readsize)
- break;
- bufsize += readsize;
+ /* Parse diff info part. */
+ if (status) {
+ file->status = status;
+ if (status == 'A')
+ string_copy(file->old.rev, NULL_ID);
- /* Process while we have NUL chars. */
- while ((sep = memchr(buf, 0, bufsize))) {
- size_t sepsize = sep - buf + 1;
+ } else if (!file->status) {
+ if (!status_get_diff(file, buf, strlen(buf)))
+ goto error_out;
- if (!file) {
- if (!realloc_lines(view, view->line_size + 1))
- goto error_out;
+ buf = io_get(&io, 0, TRUE);
+ if (!buf)
+ break;
- file = calloc(1, sizeof(*file));
- if (!file)
- goto error_out;
+ /* Collapse all 'M'odified entries that follow a
+ * associated 'U'nmerged entry. */
+ if (file->status == 'U') {
+ unmerged = file;
- add_line_data(view, file, type);
- }
+ } else if (unmerged) {
+ int collapse = !strcmp(buf, unmerged->new.name);
- /* Parse diff info part. */
- if (status) {
- file->status = status;
- if (status == 'A')
- string_copy(file->old.rev, NULL_ID);
-
- } else if (!file->status) {
- if (!status_get_diff(file, buf, sepsize))
- goto error_out;
-
- bufsize -= sepsize;
- memmove(buf, sep + 1, bufsize);
-
- sep = memchr(buf, 0, bufsize);
- if (!sep)
- break;
- sepsize = sep - buf + 1;
-
- /* Collapse all 'M'odified entries that
- * follow a associated 'U'nmerged entry.
- */
- if (file->status == 'U') {
- unmerged = file;
-
- } else if (unmerged) {
- int collapse = !strcmp(buf, unmerged->new.name);
-
- unmerged = NULL;
- if (collapse) {
- free(file);
- view->lines--;
- continue;
- }
+ unmerged = NULL;
+ if (collapse) {
+ free(file);
+ file = NULL;
+ view->lines--;
+ continue;
}
}
+ }
- /* Grab the old name for rename/copy. */
- if (!*file->old.name &&
- (file->status == 'R' || file->status == 'C')) {
- sepsize = sep - buf + 1;
- string_ncopy(file->old.name, buf, sepsize);
- bufsize -= sepsize;
- memmove(buf, sep + 1, bufsize);
-
- sep = memchr(buf, 0, bufsize);
- if (!sep)
- break;
- sepsize = sep - buf + 1;
- }
+ /* Grab the old name for rename/copy. */
+ if (!*file->old.name &&
+ (file->status == 'R' || file->status == 'C')) {
+ string_ncopy(file->old.name, buf, strlen(buf));
- /* git-ls-files just delivers a NUL separated
- * list of file names similar to the second half
- * of the git-diff-* output. */
- string_ncopy(file->new.name, buf, sepsize);
- if (!*file->old.name)
- string_copy(file->old.name, file->new.name);
- bufsize -= sepsize;
- memmove(buf, sep + 1, bufsize);
- file = NULL;
+ buf = io_get(&io, 0, TRUE);
+ if (!buf)
+ break;
}
+
+ /* git-ls-files just delivers a NUL separated list of
+ * file names similar to the second half of the
+ * git-diff-* output. */
+ string_ncopy(file->new.name, buf, strlen(buf));
+ if (!*file->old.name)
+ string_copy(file->old.name, file->new.name);
+ file = NULL;
}
- if (ferror(pipe)) {
+ if (io_error(&io)) {
error_out:
- pclose(pipe);
+ done_io(&io);
return FALSE;
}
if (!view->line[view->lines - 1].data)
add_line_data(view, NULL, LINE_STAT_NONE);
- pclose(pipe);
+ done_io(&io);
return TRUE;
}
/* Don't show unmerged entries in the staged section. */
-#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached -M HEAD"
-#define STATUS_DIFF_FILES_CMD "git diff-files -z"
-#define STATUS_LIST_OTHER_CMD \
- "git ls-files -z --others --exclude-standard"
-#define STATUS_LIST_NO_HEAD_CMD \
- "git ls-files -z --cached --exclude-standard"
+static const char *status_diff_index_argv[] = {
+ "git", "diff-index", "-z", "--diff-filter=ACDMRTXB",
+ "--cached", "-M", "HEAD", NULL
+};
+
+static const char *status_diff_files_argv[] = {
+ "git", "diff-files", "-z", NULL
+};
+
+static const char *status_list_other_argv[] = {
+ "git", "ls-files", "-z", "--others", "--exclude-standard", NULL
+};
+
+static const char *status_list_no_head_argv[] = {
+ "git", "ls-files", "-z", "--cached", "--exclude-standard", NULL
+};
static const char *update_index_argv[] = {
"git", "update-index", "-q", "--unmerged", "--refresh", NULL
};
+/* Restore the previous line number to stay in the context or select a
+ * line with something that can be updated. */
+static void
+status_restore(struct view *view)
+{
+ if (view->p_lineno >= view->lines)
+ view->p_lineno = view->lines - 1;
+ while (view->p_lineno < view->lines && !view->line[view->p_lineno].data)
+ view->p_lineno++;
+ while (view->p_lineno > 0 && !view->line[view->p_lineno].data)
+ view->p_lineno--;
+
+ /* If the above fails, always skip the "On branch" line. */
+ if (view->p_lineno < view->lines)
+ view->lineno = view->p_lineno;
+ else
+ 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;
+
+ view->p_restore = FALSE;
+}
+
/* 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)
{
- unsigned long prev_lineno = view->lineno;
-
reset_view(view);
- if (!realloc_lines(view, view->line_size + 7))
- return FALSE;
-
add_line_data(view, NULL, LINE_STAT_HEAD);
if (is_initial_commit())
string_copy(status_onbranch, "Initial commit");
else if (!string_format(status_onbranch, "On branch %s", opt_head))
return FALSE;
- system("git update-index -q --refresh >/dev/null 2>/dev/null");
+ run_io_bg(update_index_argv);
if (is_initial_commit()) {
- if (!status_run(view, STATUS_LIST_NO_HEAD_CMD, 'A', LINE_STAT_STAGED))
+ if (!status_run(view, status_list_no_head_argv, 'A', LINE_STAT_STAGED))
return FALSE;
- } else if (!status_run(view, STATUS_DIFF_INDEX_CMD, 0, LINE_STAT_STAGED)) {
+ } else if (!status_run(view, status_diff_index_argv, 0, LINE_STAT_STAGED)) {
return FALSE;
}
- if (!status_run(view, STATUS_DIFF_FILES_CMD, 0, LINE_STAT_UNSTAGED) ||
- !status_run(view, STATUS_LIST_OTHER_CMD, '?', LINE_STAT_UNTRACKED))
+ if (!status_run(view, status_diff_files_argv, 0, LINE_STAT_UNSTAGED) ||
+ !status_run(view, status_list_other_argv, '?', LINE_STAT_UNTRACKED))
return FALSE;
- /* If all went well restore the previous line number to stay in
- * the context or select a line with something that can be
- * updated. */
- if (prev_lineno >= view->lines)
- prev_lineno = view->lines - 1;
- while (prev_lineno < view->lines && !view->line[prev_lineno].data)
- prev_lineno++;
- 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 = 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;
-
+ /* Restore the exact position or use the specialized restore
+ * mode? */
+ if (!view->p_restore)
+ status_restore(view);
return TRUE;
}
}
split = view_is_displayed(view) ? OPEN_SPLIT : 0;
- open_view(view, REQ_VIEW_STAGE, OPEN_REFRESH | split);
+ open_view(view, REQ_VIEW_STAGE, OPEN_PREPARED | split);
if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
if (status) {
stage_status = *status;
status_exists(struct status *status, enum line_type type)
{
struct view *view = VIEW(REQ_VIEW_STATUS);
- struct line *line;
+ unsigned long lineno;
- for (line = view->line; line < view->line + view->lines; line++) {
+ for (lineno = 0; lineno < view->lines; lineno++) {
+ struct line *line = &view->line[lineno];
struct status *pos = line->data;
- if (line->type == type && pos &&
- !strcmp(status->new.name, pos->new.name))
+ if (line->type != type)
+ continue;
+ if (!pos && (!status || !status->status) && line[1].data) {
+ select_view_line(view, lineno);
return TRUE;
+ }
+ if (pos && !strcmp(status->new.name, pos->new.name)) {
+ select_view_line(view, lineno);
+ return TRUE;
+ }
}
return FALSE;
}
-static FILE *
-status_update_prepare(enum line_type type)
+static bool
+status_update_prepare(struct io *io, enum line_type type)
{
- char cmd[SIZEOF_STR];
- size_t cmdsize = 0;
-
- if (opt_cdup[0] &&
- type != LINE_STAT_UNTRACKED &&
- !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
- return NULL;
+ const char *staged_argv[] = {
+ "git", "update-index", "-z", "--index-info", NULL
+ };
+ const char *others_argv[] = {
+ "git", "update-index", "-z", "--add", "--remove", "--stdin", NULL
+ };
switch (type) {
case LINE_STAT_STAGED:
- string_add(cmd, cmdsize, "git update-index -z --index-info");
- break;
+ return run_io(io, staged_argv, opt_cdup, IO_WR);
case LINE_STAT_UNSTAGED:
+ return run_io(io, others_argv, opt_cdup, IO_WR);
+
case LINE_STAT_UNTRACKED:
- string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
- break;
+ return run_io(io, others_argv, NULL, IO_WR);
default:
die("line type %d not handled in switch", type);
+ return FALSE;
}
-
- return popen(cmd, "w");
}
static bool
-status_update_write(FILE *pipe, struct status *status, enum line_type type)
+status_update_write(struct io *io, 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:
die("line type %d not handled in switch", type);
}
- while (!ferror(pipe) && written < bufsize) {
- written += fwrite(buf + written, 1, bufsize - written, pipe);
- }
-
- return written == bufsize;
+ return io_write(io, buf, bufsize);
}
static bool
status_update_file(struct status *status, enum line_type type)
{
- FILE *pipe = status_update_prepare(type);
+ struct io io = {};
bool result;
- if (!pipe)
+ if (!status_update_prepare(&io, type))
return FALSE;
- result = status_update_write(pipe, status, type);
- pclose(pipe);
+ result = status_update_write(&io, status, type);
+ done_io(&io);
return result;
}
static bool
status_update_files(struct view *view, struct line *line)
{
- FILE *pipe = status_update_prepare(line->type);
+ struct io io = {};
bool result = TRUE;
struct line *pos = view->line + view->lines;
int files = 0;
int file, done;
- if (!pipe)
+ if (!status_update_prepare(&io, line->type))
return FALSE;
for (pos = line; pos < view->line + view->lines && pos->data; pos++)
file, files, done);
update_view_title(view);
}
- result = status_update_write(pipe, line->data, line->type);
+ result = status_update_write(&io, line->data, line->type);
}
- pclose(pipe);
+ done_io(&io);
return result;
}
return request;
}
+ VIEW(REQ_VIEW_STATUS)->p_restore = TRUE;
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))
+ if (!status_exists(&stage_status, stage_line_type)) {
+ status_restore(VIEW(REQ_VIEW_STATUS));
return REQ_VIEW_CLOSE;
+ }
if (stage_line_type == LINE_STAT_UNTRACKED) {
if (!suffixcmp(stage_status.new.name, -1, "/")) {
}
static void
-update_rev_graph(struct rev_graph *graph)
+update_rev_graph(struct view *view, struct rev_graph *graph)
{
/* If this is the finalizing update ... */
if (graph->commit)
if (!graph->prev->commit)
return;
+ if (view->lines > 2)
+ view->line[view->lines - 3].dirty = 1;
+ if (view->lines > 1)
+ view->line[view->lines - 2].dirty = 1;
draw_rev_graph(graph->prev);
done_rev_graph(graph->prev->prev);
}
die("No revisions match the given arguments.");
if (view->lines > 0) {
commit = view->line[view->lines - 1].data;
+ view->line[view->lines - 1].dirty = 1;
if (!*commit->author) {
view->lines--;
free(commit);
graph->commit = NULL;
}
}
- update_rev_graph(graph);
+ update_rev_graph(view, graph);
for (i = 0; i < ARRAY_SIZE(graph_stacks); i++)
clear_rev_graph(&graph_stacks[i]);
break;
case LINE_AUTHOR:
- {
- /* Parse author lines where the name may be empty:
- * author <email@address.tld> 1138474660 +0100
- */
- char *ident = line + STRING_SIZE("author ");
- char *nameend = strchr(ident, '<');
- char *emailend = strchr(ident, '>');
-
- if (!nameend || !emailend)
- break;
-
- update_rev_graph(graph);
+ parse_author_line(line + STRING_SIZE("author "),
+ commit->author, sizeof(commit->author),
+ &commit->time);
+ update_rev_graph(view, graph);
graph = graph->next;
-
- *nameend = *emailend = 0;
- ident = chomp_string(ident);
- if (!*ident) {
- ident = chomp_string(nameend + 1);
- if (!*ident)
- ident = "Unknown";
- }
-
- string_ncopy(commit->author, ident, strlen(ident));
-
- /* Parse epoch and timezone */
- if (emailend[1] == ' ') {
- char *secs = emailend + 2;
- char *zone = strchr(secs, ' ');
- time_t time = (time_t) atol(secs);
-
- if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
- long tz;
-
- zone++;
- tz = ('0' - zone[1]) * 60 * 60 * 10;
- tz += ('0' - zone[2]) * 60 * 60;
- tz += ('0' - zone[3]) * 60;
- tz += ('0' - zone[4]) * 60;
-
- if (zone[0] == '-')
- tz = -tz;
-
- time -= tz;
- }
-
- gmtime_r(&time, &commit->time);
- }
break;
- }
+
default:
/* Fill in the commit title if it has not already been set. */
if (commit->title[0])
* shortened titles, etc. */
string_ncopy(commit->title, line, strlen(line));
+ view->line[view->lines - 1].dirty = 1;
}
return TRUE;
}
}
-static bool
-prompt_yesno(const char *prompt)
+static int
+get_input(bool prompting)
{
- enum { WAIT, STOP, CANCEL } status = WAIT;
- bool answer = FALSE;
-
- while (status == WAIT) {
- struct view *view;
- int i, key;
+ struct view *view;
+ int i, key;
+ if (prompting)
input_mode = TRUE;
+ while (true) {
foreach_view (view, i)
update_view(view);
- input_mode = FALSE;
+ /* Refresh, accept single keystroke of input */
+ key = wgetch(status_win);
+
+ /* wgetch() with nodelay() enabled returns ERR when
+ * there's no input. */
+ if (key == ERR) {
+ doupdate();
+
+ } else if (key == KEY_RESIZE) {
+ int height, width;
+
+ getmaxyx(stdscr, height, width);
+
+ /* Resize the status view and let the view driver take
+ * care of resizing the displayed views. */
+ resize_display();
+ redraw_display(TRUE);
+ wresize(status_win, 1, width);
+ mvwin(status_win, height - 1, 0);
+ wrefresh(status_win);
+
+ } else {
+ input_mode = FALSE;
+ return key;
+ }
+ }
+}
+
+static bool
+prompt_yesno(const char *prompt)
+{
+ enum { WAIT, STOP, CANCEL } status = WAIT;
+ bool answer = FALSE;
+
+ while (status == WAIT) {
+ int key;
mvwprintw(status_win, 0, 0, "%s [Yy]/[Nn]", prompt);
wclrtoeol(status_win);
- /* Refresh, accept single keystroke of input */
- key = wgetch(status_win);
+ key = get_input(TRUE);
switch (key) {
- case ERR:
- break;
-
case 'y':
case 'Y':
answer = TRUE;
int pos = 0;
while (status == READING) {
- struct view *view;
- int i, key;
-
- input_mode = TRUE;
-
- foreach_view (view, i)
- update_view(view);
-
- input_mode = FALSE;
+ int key;
mvwprintw(status_win, 0, 0, "%s%.*s", prompt, pos, buf);
wclrtoeol(status_win);
- /* Refresh, accept single keystroke of input */
- key = wgetch(status_win);
+ key = get_input(TRUE);
switch (key) {
case KEY_RETURN:
case KEY_ENTER:
status = CANCEL;
break;
- case ERR:
- break;
-
default:
if (pos >= sizeof(buf)) {
report("Input string too long");
* the option else either "true" or "false" is printed.
* Default to true for the unknown case. */
opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
- } else {
+
+ } else if (*name == '.') {
string_ncopy(opt_cdup, name, namelen);
+
+ } else {
+ string_ncopy(opt_prefix, name, namelen);
}
return OK;
};
const char *rev_parse_argv[] = {
"git", "rev-parse", "--git-dir", "--is-inside-work-tree",
- "--show-cdup", NULL
+ "--show-cdup", "--show-prefix", NULL
};
if (run_io_buf(head_argv, opt_head, sizeof(opt_head))) {
if (!start_io(io))
return ERR;
- while (state == OK && (name = io_gets(io))) {
+ while (state == OK && (name = io_get(io, '\n', TRUE))) {
char *value;
size_t namelen;
size_t valuelen;
if (request == REQ_VIEW_PAGER || run_argv) {
if (request == REQ_VIEW_PAGER)
- init_io_fd(&VIEW(request)->io, stdin);
+ io_open(&VIEW(request)->io, "");
else if (!prepare_update(VIEW(request), run_argv, NULL, FORMAT_NONE))
die("Failed to format arguments");
open_view(NULL, request, OPEN_PREPARED);
}
while (view_driver(display[current_view], request)) {
- int key;
- int i;
+ int key = get_input(FALSE);
- foreach_view (view, i)
- update_view(view);
view = display[current_view];
-
- /* Refresh, accept single keystroke of input */
- key = wgetch(status_win);
-
- /* wgetch() with nodelay() enabled returns ERR when there's no
- * input. */
- if (key == ERR) {
- request = REQ_NONE;
- continue;
- }
-
request = get_keybinding(view->keymap, key);
/* Some low-level request handling. This keeps access to
request = REQ_NONE;
break;
}
- case REQ_SCREEN_RESIZE:
- {
- int height, width;
-
- getmaxyx(stdscr, height, width);
-
- /* Resize the status view and let the view driver take
- * care of resizing the displayed views. */
- wresize(status_win, 1, width);
- mvwin(status_win, height - 1, 0);
- wrefresh(status_win);
- break;
- }
default:
break;
}