X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/7be144b43e6ab74dd5ad9d8f109e5f2bc84e5118..f4de14c5762fe2beef8633a254c470a37376b4c2:/tig.c

diff --git a/tig.c b/tig.c
index 680811f..ee9d706 100644
--- a/tig.c
+++ b/tig.c
@@ -331,6 +331,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	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"), \
 	\
@@ -466,6 +467,12 @@ parse_options(int argc, char *argv[])
 	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;
 
@@ -524,7 +531,7 @@ parse_options(int argc, char *argv[])
 			return FALSE;
 
 		} else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
-			printf(usage);
+			printf("%s\n", usage);
 			return FALSE;
 		}
 
@@ -534,12 +541,6 @@ parse_options(int argc, char *argv[])
 			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;
@@ -730,6 +731,7 @@ static struct keybinding default_keybindings[] = {
 	{ KEY_UP,	REQ_PREVIOUS },
 	{ KEY_DOWN,	REQ_NEXT },
 	{ 'R',		REQ_REFRESH },
+	{ 'M',		REQ_MAXIMIZE },
 
 	/* Cursor navigation */
 	{ 'k',		REQ_MOVE_UP },
@@ -1357,6 +1359,7 @@ struct view {
 	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 */
@@ -1416,27 +1419,28 @@ static struct view_ops help_ops;
 static struct view_ops status_ops;
 static struct view_ops stage_ops;
 
-#define VIEW_STR(name, cmd, env, ref, ops, map) \
-	{ name, cmd, #env, ref, ops, map}
+#define VIEW_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++)
@@ -1478,6 +1482,43 @@ draw_text(struct view *view, const char *string, int max_len,
 	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)
 {
@@ -2278,15 +2319,8 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		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;
 	}
 
@@ -2307,6 +2341,18 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 	    (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;
@@ -2581,6 +2627,11 @@ view_driver(struct view *view, enum request request)
 		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();
@@ -2686,39 +2737,35 @@ view_driver(struct view *view, enum request request)
 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;
@@ -2740,7 +2787,7 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
 		}
 
 	} else {
-		draw_text(view, text, view->width, TRUE, selected);
+		draw_text(view, text, view->width - col, TRUE, selected);
 	}
 
 	return TRUE;
@@ -3414,9 +3461,9 @@ parse_blame_commit(struct view *view, char *text, int *blamed)
 
 		blame = line->data;
 		blame->commit = commit;
+		blame->header = !group;
 		line->dirty = 1;
 	}
-	blame->header = 1;
 
 	return commit;
 }
@@ -3585,43 +3632,13 @@ blame_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
 	}
 
 	{
-		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;
@@ -3964,6 +3981,8 @@ status_open(struct view *view)
 		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)
@@ -3971,6 +3990,11 @@ status_open(struct view *view)
 	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;
 }
 
@@ -4136,61 +4160,110 @@ status_enter(struct view *view, struct line *line)
 }
 
 
-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 bool
@@ -4201,17 +4274,16 @@ status_update(struct view *view)
 	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 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");
 	}
 
@@ -4415,7 +4487,7 @@ stage_update_chunk(struct view *view, struct line *line)
 		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;
@@ -4477,7 +4549,7 @@ stage_update(struct view *view, struct line *line)
 			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;
 	}
@@ -5686,7 +5758,7 @@ main(int argc, char *argv[])
 		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"))