Toggle name between committer and author

1. View specific option author-as-committer, similar to date-use-author
2. Work dynamically in views: main, log, refs, blame and tree.
   tig command     : :toggle author-as-committer
   toggle key seq. : o, m
   * for log view, it is using `author-as-committer` instead of
     column option `log-view-author-as-committer` because log
     view does not have author column.
3. Give precedence to external formatter arguments if any, e.g.
   tig log --prettry=fuller

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/main.h

@@ -29,6 +29,7 @@ struct commit {
 struct main_state {
 	struct graph *graph;
 	struct commit current;
+	struct option_common optcom;
 	char **reflog;
 	size_t reflogs;
 	int reflog_width;

include/tig/options.h

@@ -90,6 +90,8 @@ 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) \
+	_(date_use_author,			bool,			VIEW_LOG_LIKE) \
+	_(author_as_committer,			bool,			VIEW_LOG_LIKE) \
 
 #define DEFINE_OPTION_EXTERNS(name, type, flags) extern type opt_##name;
 OPTION_INFO(DEFINE_OPTION_EXTERNS)
@@ -102,6 +104,7 @@ OPTION_INFO(DEFINE_OPTION_EXTERNS)
 	_(display,			enum author,		VIEW_NO_FLAGS) \
 	_(width,			int,			VIEW_NO_FLAGS) \
 	_(maxwidth,			int,			VIEW_NO_FLAGS) \
+	_(as_committer,			bool,			VIEW_BLAME_LIKE | VIEW_LOG_LIKE) \
 
 #define COMMIT_TITLE_COLUMN_OPTIONS(_) \
 	_(display,			bool,			VIEW_NO_FLAGS) \
@@ -198,7 +201,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(struct option_common *optcom);
 const char *use_mailmap_arg();
 const char *diff_context_arg();
 const char *diff_prefix_arg();
@@ -222,6 +225,7 @@ struct option_info *find_option_info(struct option_info *option, size_t options,
 enum status_code parse_option(struct option_info *option, const char *prefix, const char *arg);
 struct option_info *find_column_option_info(enum view_column_type type, union view_column_options *opts,
 					const char *option, struct option_info *column_info, const char **column_name);
+void read_option_common(void *view, struct option_common *optcom);
 enum status_code parse_int(int *opt, const char *arg, int min, int max);
 enum status_code parse_step(double *opt, const char *arg);
 enum status_code set_option(const char *opt, int argc, const char *argv[]);

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, struct option_common *optcom);
 
 /* Parse author lines where the name may be empty:
  *	author  <[email protected]> 1138474660 +0100

include/tig/util.h

@@ -118,5 +118,14 @@ name(type **mem, size_t size, size_t increase)					\
 
 void sigsegv_handler(int sig);
 
+/*
+ * Common structures
+ */
+
+struct option_common {
+    bool author_as_committer;
+    bool use_author_date;
+};
+
 #endif
 /* vim: set ts=8 sw=8 noexpandtab: */

src/blame.c

@@ -43,6 +43,7 @@ struct blame {
 struct blame_state {
 	struct blame_commit *commit;
 	struct blame_header header;
+	struct option_common optcom;
 	char author[SIZEOF_STR];
 	bool auto_filename_display;
 	const char *filename;
@@ -77,6 +78,8 @@ blame_open(struct view *view, enum open_flags flags)
 	enum status_code code;
 	size_t i;
 
+	read_option_common(view, &state->optcom);
+
 	if (is_initial_view(view)) {
 		/* Finish validating and setting up blame options */
 		if (!opt_file_args || opt_file_args[1])
@@ -216,8 +219,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 +256,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, &state->optcom)) {
 		if (!state->commit->filename)
 			return false;
 

src/diff.c

@@ -591,6 +591,10 @@ diff_blame_line(const char *ref, const char *file, unsigned long lineno,
 	struct io io;
 	bool ok = false;
 	struct buffer buf;
+	struct option_common optcom = {
+		.author_as_committer = false,
+		.use_author_date = false,
+	};
 
 	if (!string_format(line_arg, "-L%lu,+1", lineno))
 		return false;
@@ -604,7 +608,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, &optcom)) {
 			ok = commit->filename != NULL;
 			break;
 		}

src/log.c

@@ -24,10 +24,12 @@ struct log_state {
 	 * up/down in the log view. */
 	int last_lineno;
 	size_t graph_indent;
+	struct option_common optcom;
 	enum line_type last_type;
 	bool commit_title_read;
 	bool after_commit_header;
 	bool reading_diff_stat;
+	bool external_format;
 };
 
 static inline void
@@ -63,16 +65,39 @@ 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;
 
+	read_option_common(view, &state->optcom);
+	state->external_format = external_format;
 	code = begin_update(view, NULL, log_argv, flags | OPEN_WITH_STDERR);
 	if (code != SUCCESS)
 		return code;
@@ -115,6 +140,7 @@ log_read(struct view *view, struct buffer *buf, bool force_stop)
 	size_t len;
 	char *commit;
 	char *data;
+	bool swap_lines = false;
 
 	if (!buf)
 		return true;
@@ -148,10 +174,71 @@ 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:
+			if (state->optcom.author_as_committer)
+				return true;
+			break;
+		case LINE_PP_COMMITTER:
+			if (!state->optcom.author_as_committer)
+				return true;
+			swap_lines = state->optcom.use_author_date;
+			break;
+		case LINE_PP_AUTHORDATE:
+		case LINE_PP_DATE:
+			if (!state->optcom.use_author_date)
+				return true;
+			break;
+		case LINE_PP_COMMITDATE:
+			if (state->optcom.use_author_date)
+				return true;
+			break;
+		default:
+			break;
+		}
+		/* remove 4 spaces after Commit:/Author:, or
+		 * convert CommitDate:/AuthorDate: to Date: */
+		switch (type)
+		{
+		case LINE_PP_AUTHOR:
+		case LINE_PP_COMMITTER:
+			{
+				char *p = strchr(data, ':');
+				if (p && p[5]==' ')
+					memmove(p+1, p+5, strlen(p+5)+1);
+				break;
+			}
+		case LINE_PP_AUTHORDATE:
+		case LINE_PP_COMMITDATE:
+			{
+				char *p = strchr(data, ':');
+				if (p && p[1]==' ' && (p - data) >= 10) {
+					memcpy(p - 10, "Date:   ", STRING_SIZE("Date:   "));
+					memmove(p - 10 + STRING_SIZE("Date:   "), p+2, strlen(p+2)+1);
+				}
+				break;
+			}
+		default:
+			break;
+		}
+	}
+
 	if (!pager_common_read(view, data, type, &line))
 		return false;
 	if (line && state->graph_indent)
 		line->graph_indent = 1;
