Toggle name and date between committer and author

1. One global option for all views.
2. Work dynamically in views: main, log, refs, blame and tree.
   tig command     : set committer = yes|no
   toggle key seq. : o, m
3. Remove column option date-use-author which
   * works only with static config (tigrc)
   * cannot show author name

Author: paulwkc

include/tig/line.h

@@ -43,6 +43,11 @@ struct ref;
 	_(PP_REFS,		"Refs: "), \
 	_(PP_REFLOG,		"Reflog: "), \
 	_(PP_REFLOGMSG,		"Reflog message: "), \
+	_(PP_AUTHOR,		"Author: "	), \
+	_(PP_DATE,		"Date: "), \
+	_(PP_AUTHORDATE,		"AuthorDate: "), \
+	_(PP_COMMITTER,		"Commit: "	), \
+	_(PP_COMMITDATE,		"CommitDate: "), \
 	_(COMMIT,		"commit "), \
 	_(PARENT,		"parent "), \
 	_(TREE,			"tree "), \

include/tig/options.h

@@ -90,6 +90,7 @@ typedef struct view_column *view_settings;
 	_(vertical_split,		enum vertical_split,	VIEW_RESET_DISPLAY | VIEW_DIFF_LIKE) \
 	_(wrap_lines,			bool,			VIEW_DIFF_LIKE) \
 	_(wrap_search,			bool,			VIEW_NO_FLAGS) \
+	_(committer,			bool,			VIEW_LOG_LIKE | VIEW_BLAME_LIKE) \
 
 #define DEFINE_OPTION_EXTERNS(name, type, flags) extern type opt_##name;
 OPTION_INFO(DEFINE_OPTION_EXTERNS)
@@ -111,7 +112,6 @@ OPTION_INFO(DEFINE_OPTION_EXTERNS)
 
 #define DATE_COLUMN_OPTIONS(_) \
 	_(display,			enum date,		VIEW_NO_FLAGS) \
-	_(use_author,			bool,			VIEW_BLAME_LIKE | VIEW_LOG_LIKE) \
 	_(local,			bool,			VIEW_NO_FLAGS) \
 	_(format,			const char *,		VIEW_NO_FLAGS) \
 	_(width,			int,			VIEW_NO_FLAGS) \
@@ -198,7 +198,7 @@ void update_options_from_argv(const char *argv[]);
 const char *ignore_space_arg();
 const char *commit_order_arg();
 const char *commit_order_arg_with_graph(enum graph_display graph_display);
-const char *log_custom_pretty_arg(bool use_author_date);
+const char *log_custom_pretty_arg();
 const char *use_mailmap_arg();
 const char *diff_context_arg();
 const char *diff_prefix_arg();

include/tig/parse.h

@@ -48,7 +48,7 @@ struct blame_header {
 };
 
 bool parse_blame_header(struct blame_header *header, const char *text);
-bool parse_blame_info(struct blame_commit *commit, char author[SIZEOF_STR], char *line, bool use_author_date);
+bool parse_blame_info(struct blame_commit *commit, char author[SIZEOF_STR], char *line);
 
 /* Parse author lines where the name may be empty:
  *	author  <[email protected]> 1138474660 +0100

include/tig/view.h

@@ -73,6 +73,7 @@ enum view_flag {
 	VIEW_SORTABLE		= 1 << 16,
 	VIEW_FLEX_WIDTH		= 1 << 17,
 	VIEW_RESET_DISPLAY	= 1 << 18,
+	VIEW_COMMIT_NAMEDATE	= 1 << 19,
 };
 
 #define view_has_flags(view, flag)	((view)->ops->flags & (flag))

src/blame.c

@@ -216,8 +216,6 @@ static bool
 blame_read(struct view *view, struct buffer *buf, bool force_stop)
 {
 	struct blame_state *state = view->private;
-	struct view_column *column = get_view_column(view, VIEW_COLUMN_DATE);
-	bool use_author_date = column && column->opt.date.use_author;
 
 	if (!buf) {
 		if (failed_to_load_initial_view(view))
@@ -255,7 +253,7 @@ blame_read(struct view *view, struct buffer *buf, bool force_stop)
 
 		state->commit = NULL;
 
-	} else if (parse_blame_info(state->commit, state->author, buf->data, use_author_date)) {
+	} else if (parse_blame_info(state->commit, state->author, buf->data)) {
 		if (!state->commit->filename)
 			return false;
 
@@ -504,7 +502,7 @@ blame_select(struct view *view, struct line *line)
 static struct view_ops blame_ops = {
 	"line",
 	argv_env.commit,
-	VIEW_SEND_CHILD_ENTER | VIEW_BLAME_LIKE | VIEW_REFRESH,
+	VIEW_SEND_CHILD_ENTER | VIEW_BLAME_LIKE | VIEW_REFRESH | VIEW_COMMIT_NAMEDATE,
 	sizeof(struct blame_state),
 	blame_open,
 	blame_read,

src/diff.c

@@ -604,7 +604,7 @@ diff_blame_line(const char *ref, const char *file, unsigned long lineno,
 				break;
 			header = NULL;
 
-		} else if (parse_blame_info(commit, author, buf.data, false)) {
+		} else if (parse_blame_info(commit, author, buf.data)) {
 			ok = commit->filename != NULL;
 			break;
 		}

src/log.c

@@ -28,6 +28,7 @@ struct log_state {
 	bool commit_title_read;
 	bool after_commit_header;
 	bool reading_diff_stat;
+	bool external_format;
 };
 
 static inline void
@@ -63,16 +64,38 @@ log_select(struct view *view, struct line *line)
 	state->last_type = line->type;
 }
 
+static bool
+log_check_external_formatter()
+{
+	/* check if any formatter arugments in "%(logargs)", "%(cmdlineargs)" */
+	const char ** opt_list[] = {
+		opt_log_options,
+		opt_cmdline_args,
+	};
+	for (int i=0; i<ARRAY_SIZE(opt_list); i++) {
+		if (opt_list[i] &&
+			(argv_containsn(opt_list[i], "--pretty", STRING_SIZE("--pretty")) ||
+				argv_containsn(opt_list[i], "--format", STRING_SIZE("--format"))))
+			return true;
+	}
+	return false;
+}
+
 static enum status_code
 log_open(struct view *view, enum open_flags flags)
 {
+	struct log_state *state = view->private;
+	bool external_format = log_check_external_formatter();
 	const char *log_argv[] = {
 		"git", "log", encoding_arg, commit_order_arg(),
 			use_mailmap_arg(), "%(logargs)", "%(cmdlineargs)",
-			"%(revargs)", "--no-color", "--", "%(fileargs)", NULL
+			"%(revargs)", "--no-color",
+			external_format ? "" : "--pretty=fuller",
+			"--", "%(fileargs)", NULL
 	};
 	enum status_code code;
 
+	state->external_format = external_format;
 	code = begin_update(view, NULL, log_argv, flags | OPEN_WITH_STDERR);
 	if (code != SUCCESS)
 		return code;
@@ -148,6 +171,25 @@ log_read(struct view *view, struct buffer *buf, bool force_stop)
 		state->reading_diff_stat = false;
 	}
 
