X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tig.c;h=dd9437f5f39f29d3da373c80e9df443571d68adc;hb=ec002272b4e4ff0d336b332af615681fe14a4f9f;hp=3ae55f23d78d87b0f2ad3bcec9d9f8591862913f;hpb=c77942d3d053415bcf1a09f79e8b05a7b76f6de2;p=tig.git

diff --git a/tig.c b/tig.c
index 3ae55f2..dd9437f 100644
--- a/tig.c
+++ b/tig.c
@@ -61,38 +61,21 @@ struct menu_item {
 
 static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected);
 
-enum graphic {
-	GRAPHIC_ASCII = 0,
-	GRAPHIC_DEFAULT,
-	GRAPHIC_UTF8
-};
+#define GRAPHIC_ENUM(_) \
+	_(GRAPHIC, ASCII), \
+	_(GRAPHIC, DEFAULT), \
+	_(GRAPHIC, UTF_8)
 
-static const struct enum_map graphic_map[] = {
-#define GRAPHIC_(name) ENUM_MAP(#name, GRAPHIC_##name)
-	GRAPHIC_(ASCII),
-	GRAPHIC_(DEFAULT),
-	GRAPHIC_(UTF8)
-#undef	GRAPHIC_
-};
+DEFINE_ENUM(graphic, GRAPHIC_ENUM);
 
-#define DATE_INFO \
-	DATE_(NO), \
-	DATE_(DEFAULT), \
-	DATE_(LOCAL), \
-	DATE_(RELATIVE), \
-	DATE_(SHORT)
-
-enum date {
-#define DATE_(name) DATE_##name
-	DATE_INFO
-#undef	DATE_
-};
+#define DATE_ENUM(_) \
+	_(DATE, NO), \
+	_(DATE, DEFAULT), \
+	_(DATE, LOCAL), \
+	_(DATE, RELATIVE), \
+	_(DATE, SHORT)
 
-static const struct enum_map date_map[] = {
-#define DATE_(name) ENUM_MAP(#name, DATE_##name)
-	DATE_INFO
-#undef	DATE_
-};
+DEFINE_ENUM(date, DATE_ENUM);
 
 struct time {
 	time_t sec;
@@ -154,23 +137,12 @@ mkdate(const struct time *time, enum date date)
 }
 
 
-#define AUTHOR_VALUES \
-	AUTHOR_(NO), \
-	AUTHOR_(FULL), \
-	AUTHOR_(ABBREVIATED)
+#define AUTHOR_ENUM(_) \
+	_(AUTHOR, NO), \
+	_(AUTHOR, FULL), \
+	_(AUTHOR, ABBREVIATED)
 
-enum author {
-#define AUTHOR_(name) AUTHOR_##name
-	AUTHOR_VALUES,
-#undef	AUTHOR_
-	AUTHOR_DEFAULT = AUTHOR_FULL
-};
-
-static const struct enum_map author_map[] = {
-#define AUTHOR_(name) ENUM_MAP(#name, AUTHOR_##name)
-	AUTHOR_VALUES
-#undef	AUTHOR_
-};
+DEFINE_ENUM(author, AUTHOR_ENUM);
 
 static const char *
 get_author_initials(const char *author)
@@ -207,6 +179,38 @@ get_author_initials(const char *author)
 	return initials;
 }
 
+#define author_trim(cols) (cols == 0 || cols > 5)
+
+static const char *
+mkauthor(const char *text, int cols, enum author author)
+{
+	bool trim = author_trim(cols);
+	bool abbreviate = author == AUTHOR_ABBREVIATED || !trim;
+
+	if (!author)
+		return "";
+	if (abbreviate && text)
+		return get_author_initials(text);
+	return text;
+}
+
+static const char *
+mkmode(mode_t mode)
+{
+	if (S_ISDIR(mode))
+		return "drwxr-xr-x";
+	else if (S_ISLNK(mode))
+		return "lrwxrwxrwx";
+	else if (S_ISGITLINK(mode))
+		return "m---------";
+	else if (S_ISREG(mode) && mode & S_IXUSR)
+		return "-rwxr-xr-x";
+	else if (S_ISREG(mode))
+		return "-rw-r--r--";
+	else
+		return "----------";
+}
+
 
 /*
  * User requests
@@ -337,7 +341,7 @@ get_request(const char *name)
 /* Option and state variables. */
 static enum graphic opt_line_graphics	= GRAPHIC_DEFAULT;
 static enum date opt_date		= DATE_DEFAULT;
-static enum author opt_author		= AUTHOR_DEFAULT;
+static enum author opt_author		= AUTHOR_FULL;
 static bool opt_rev_graph		= TRUE;
 static bool opt_line_number		= FALSE;
 static bool opt_show_refs		= TRUE;
