#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#define NULL_ID "0000000000000000000000000000000000000000"
+
#ifndef GIT_CONFIG
#define GIT_CONFIG "git config"
#endif
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"), \
\
static char opt_file[SIZEOF_STR] = "";
static char opt_ref[SIZEOF_REF] = "";
static char opt_head[SIZEOF_REF] = "";
+static bool opt_no_head = TRUE;
static FILE *opt_pipe = NULL;
static char opt_encoding[20] = "UTF-8";
static bool opt_utf8 = TRUE;
bool seen_dashdash = FALSE;
int i;
+ if (!isatty(STDIN_FILENO)) {
+ opt_request = REQ_VIEW_PAGER;
+ opt_pipe = stdin;
+ return TRUE;
+ }
+
if (argc <= 1)
return TRUE;
return FALSE;
} else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
- printf(usage);
+ printf("%s\n", usage);
return FALSE;
}
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;
{ KEY_UP, REQ_PREVIOUS },
{ KEY_DOWN, REQ_NEXT },
{ 'R', REQ_REFRESH },
+ { 'M', REQ_MAXIMIZE },
/* Cursor navigation */
{ 'k', REQ_MOVE_UP },
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 */
static struct view_ops status_ops;
static struct view_ops stage_ops;
-#define VIEW_STR(name, cmd, env, ref, ops, map) \
- { name, cmd, #env, ref, ops, map}
+#define VIEW_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", &pager_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++)
return len;
}
+static int
+draw_lineno(struct view *view, unsigned int lineno, int max, bool selected)
+{
+ static char fmt[] = "%1ld";
+ char number[10] = " ";
+ int max_number = MIN(view->digits, STRING_SIZE(number));
+ bool showtrimmed = FALSE;
+ int col;
+
+ lineno += view->offset + 1;
+ if (lineno == 1 || (lineno % opt_num_interval) == 0) {
+ if (view->digits <= 9)
+ fmt[1] = '0' + view->digits;
+
+ if (!string_format(number, fmt, lineno))
+ number[0] = 0;
+ showtrimmed = TRUE;
+ }
+
+ if (max < max_number)
+ max_number = max;
+
+ col = draw_text(view, number, max_number, showtrimmed, selected);
+ if (col < max) {
+ if (!selected)
+ wattrset(view->win, A_NORMAL);
+ waddch(view->win, ACS_VLINE);
+ col++;
+ }
+ if (col < max) {
+ waddch(view->win, ' ');
+ col++;
+ }
+
+ return col;
+}
+
static bool
draw_view_line(struct view *view, unsigned int lineno)
{
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;
}
(nviews == 1 && base_view != display[0]))
resize_display();
+ if (view->ops->open) {
+ if (!view->ops->open(view)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+
+ } else if ((reload || strcmp(view->vid, view->id)) &&
+ !begin_update(view)) {
+ report("Failed to load %s view", view->name);
+ return;
+ }
+
if (split && prev->lineno - prev->offset >= prev->height) {
/* Take the title line into account. */
int lines = prev->lineno - prev->offset - prev->height + 1;
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();
static bool
pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
{
+ static char spaces[] = " ";
char *text = line->data;
enum line_type type = line->type;
- int attr;
+ int attr = A_NORMAL;
+ int col = 0;
wmove(view->win, lineno, 0);
if (selected) {
type = LINE_CURSOR;
wchgat(view->win, -1, 0, type, NULL);
+ attr = get_line_attr(type);
}
-
- 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);
+ if (opt_line_number) {
+ col += draw_lineno(view, lineno, view->width, selected);
+ if (col >= view->width)
+ return TRUE;
+ }
- } else {
- waddnstr(view->win, spaces,
- MIN(view->digits, STRING_SIZE(spaces)));
- }
- waddstr(view->win, ": ");
- col_offset = view->digits + 2;
- }
+ if (!selected) {
+ attr = get_line_attr(type);
+ wattrset(view->win, attr);
+ }
+ if (opt_tab_size < TABSIZE) {
+ int col_offset = col;
+ col = 0;
while (text && col_offset + col < view->width) {
int cols_max = view->width - col_offset - col;
char *pos = text;
}
} else {
- draw_text(view, text, view->width, TRUE, selected);
+ draw_text(view, text, view->width - col, TRUE, selected);
}
return TRUE;
blame = line->data;
blame->commit = commit;
+ blame->header = !group;
line->dirty = 1;
}
- blame->header = 1;
return commit;
}
}
{
- unsigned long real_lineno = view->offset + lineno + 1;
- char number[10] = " ";
- int max = MIN(view->digits, STRING_SIZE(number));
- bool showtrimmed = FALSE;
-
- if (real_lineno == 1 ||
- (real_lineno % opt_num_interval) == 0) {
- char fmt[] = "%1ld";
-
- if (view->digits <= 9)
- fmt[1] = '0' + view->digits;
-
- if (!string_format(number, fmt, real_lineno))
- number[0] = 0;
- showtrimmed = TRUE;
- }
-
- if (max > view->width - col)
- max = view->width - col;
if (!selected)
wattrset(view->win, get_line_attr(LINE_BLAME_LINENO));
- col += draw_text(view, number, max, showtrimmed, selected);
+ col += draw_lineno(view, lineno, view->width - col, selected);
if (col >= view->width)
return TRUE;
}
- if (!selected)
- wattrset(view->win, A_NORMAL);
-
- if (col >= view->width)
- return TRUE;
- waddch(view->win, ACS_VLINE);
- col++;
- if (col >= view->width)
- return TRUE;
- waddch(view->win, ' ');
- col++;
col += draw_text(view, blame->text, view->width - col, TRUE, selected);
return TRUE;
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))
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);
}
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;
}
/* 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_FILES_CMD "git diff-files -z"
#define STATUS_LIST_OTHER_CMD \
"git ls-files -z --others --exclude-per-directory=.gitignore"
+#define STATUS_LIST_NO_HEAD_CMD \
+ "git ls-files -z --cached --exclude-per-directory=.gitignore"
#define STATUS_DIFF_INDEX_SHOW_CMD \
"git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s %s 2>/dev/null"
#define STATUS_DIFF_FILES_SHOW_CMD \
"git diff-files --root --patch-with-stat -C -M -- %s %s 2>/dev/null"
+#define STATUS_DIFF_NO_HEAD_SHOW_CMD \
+ "git diff --no-color --patch-with-stat /dev/null %s 2>/dev/null"
+
/* First parse staged info using git-diff-index(1), then parse unstaged
* info using git-diff-files(1), and finally untracked files using
* git-ls-files(1). */
{
struct stat statbuf;
char exclude[SIZEOF_STR];
- char cmd[SIZEOF_STR];
+ char indexcmd[SIZEOF_STR] = STATUS_DIFF_INDEX_CMD;
+ char othercmd[SIZEOF_STR] = STATUS_LIST_OTHER_CMD;
unsigned long prev_lineno = view->lineno;
+ char indexstatus = 0;
size_t i;
for (i = 0; i < view->lines; i++)
return FALSE;
add_line_data(view, NULL, LINE_STAT_HEAD);
- if (!*opt_head)
+ if (opt_no_head)
+ string_copy(status_onbranch, "Initial commit");
+ else if (!*opt_head)
string_copy(status_onbranch, "Not currently on any branch");
else if (!string_format(status_onbranch, "On branch %s", opt_head))
return FALSE;
+ if (opt_no_head) {
+ string_copy(indexcmd, STATUS_LIST_NO_HEAD_CMD);
+ indexstatus = 'A';
+ }
+
if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
return FALSE;
- string_copy(cmd, STATUS_LIST_OTHER_CMD);
-
if (stat(exclude, &statbuf) >= 0) {
- size_t cmdsize = strlen(cmd);
+ size_t cmdsize = strlen(othercmd);
+
+ if (!string_format_from(othercmd, &cmdsize, " %s", "--exclude-from=") ||
+ sq_quote(othercmd, cmdsize, exclude) >= sizeof(othercmd))
+ return FALSE;
- if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") ||
- sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd))
+ cmdsize = strlen(indexcmd);
+ if (opt_no_head &&
+ (!string_format_from(indexcmd, &cmdsize, " %s", "--exclude-from=") ||
+ sq_quote(indexcmd, cmdsize, exclude) >= sizeof(indexcmd)))
return FALSE;
}
system("git update-index -q --refresh");
- if (!status_run(view, 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, indexcmd, indexstatus, LINE_STAT_STAGED) ||
+ !status_run(view, STATUS_DIFF_FILES_CMD, 0, LINE_STAT_UNSTAGED) ||
+ !status_run(view, othercmd, '?', LINE_STAT_UNTRACKED))
return FALSE;
/* If all went well restore the previous line number to stay in
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)
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;
+
return TRUE;
}
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;
}
-static bool
-status_update_file(struct view *view, struct status *status, enum line_type type)
+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;
- case LINE_STAT_HEAD:
- return TRUE;
-
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;
+}
- if (written != bufsize)
+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 (!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");
- }
-
- if (!line[-1].data) {
+ /* This should work even for the "On branch" line. */
+ if (line < view->line + view->lines && !line[1].data) {
report("Nothing to update");
- return;
+ return FALSE;
}
- } else if (!status_update_file(view, line->data, line->type)) {
+ if (!status_update_files(view, line + 1))
+ report("Failed to update file status");
+
+ } else if (!status_update_file(line->data, line->type)) {
report("Failed to update file status");
}
+
+ return TRUE;
}
static enum request
switch (request) {
case REQ_STATUS_UPDATE:
- status_update(view);
+ if (!status_update(view))
+ return REQ_NONE;
break;
case REQ_STATUS_MERGE:
return FALSE;
if (!string_format_from(cmd, &cmdsize,
- "git apply --cached %s - && "
+ "git apply --whitespace=nowarn --cached %s - && "
"git update-index -q --unmerged --refresh 2>/dev/null",
stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
return FALSE;
static void
stage_update(struct view *view, struct line *line)
{
- if (stage_line_type != LINE_STAT_UNTRACKED &&
+ if (!opt_no_head && stage_line_type != LINE_STAT_UNTRACKED &&
(line->type == LINE_DIFF_CHUNK || !stage_status.status)) {
if (!stage_update_chunk(view, line)) {
report("Failed to apply chunk");
return;
}
- } else if (!status_update_file(view, &stage_status, stage_line_type)) {
+ } else if (!status_update_file(&stage_status, stage_line_type)) {
report("Failed to update file");
return;
}
head = !strncmp(opt_head, name, namelen);
} else if (!strcmp(name, "HEAD")) {
+ opt_no_head = FALSE;
return OK;
}
return 0;
/* Require a git repository unless when running in pager mode. */
- if (!opt_git_dir[0])
+ if (!opt_git_dir[0] && opt_request != REQ_VIEW_PAGER)
die("Not a git repository");
if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
~mdw / tig / blobdiff