+	if (swap_lines && view->lines >= 2) {
+		size_t last_idx = view->lines - 1;
+		struct line *line1 = &view->line[last_idx];
+		struct line *line2 = &view->line[last_idx - 1];
+		struct line buf = *line1;
+		*line1 = *line2;
+		*line2 = buf;
+		line1->lineno--;
+		line2->lineno++;
+	}
 	return true;
 }
 

src/main.c

@@ -274,21 +274,20 @@ main_with_graph(struct view *view, struct view_column *column, enum open_flags f
 static enum status_code
 main_open(struct view *view, enum open_flags flags)
 {
+	struct main_state *state = view->private;
 	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;
+	read_option_common(view, &state->optcom);
 	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(&state->optcom))
 	};
 	const char *pretty_raw_argv[] = {
 		GIT_MAIN_LOG_RAW(encoding_arg, commit_order_arg_with_graph(graph_display),
 			"%(mainargs)", "%(cmdlineargs)", "%(revargs)", "%(fileargs)",
 			show_notes_arg())
 	};
-	struct main_state *state = view->private;
 	const char **main_argv = pretty_custom_argv;
 	enum watch_trigger changes_triggers = WATCH_NONE;
 
@@ -415,8 +414,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 +507,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 ((state->optcom.author_as_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. */

src/options.c

@@ -115,6 +115,30 @@ find_column_option_info(enum view_column_type type, union view_column_options *o
 	return NULL;
 }
 
+void read_option_common(void *_view, struct option_common *opt)
+{
+	extern struct view log_view;
+	struct view *view = _view;
+	bool as_committer = false;
+	bool use_author_date = false;
+
+	if (view == &log_view) {
+		as_committer = opt_author_as_committer;
+		use_author_date = opt_date_use_author;
+	} else {
+		struct view_column *column1 = get_view_column(view, VIEW_COLUMN_AUTHOR);
+		struct view_column *column2 = get_view_column(view, VIEW_COLUMN_DATE);
+
+		if (column1)
+			as_committer = column1->opt.author.as_committer;
+		if (column2)
+			use_author_date = column2->opt.date.use_author;
+	}
+
+	opt->author_as_committer = as_committer;
+	opt->use_author_date = use_author_date;
+}
+
 /*
  * State variables.
  */
@@ -159,15 +183,28 @@ use_mailmap_arg()
 }
 
 const char *
-log_custom_pretty_arg(bool use_author_date)
+log_custom_pretty_arg(struct option_common *optcom)
 {
-	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 ((optcom->author_as_committer*2) + opt_mailmap)
+	{
+	case 0x3:
+		return optcom->use_author_date ?
+				"--pretty=format:commit %m %H %P%x00%cN <%cE> %ad%x00%s%x00%N" :
+				"--pretty=format:commit %m %H %P%x00%cN <%cE> %cd%x00%s%x00%N";
+	case 0x2:
+		return optcom->use_author_date ?
+				"--pretty=format:commit %m %H %P%x00%cn <%ce> %ad%x00%s%x00%N" :
+				"--pretty=format:commit %m %H %P%x00%cn <%ce> %cd%x00%s%x00%N";
+	case 0x1:
+		return optcom->use_author_date ?
+				"--pretty=format:commit %m %H %P%x00%aN <%aE> %ad%x00%s%x00%N" :
+				"--pretty=format:commit %m %H %P%x00%aN <%aE> %cd%x00%s%x00%N";
+	case 0x0:
+	default:
+		return optcom->use_author_date ?
+				"--pretty=format:commit %m %H %P%x00%an <%ae> %ad%x00%s%x00%N" :
+				"--pretty=format:commit %m %H %P%x00%an <%ae> %cd%x00%s%x00%N";
+	}
 }
 
 #define ENUM_ARG(enum_name, arg_string) ENUM_MAP_ENTRY(arg_string, enum_name)