@@ -627,40 +631,30 @@ static struct keybinding default_keybindings[] = {
 	{ 'e',		REQ_EDIT },
 };
 
-#define KEYMAP_INFO \
-	KEYMAP_(GENERIC), \
-	KEYMAP_(MAIN), \
-	KEYMAP_(DIFF), \
-	KEYMAP_(LOG), \
-	KEYMAP_(TREE), \
-	KEYMAP_(BLOB), \
-	KEYMAP_(BLAME), \
-	KEYMAP_(BRANCH), \
-	KEYMAP_(PAGER), \
-	KEYMAP_(HELP), \
-	KEYMAP_(STATUS), \
-	KEYMAP_(STAGE)
-
-enum keymap {
-#define KEYMAP_(name) KEYMAP_##name
-	KEYMAP_INFO
-#undef	KEYMAP_
-};
+#define KEYMAP_ENUM(_) \
+	_(KEYMAP, GENERIC), \
+	_(KEYMAP, MAIN), \
+	_(KEYMAP, DIFF), \
+	_(KEYMAP, LOG), \
+	_(KEYMAP, TREE), \
+	_(KEYMAP, BLOB), \
+	_(KEYMAP, BLAME), \
+	_(KEYMAP, BRANCH), \
+	_(KEYMAP, PAGER), \
+	_(KEYMAP, HELP), \
+	_(KEYMAP, STATUS), \
+	_(KEYMAP, STAGE)
 
-static const struct enum_map keymap_table[] = {
-#define KEYMAP_(name) ENUM_MAP(#name, KEYMAP_##name)
-	KEYMAP_INFO
-#undef	KEYMAP_
-};
+DEFINE_ENUM(keymap, KEYMAP_ENUM);
 
-#define set_keymap(map, name) map_enum(map, keymap_table, name)
+#define set_keymap(map, name) map_enum(map, keymap_map, name)
 
 struct keybinding_table {
 	struct keybinding *data;
 	size_t size;
 };
 
-static struct keybinding_table keybindings[ARRAY_SIZE(keymap_table)];
+static struct keybinding_table keybindings[ARRAY_SIZE(keymap_map)];
 
 static void
 add_keybinding(enum keymap keymap, enum request request, int key)
@@ -1435,6 +1429,7 @@ enum open_flags {
 	OPEN_RELOAD = 4,	/* Reload view even if it is the current. */
 	OPEN_REFRESH = 16,	/* Refresh view using previous command. */
 	OPEN_PREPARED = 32,	/* Open already prepared command. */
+	OPEN_EXTRA = 64,	/* Open extra data from command. */
 };
 
 struct view_ops {
@@ -1482,7 +1477,7 @@ static struct view views[] = {
 	VIEW_(BRANCH, "branch",	&branch_ops, TRUE,  ref_head),
 	VIEW_(HELP,   "help",   &help_ops,   FALSE, ""),
 	VIEW_(PAGER,  "pager",  &pager_ops,  FALSE, ""),
-	VIEW_(STATUS, "status", &status_ops, TRUE,  ""),
+	VIEW_(STATUS, "status", &status_ops, TRUE,  "status"),
 	VIEW_(STAGE,  "stage",	&stage_ops,  TRUE,  ""),
 };
 
@@ -1653,35 +1648,16 @@ draw_date(struct view *view, struct time *time)
 static bool
 draw_author(struct view *view, const char *author)
 {
-	bool trim = opt_author_cols == 0 || opt_author_cols > 5;
-	bool abbreviate = opt_author == AUTHOR_ABBREVIATED || !trim;
-
-	if (opt_author == AUTHOR_NO)
-		return FALSE;
+	bool trim = author_trim(opt_author_cols);
+	const char *text = mkauthor(author, opt_author_cols, opt_author);
 
-	if (abbreviate && author)
-		author = get_author_initials(author);
-
-	return draw_field(view, LINE_AUTHOR, author, opt_author_cols, trim);
+	return draw_field(view, LINE_AUTHOR, text, opt_author_cols, trim);
 }
 
 static bool
 draw_mode(struct view *view, mode_t mode)
 {
-	const char *str;
-
-	if (S_ISDIR(mode))
-		str = "drwxr-xr-x";
-	else if (S_ISLNK(mode))
-		str = "lrwxrwxrwx";
-	else if (S_ISGITLINK(mode))
-		str = "m---------";
-	else if (S_ISREG(mode) && mode & S_IXUSR)
-		str = "-rwxr-xr-x";
-	else if (S_ISREG(mode))
-		str = "-rw-r--r--";
-	else
-		str = "----------";
+	const char *str = mkmode(mode);
 
 	return draw_field(view, LINE_MODE, str, STRING_SIZE("-rw-r--r-- "), FALSE);
 }
@@ -1710,6 +1686,43 @@ draw_lineno(struct view *view, unsigned int lineno)
 	return draw_graphic(view, LINE_DEFAULT, &separator, 1, TRUE);
 }
 