+	if (!state->external_format) {
+		switch (type)
+		{
+		case LINE_PP_AUTHOR:
+		case LINE_PP_AUTHORDATE:
+		case LINE_PP_DATE:
+			if (opt_committer)
+				return true;
+			break;
+		case LINE_PP_COMMITTER:
+		case LINE_PP_COMMITDATE:
+			if (!opt_committer)
+				return true;
+			break;
+		default:
+			break;
+		}
+	}
+
 	if (!pager_common_read(view, data, type, &line))
 		return false;
 	if (line && state->graph_indent)
@@ -158,7 +200,8 @@ log_read(struct view *view, struct buffer *buf, bool force_stop)
 static struct view_ops log_ops = {
 	"line",
 	argv_env.head,
-	VIEW_ADD_PAGER_REFS | VIEW_OPEN_DIFF | VIEW_SEND_CHILD_ENTER | VIEW_LOG_LIKE | VIEW_REFRESH | VIEW_FLEX_WIDTH,
+	VIEW_ADD_PAGER_REFS | VIEW_OPEN_DIFF | VIEW_SEND_CHILD_ENTER | VIEW_LOG_LIKE | VIEW_REFRESH | \
+	VIEW_FLEX_WIDTH | VIEW_COMMIT_NAMEDATE,
 	sizeof(struct log_state),
 	log_open,
 	log_read,

src/main.c

@@ -276,12 +276,10 @@ main_open(struct view *view, enum open_flags flags)
 {
 	struct view_column *commit_title_column = get_view_column(view, VIEW_COLUMN_COMMIT_TITLE);
 	enum graph_display graph_display = main_with_graph(view, commit_title_column, flags);
-	struct view_column *column = get_view_column(view, VIEW_COLUMN_DATE);
-	bool use_author_date = column && column->opt.date.use_author;
 	const char *pretty_custom_argv[] = {
 		GIT_MAIN_LOG(encoding_arg, commit_order_arg_with_graph(graph_display),
 			"%(mainargs)", "%(cmdlineargs)", "%(revargs)", "%(fileargs)",
-			show_notes_arg(), log_custom_pretty_arg(use_author_date))
+			show_notes_arg(), log_custom_pretty_arg())
 	};
 	const char *pretty_raw_argv[] = {
 		GIT_MAIN_LOG_RAW(encoding_arg, commit_order_arg_with_graph(graph_display),
@@ -415,8 +413,6 @@ main_add_reflog(struct view *view, struct main_state *state, char *reflog)
 bool
 main_read(struct view *view, struct buffer *buf, bool force_stop)
 {
-	struct view_column *column = get_view_column(view, VIEW_COLUMN_DATE);
-	bool use_author_date = column && column->opt.date.use_author;
 	struct main_state *state = view->private;
 	struct graph *graph = state->graph;
 	enum line_type type;
@@ -510,16 +506,17 @@ main_read(struct view *view, struct buffer *buf, bool force_stop)
 		break;
 
 	case LINE_AUTHOR:
-		parse_author_line(line + STRING_SIZE("author "),
-				  &commit->author, use_author_date ? &commit->time : NULL);
-		if (state->with_graph)
-			graph->render_parents(graph, &commit->graph);
-		break;
-
 	case LINE_COMMITTER:
-		parse_author_line(line + STRING_SIZE("committer "),
-				  NULL, use_author_date ? NULL : &commit->time);
+	{
+		bool committer_line = (type == LINE_COMMITTER);
+		if ((opt_committer ^ committer_line) == 0)
+			parse_author_line(line +
+				(committer_line ? STRING_SIZE("committer ") : STRING_SIZE("author ")),
+				&commit->author, &commit->time);
+		if (committer_line && state->with_graph)
+			graph->render_parents(graph, &commit->graph);
 		break;
+	}
 
 	default:
 		/* Fill in the commit title if it has not already been set. */
@@ -661,7 +658,7 @@ main_select(struct view *view, struct line *line)
 static struct view_ops main_ops = {
 	"commit",
 	argv_env.head,
-	VIEW_SEND_CHILD_ENTER | VIEW_FILE_FILTER | VIEW_REV_FILTER | VIEW_LOG_LIKE | VIEW_REFRESH,
+	VIEW_SEND_CHILD_ENTER | VIEW_FILE_FILTER | VIEW_REV_FILTER | VIEW_LOG_LIKE | VIEW_REFRESH | VIEW_COMMIT_NAMEDATE,
 	sizeof(struct main_state),
 	main_open,
 	main_read,

src/options.c

@@ -159,15 +159,20 @@ use_mailmap_arg()
 }
 
 const char *
-log_custom_pretty_arg(bool use_author_date)
+log_custom_pretty_arg()
 {
-	return use_author_date
-		? opt_mailmap
-			? "--pretty=format:commit %m %H %P%x00%aN <%aE> %ad%x00%s%x00%N"
-			: "--pretty=format:commit %m %H %P%x00%an <%ae> %ad%x00%s%x00%N"
-		: opt_mailmap
-			? "--pretty=format:commit %m %H %P%x00%aN <%aE> %cd%x00%s%x00%N"
-			: "--pretty=format:commit %m %H %P%x00%an <%ae> %cd%x00%s%x00%N";
+	switch ((opt_committer*2) + opt_mailmap)
+	{
+	case 0x3:
+		return "--pretty=format:commit %m %H %P%x00%cN <%cE> %cd%x00%s%x00%N";
+	case 0x2:
+		return "--pretty=format:commit %m %H %P%x00%cn <%ce> %cd%x00%s%x00%N";
+	case 0x1:
+		return "--pretty=format:commit %m %H %P%x00%aN <%aE> %ad%x00%s%x00%N";
+	case 0x0:
+	default:
+		return "--pretty=format:commit %m %H %P%x00%an <%ae> %ad%x00%s%x00%N";
+	}
 }
 
 #define ENUM_ARG(enum_name, arg_string) ENUM_MAP_ENTRY(arg_string, enum_name)
@@ -959,6 +964,7 @@ option_bind_command(int argc, const char *argv[])
 			{ "toggle-title-overflow",	"commit-title-overflow" },
 			{ "toggle-untracked-dirs",	"status-show-untracked-dirs" },
 			{ "toggle-vertical-split",	"show-vertical-split" },
+			{ "toggle-committer",		"committer" },
 		};
 		int alias;
 

src/parse.c

@@ -14,6 +14,7 @@
 #include "tig/tig.h"
 #include "tig/parse.h"
 #include "tig/map.h"
+#include "tig/options.h"
 
 size_t
 parse_size(const char *text)
@@ -139,12 +140,12 @@ match_blame_header(const char *name, char **line)
 }
 
 bool
-parse_blame_info(struct blame_commit *commit, char author[SIZEOF_STR], char *line, bool use_author_date)
+parse_blame_info(struct blame_commit *commit, char author[SIZEOF_STR], char *line)
 {
-	if (match_blame_header("author ", &line)) {
+	if (match_blame_header(opt_committer ? "committer " : "author ", &line)) {
 		string_ncopy_do(author, SIZEOF_STR, line, strlen(line));
 
-	} else if (match_blame_header("author-mail ", &line)) {
+	} else if (match_blame_header(opt_committer ? "committer-mail " : "author-mail ", &line)) {
 		char *end = strchr(line, '>');
 
 		if (end)
@@ -154,10 +155,10 @@ parse_blame_info(struct blame_commit *commit, char author[SIZEOF_STR], char *lin
 		commit->author = get_author(author, line);
 		author[0] = 0;
 
-	} else if (match_blame_header(use_author_date ? "author-time " : "committer-time ", &line)) {
+	} else if (match_blame_header(opt_committer ? "committer-time " : "author-time ", &line)) {
 		parse_timesec(&commit->time, line);
 
-	} else if (match_blame_header(use_author_date ? "author-tz " : "committer-tz ", &line)) {
+	} else if (match_blame_header(opt_committer ? "committer-tz " : "author-tz ", &line)) {
 		parse_timezone(&commit->time, line);
 
 	} else if (match_blame_header("summary ", &line)) {