+static bool
+draw_refs(struct view *view, struct ref_list *refs)
+{
+	size_t i;
+
+	if (!opt_show_refs || !refs)
+		return FALSE;
+
+	for (i = 0; i < refs->size; i++) {
+		struct ref *ref = refs->refs[i];
+		enum line_type type;
+
+		if (ref->head)
+			type = LINE_MAIN_HEAD;
+		else if (ref->ltag)
+			type = LINE_MAIN_LOCAL_TAG;
+		else if (ref->tag)
+			type = LINE_MAIN_TAG;
+		else if (ref->tracked)
+			type = LINE_MAIN_TRACKED;
+		else if (ref->remote)
+			type = LINE_MAIN_REMOTE;
+		else
+			type = LINE_MAIN_REF;
+
+		if (draw_text(view, type, "[") ||
+		    draw_text(view, type, ref->name) ||
+		    draw_text(view, type, "]"))
+			return TRUE;
+
+		if (draw_text(view, LINE_DEFAULT, " "))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 static bool
 draw_view_line(struct view *view, unsigned int lineno)
 {
@@ -2499,33 +2512,22 @@ setup_update(struct view *view, const char *vid)
 	view->start_time = time(NULL);
 }
 
-static bool
-prepare_update(struct view *view, const char *dir, const char *argv[])
-{
-	if (view->pipe)
-		io_done(view->pipe);
-	view->dir = dir;
-	return argv_copy(&view->argv, argv);
-}
-
-static bool
-start_update(struct view *view, const char **argv, const char *dir)
-{
-	return prepare_update(view, dir, argv) &&
-	       io_run(&view->io, IO_RD, dir, view->argv);
-}
-
 static bool
 begin_update(struct view *view, const char *dir, const char **argv, enum open_flags flags)
 {
-	bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED));
+	bool extra = !!(flags & (OPEN_EXTRA));
+	bool reload = !!(flags & (OPEN_RELOAD | OPEN_REFRESH | OPEN_PREPARED | OPEN_EXTRA));
 	bool refresh = flags & (OPEN_REFRESH | OPEN_PREPARED);
 
 	if (!reload && !strcmp(view->vid, view->id))
 		return TRUE;
 
-	if (view->pipe)
-		end_update(view, TRUE);
+	if (view->pipe) {
+		if (extra)
+			io_done(view->pipe);
+		else
+			end_update(view, TRUE);
+	}
 
 	if (!refresh) {
 		view->dir = dir;
@@ -2543,7 +2545,8 @@ begin_update(struct view *view, const char *dir, const char **argv, enum open_fl
 	    !io_run(&view->io, IO_RD, view->dir, view->argv))
 		return FALSE;
 
-	setup_update(view, view->id);
+	if (!extra)
+		setup_update(view, view->id);
 
 	return TRUE;
 }
@@ -2777,7 +2780,11 @@ open_argv(struct view *prev, struct view *view, const char *argv[], const char *
 {
 	enum request request = view - views + REQ_OFFSET + 1;
 
-	if (!prepare_update(view, dir, argv)) {
+	if (view->pipe)
+		end_update(view, TRUE);
+	view->dir = dir;
+	
+	if (!argv_copy(&view->argv, argv)) {
 		report("Failed to open %s view: %s", view->name, io_strerror(&view->io));
 	} else {
 		open_view(prev, request, flags | OPEN_PREPARED);
@@ -2787,17 +2794,9 @@ open_argv(struct view *prev, struct view *view, const char *argv[], const char *
 static void
 open_file(struct view *prev, struct view *view, const char *file, enum open_flags flags)
 {
-	enum request request = view - views + REQ_OFFSET + 1;
 	const char *file_argv[] = { opt_cdup, file , NULL };
 
-	if (view->pipe)
-		end_update(view, TRUE);
-	view->dir = opt_cdup;
-	if (!argv_copy(&view->argv, file_argv)) {
-		report("Failed to load %s: out of memory", file);
-	} else {
-		open_view(prev, request, flags | OPEN_PREPARED);
-	}
+	open_argv(prev, view, file_argv, opt_cdup, flags); 
 }
 
 static void
@@ -3449,7 +3448,7 @@ static struct view_ops diff_ops = {
  * Help backend
  */
 
-static bool help_keymap_hidden[ARRAY_SIZE(keymap_table)];
+static bool help_keymap_hidden[ARRAY_SIZE(keymap_map)];
 
 static bool
 help_open_keymap_title(struct view *view, enum keymap keymap)
@@ -3458,7 +3457,7 @@ help_open_keymap_title(struct view *view, enum keymap keymap)
 
 	line = add_line_format(view, LINE_HELP_KEYMAP, "[%c] %s bindings",
 			       help_keymap_hidden[keymap] ? '+' : '-',
-			       enum_name(keymap_table[keymap]));
+			       enum_name(keymap_map[keymap]));
 	if (line)
 		line->other = keymap;
 
@@ -3541,7 +3540,7 @@ help_open(struct view *view, enum open_flags flags)
 	add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT);
 	add_line_text(view, "", LINE_DEFAULT);
 
-	for (keymap = 0; keymap < ARRAY_SIZE(keymap_table); keymap++)
+	for (keymap = 0; keymap < ARRAY_SIZE(keymap_map); keymap++)
 		help_open_keymap(view, keymap);
 
 	return TRUE;
@@ -3723,11 +3722,10 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 		return TRUE;
 
 	} 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
+				"--cc", "--raw", view->id, "--", "%(directory)", NULL
 		};
 
 		if (!view->lines) {
@@ -3736,7 +3734,7 @@ tree_read_date(struct view *view, char *text, bool *read_date)
 			return TRUE;
 		}
 
-		if (!start_update(view, log_file, opt_cdup)) {
+		if (!begin_update(view, opt_cdup, log_file, OPEN_EXTRA)) {
 			report("Failed to load tree data");
 			return TRUE;
 		}
@@ -4111,6 +4109,7 @@ struct blame {
 static bool
 blame_open(struct view *view, enum open_flags flags)
 {
+	const char *file_argv[] = { opt_cdup, opt_file , NULL };
 	char path[SIZEOF_STR];
 	size_t i;
 
@@ -4120,13 +4119,13 @@ blame_open(struct view *view, enum open_flags flags)
 			return FALSE;
 	}
 
-	if (*opt_ref || !io_open(&view->io, "%s%s", opt_cdup, opt_file)) {
+	if (*opt_ref || !begin_update(view, opt_cdup, file_argv, flags)) {
 		const char *blame_cat_file_argv[] = {
 			"git", "cat-file", "blob", path, NULL
 		};
 
 		if (!string_format(path, "%s:%s", opt_ref, opt_file) ||
-		    !start_update(view, blame_cat_file_argv, opt_cdup))
+		    !begin_update(view, opt_cdup, blame_cat_file_argv, flags))
 			return FALSE;
 	}
 
@@ -4148,7 +4147,7 @@ blame_open(struct view *view, enum open_flags flags)
 			free(blame->commit);
 	}
 
-	setup_update(view, opt_file);
+	string_format(view->vid, "%s:%s", opt_ref, opt_file);
 	string_format(view->ref, "%s ...", opt_file);
 
 	return TRUE;
@@ -4242,7 +4241,7 @@ blame_read_file(struct view *view, const char *line, bool *read_file)
 		if (view->lines == 0 && !view->prev)
 			die("No blame exist for %s", view->vid);
 
-		if (view->lines == 0 || !start_update(view, blame_argv, opt_cdup)) {
+		if (view->lines == 0 || !begin_update(view, opt_cdup, blame_argv, OPEN_EXTRA)) {
 			report("Failed to load blame data");
 			return TRUE;
 		}
@@ -4673,12 +4672,11 @@ branch_open(struct view *view, enum open_flags flags)
 			"--simplify-by-decoration", "--all", NULL
 	};
 
-	if (!start_update(view, branch_log, NULL)) {
+	if (!begin_update(view, NULL, branch_log, flags)) {
 		report("Failed to load branch data");
 		return TRUE;
 	}
 
-	setup_update(view, view->id);
 	branch_open_visitor(view, &branch_all);
 	foreach_ref(branch_open_visitor, view);
 	view->p_restore = TRUE;
@@ -5808,35 +5806,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno)
 	if (opt_rev_graph && draw_graph(view, &commit->graph))
 		return TRUE;
 
-	if (opt_show_refs && commit->refs) {
-		size_t i;
-
-		for (i = 0; i < commit->refs->size; i++) {
-			struct ref *ref = commit->refs->refs[i];
-			enum line_type type;
-
-			if (ref->head)
-				type = LINE_MAIN_HEAD;
-			else if (ref->ltag)
-				type = LINE_MAIN_LOCAL_TAG;
-			else if (ref->tag)
-				type = LINE_MAIN_TAG;
-			else if (ref->tracked)
-				type = LINE_MAIN_TRACKED;
-			else if (ref->remote)
-				type = LINE_MAIN_REMOTE;
-			else
-				type = LINE_MAIN_REF;
-
-			if (draw_text(view, type, "[") ||
-			    draw_text(view, type, ref->name) ||
-			    draw_text(view, type, "]"))
-				return TRUE;
-
-			if (draw_text(view, LINE_DEFAULT, " "))
-				return TRUE;
-		}
-	}
+	if (draw_refs(view, commit->refs))
+		return TRUE;
 
 	draw_text(view, LINE_DEFAULT, commit->title);
 	return TRUE;