The `struct add_p_opt` is reused both by our the infra for "git add -p"
and "git add -i". Users of `run_add_i()` for example are expected to
pass `struct add_p_opt`. This is somewhat confusing and raises the
question which options apply to what part of the stack.
But things are even more confusing than that: while callers are expected
to pass in `struct add_p_opt`, these options ultimately get used to
initialize a `struct add_i_state` that is used by both subsystems. So we
are basically going full circle here.
Refactor the code and split out a new `struct interactive_options` that
hosts common options used by both. These options are then applied to a
`struct interactive_config` that hosts common configuration.
This refactoring doesn't yet fully detangle the two subsystems from one
another, as we still end up calling `init_add_i_state()` in the "git add
-p" subsystem. This will be fixed in a subsequent commit.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
add-interactive.c | 151 +++++++++++++----------------------------------------
add-interactive.h | 20 ++-----
add-patch.c | 145 +++++++++++++++++++++++++++++++++++++++++---------
add-patch.h | 33 ++++++++++--
builtin/add.c | 22 ++++----
builtin/checkout.c | 4 +-
builtin/commit.c | 16 +++---
builtin/reset.c | 16 +++---
builtin/stash.c | 46 ++++++++--------
commit.h | 2 +-
10 files changed, 243 insertions(+), 212 deletions(-)
diff --git a/add-interactive.c b/add-interactive.c
index 3e692b47ec..3babc3e013 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -3,7 +3,6 @@
#include "git-compat-util.h"
#include "add-interactive.h"
#include "color.h"
-#include "config.h"
#include "diffcore.h"
#include "gettext.h"
#include "hash.h"
@@ -20,96 +19,18 @@
#include "prompt.h"
#include "tree.h"
-static void init_color(struct repository *r, struct add_i_state *s,
- const char *section_and_slot, char *dst,
- const char *default_color)
-{
- char *key = xstrfmt("color.%s", section_and_slot);
- const char *value;
-
- if (!s->use_color)
- dst[0] = '\0';
- else if (repo_config_get_value(r, key, &value) ||
- color_parse(value, dst))
- strlcpy(dst, default_color, COLOR_MAXLEN);
-
- free(key);
-}
-
void init_add_i_state(struct add_i_state *s, struct repository *r,
- struct add_p_opt *add_p_opt)
+ struct interactive_options *opts)
{
- const char *value;
-
s->r = r;
- s->context = -1;
- s->interhunkcontext = -1;
-
- if (repo_config_get_value(r, "color.interactive", &value))
- s->use_color = -1;
- else
- s->use_color =
- git_config_colorbool("color.interactive", value);
- s->use_color = want_color(s->use_color);
-
- init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD);
- init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED);
- init_color(r, s, "interactive.prompt", s->prompt_color,
- GIT_COLOR_BOLD_BLUE);
- init_color(r, s, "interactive.error", s->error_color,
- GIT_COLOR_BOLD_RED);
-
- init_color(r, s, "diff.frag", s->fraginfo_color,
- diff_get_color(s->use_color, DIFF_FRAGINFO));
- init_color(r, s, "diff.context", s->context_color, "fall back");
- if (!strcmp(s->context_color, "fall back"))
- init_color(r, s, "diff.plain", s->context_color,
- diff_get_color(s->use_color, DIFF_CONTEXT));
- init_color(r, s, "diff.old", s->file_old_color,
- diff_get_color(s->use_color, DIFF_FILE_OLD));
- init_color(r, s, "diff.new", s->file_new_color,
- diff_get_color(s->use_color, DIFF_FILE_NEW));
-
- strlcpy(s->reset_color,
- s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
-
- FREE_AND_NULL(s->interactive_diff_filter);
- repo_config_get_string(r, "interactive.difffilter",
- &s->interactive_diff_filter);
-
- FREE_AND_NULL(s->interactive_diff_algorithm);
- repo_config_get_string(r, "diff.algorithm",
- &s->interactive_diff_algorithm);
-
- if (!repo_config_get_int(r, "diff.context", &s->context))
- if (s->context < 0)
- die(_("%s cannot be negative"), "diff.context");
- if (!repo_config_get_int(r, "diff.interHunkContext", &s->interhunkcontext))
- if (s->interhunkcontext < 0)
- die(_("%s cannot be negative"), "diff.interHunkContext");
-
- repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
- if (s->use_single_key)
- setbuf(stdin, NULL);
-
- if (add_p_opt->context != -1) {
- if (add_p_opt->context < 0)
- die(_("%s cannot be negative"), "--unified");
- s->context = add_p_opt->context;
- }
- if (add_p_opt->interhunkcontext != -1) {
- if (add_p_opt->interhunkcontext < 0)
- die(_("%s cannot be negative"), "--inter-hunk-context");
- s->interhunkcontext = add_p_opt->interhunkcontext;
- }
+ interactive_config_init(&s->cfg, r, opts);
}
void clear_add_i_state(struct add_i_state *s)
{
- FREE_AND_NULL(s->interactive_diff_filter);
- FREE_AND_NULL(s->interactive_diff_algorithm);
+ interactive_config_clear(&s->cfg);
memset(s, 0, sizeof(*s));
- s->use_color = -1;
+ interactive_config_clear(&s->cfg);
}
/*
@@ -262,7 +183,7 @@ static void list(struct add_i_state *s, struct string_list *list, int *selected,
return;
if (opts->header)
- color_fprintf_ln(stdout, s->header_color,
+ color_fprintf_ln(stdout, s->cfg.header_color,
"%s", opts->header);
for (i = 0; i < list->nr; i++) {
@@ -330,7 +251,7 @@ static ssize_t list_and_choose(struct add_i_state *s,
list(s, &items->items, items->selected, &opts->list_opts);
- color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
+ color_fprintf(stdout, s->cfg.prompt_color, "%s", opts->prompt);
fputs(singleton ? "> " : ">> ", stdout);
fflush(stdout);
@@ -408,7 +329,7 @@ static ssize_t list_and_choose(struct add_i_state *s,
if (from < 0 || from >= items->items.nr ||
(singleton && from + 1 != to)) {
- color_fprintf_ln(stderr, s->error_color,
+ color_fprintf_ln(stderr, s->cfg.error_color,
_("Huh (%s)?"), p);
break;
} else if (singleton) {
@@ -968,7 +889,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
free(files->items.items[i].string);
} else if (item->index.unmerged ||
item->worktree.unmerged) {
- color_fprintf_ln(stderr, s->error_color,
+ color_fprintf_ln(stderr, s->cfg.error_color,
_("ignoring unmerged: %s"),
files->items.items[i].string);
free(item);
@@ -990,9 +911,9 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
opts->prompt = N_("Patch update");
count = list_and_choose(s, files, opts);
if (count > 0) {
- struct add_p_opt add_p_opt = {
- .context = s->context,
- .interhunkcontext = s->interhunkcontext,
+ struct interactive_options opts = {
+ .context = s->cfg.context,
+ .interhunkcontext = s->cfg.interhunkcontext,
};
struct strvec args = STRVEC_INIT;
struct pathspec ps_selected = { 0 };
@@ -1004,7 +925,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
parse_pathspec(&ps_selected,
PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
PATHSPEC_LITERAL_PATH, "", args.v);
- res = run_add_p(s->r, ADD_P_ADD, &add_p_opt, NULL, &ps_selected);
+ res = run_add_p(s->r, ADD_P_ADD, &opts, NULL, &ps_selected);
strvec_clear(&args);
clear_pathspec(&ps_selected);
}
@@ -1040,10 +961,10 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
struct child_process cmd = CHILD_PROCESS_INIT;
strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
- if (s->context != -1)
- strvec_pushf(&cmd.args, "--unified=%i", s->context);
- if (s->interhunkcontext != -1)
- strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
+ if (s->cfg.context != -1)
+ strvec_pushf(&cmd.args, "--unified=%i", s->cfg.context);
+ if (s->cfg.interhunkcontext != -1)
+ strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->cfg.interhunkcontext);
strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
s->r->hash_algo->empty_tree), "--", NULL);
for (i = 0; i < files->items.nr; i++)
@@ -1061,17 +982,17 @@ static int run_help(struct add_i_state *s, const struct pathspec *ps UNUSED,
struct prefix_item_list *files UNUSED,
struct list_and_choose_options *opts UNUSED)
{
- color_fprintf_ln(stdout, s->help_color, "status - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "status - %s",
_("show paths with changes"));
- color_fprintf_ln(stdout, s->help_color, "update - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "update - %s",
_("add working tree state to the staged set of changes"));
- color_fprintf_ln(stdout, s->help_color, "revert - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "revert - %s",
_("revert staged set of changes back to the HEAD version"));
- color_fprintf_ln(stdout, s->help_color, "patch - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "patch - %s",
_("pick hunks and update selectively"));
- color_fprintf_ln(stdout, s->help_color, "diff - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "diff - %s",
_("view diff between HEAD and index"));
- color_fprintf_ln(stdout, s->help_color, "add untracked - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "add untracked - %s",
_("add contents of untracked files to the staged set of changes"));
return 0;
@@ -1079,21 +1000,21 @@ static int run_help(struct add_i_state *s, const struct pathspec *ps UNUSED,
static void choose_prompt_help(struct add_i_state *s)
{
- color_fprintf_ln(stdout, s->help_color, "%s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "%s",
_("Prompt help:"));
- color_fprintf_ln(stdout, s->help_color, "1 - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "1 - %s",
_("select a single item"));
- color_fprintf_ln(stdout, s->help_color, "3-5 - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "3-5 - %s",
_("select a range of items"));
- color_fprintf_ln(stdout, s->help_color, "2-3,6-9 - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "2-3,6-9 - %s",
_("select multiple ranges"));
- color_fprintf_ln(stdout, s->help_color, "foo - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "foo - %s",
_("select item based on unique prefix"));
- color_fprintf_ln(stdout, s->help_color, "-... - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "-... - %s",
_("unselect specified items"));
- color_fprintf_ln(stdout, s->help_color, "* - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, "* - %s",
_("choose all items"));
- color_fprintf_ln(stdout, s->help_color, " - %s",
+ color_fprintf_ln(stdout, s->cfg.help_color, " - %s",
_("(empty) finish selecting"));
}
@@ -1128,7 +1049,7 @@ static void print_command_item(int i, int selected UNUSED,
static void command_prompt_help(struct add_i_state *s)
{
- const char *help_color = s->help_color;
+ const char *help_color = s->cfg.help_color;
color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));
color_fprintf_ln(stdout, help_color, "1 - %s",
_("select a numbered item"));
@@ -1139,7 +1060,7 @@ static void command_prompt_help(struct add_i_state *s)
}
int run_add_i(struct repository *r, const struct pathspec *ps,
- struct add_p_opt *add_p_opt)
+ struct interactive_options *interactive_opts)
{
struct add_i_state s = { NULL };
struct print_command_item_data data = { "[", "]" };
@@ -1182,15 +1103,15 @@ int run_add_i(struct repository *r, const struct pathspec *ps,
->util = util;
}
- init_add_i_state(&s, r, add_p_opt);
+ init_add_i_state(&s, r, interactive_opts);
/*
* When color was asked for, use the prompt color for
* highlighting, otherwise use square brackets.
*/
- if (s.use_color) {
- data.color = s.prompt_color;
- data.reset = s.reset_color;
+ if (s.cfg.use_color) {
+ data.color = s.cfg.prompt_color;
+ data.reset = s.cfg.reset_color;
}
print_file_item_data.color = data.color;
print_file_item_data.reset = data.reset;
diff --git a/add-interactive.h b/add-interactive.h
index fb95b6ee05..eefa2edc7c 100644
--- a/add-interactive.h
+++ b/add-interactive.h
@@ -2,34 +2,20 @@
#define ADD_INTERACTIVE_H
#include "add-patch.h"
-#include "color.h"
struct pathspec;
struct repository;
struct add_i_state {
struct repository *r;
- int use_color;
- char header_color[COLOR_MAXLEN];
- char help_color[COLOR_MAXLEN];
- char prompt_color[COLOR_MAXLEN];
- char error_color[COLOR_MAXLEN];
- char reset_color[COLOR_MAXLEN];
- char fraginfo_color[COLOR_MAXLEN];
- char context_color[COLOR_MAXLEN];
- char file_old_color[COLOR_MAXLEN];
- char file_new_color[COLOR_MAXLEN];
-
- int use_single_key;
- char *interactive_diff_filter, *interactive_diff_algorithm;
- int context, interhunkcontext;
+ struct interactive_config cfg;
};
void init_add_i_state(struct add_i_state *s, struct repository *r,
- struct add_p_opt *add_p_opt);
+ struct interactive_options *opts);
void clear_add_i_state(struct add_i_state *s);
int run_add_i(struct repository *r, const struct pathspec *ps,
- struct add_p_opt *add_p_opt);
+ struct interactive_options *opts);
#endif
diff --git a/add-patch.c b/add-patch.c
index e2b002fa73..45bc254e0c 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -5,6 +5,8 @@
#include "add-interactive.h"
#include "add-patch.h"
#include "advice.h"
+#include "config.h"
+#include "diff.h"
#include "editor.h"
#include "environment.h"
#include "gettext.h"
@@ -279,6 +281,99 @@ struct add_p_state {
const char *revision;
};
+static void init_color(struct repository *r,
+ struct interactive_config *cfg,
+ const char *section_and_slot, char *dst,
+ const char *default_color)
+{
+ char *key = xstrfmt("color.%s", section_and_slot);
+ const char *value;
+
+ if (!cfg->use_color)
+ dst[0] = '\0';
+ else if (repo_config_get_value(r, key, &value) ||
+ color_parse(value, dst))
+ strlcpy(dst, default_color, COLOR_MAXLEN);
+
+ free(key);
+}
+
+void interactive_config_init(struct interactive_config *cfg,
+ struct repository *r,
+ struct interactive_options *opts)
+{
+ const char *value;
+
+ cfg->context = -1;
+ cfg->interhunkcontext = -1;
+
+ if (repo_config_get_value(r, "color.interactive", &value))
+ cfg->use_color = -1;
+ else
+ cfg->use_color =
+ git_config_colorbool("color.interactive", value);
+ cfg->use_color = want_color(cfg->use_color);
+
+ init_color(r, cfg, "interactive.header", cfg->header_color, GIT_COLOR_BOLD);
+ init_color(r, cfg, "interactive.help", cfg->help_color, GIT_COLOR_BOLD_RED);
+ init_color(r, cfg, "interactive.prompt", cfg->prompt_color,
+ GIT_COLOR_BOLD_BLUE);
+ init_color(r, cfg, "interactive.error", cfg->error_color,
+ GIT_COLOR_BOLD_RED);
+
+ init_color(r, cfg, "diff.frag", cfg->fraginfo_color,
+ diff_get_color(cfg->use_color, DIFF_FRAGINFO));
+ init_color(r, cfg, "diff.context", cfg->context_color, "fall back");
+ if (!strcmp(cfg->context_color, "fall back"))
+ init_color(r, cfg, "diff.plain", cfg->context_color,
+ diff_get_color(cfg->use_color, DIFF_CONTEXT));
+ init_color(r, cfg, "diff.old", cfg->file_old_color,
+ diff_get_color(cfg->use_color, DIFF_FILE_OLD));
+ init_color(r, cfg, "diff.new", cfg->file_new_color,
+ diff_get_color(cfg->use_color, DIFF_FILE_NEW));
+
+ strlcpy(cfg->reset_color,
+ cfg->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
+
+ FREE_AND_NULL(cfg->interactive_diff_filter);
+ repo_config_get_string(r, "interactive.difffilter",
+ &cfg->interactive_diff_filter);
+
+ FREE_AND_NULL(cfg->interactive_diff_algorithm);
+ repo_config_get_string(r, "diff.algorithm",
+ &cfg->interactive_diff_algorithm);
+
+ if (!repo_config_get_int(r, "diff.context", &cfg->context))
+ if (cfg->context < 0)
+ die(_("%s cannot be negative"), "diff.context");
+ if (!repo_config_get_int(r, "diff.interHunkContext", &cfg->interhunkcontext))
+ if (cfg->interhunkcontext < 0)
+ die(_("%s cannot be negative"), "diff.interHunkContext");
+
+ repo_config_get_bool(r, "interactive.singlekey", &cfg->use_single_key);
+ if (cfg->use_single_key)
+ setbuf(stdin, NULL);
+
+ if (opts->context != -1) {
+ if (opts->context < 0)
+ die(_("%s cannot be negative"), "--unified");
+ cfg->context = opts->context;
+ }
+ if (opts->interhunkcontext != -1) {
+ if (opts->interhunkcontext < 0)
+ die(_("%s cannot be negative"), "--inter-hunk-context");
+ cfg->interhunkcontext = opts->interhunkcontext;
+ }
+}
+
+void interactive_config_clear(struct interactive_config *cfg)
+{
+ FREE_AND_NULL(cfg->interactive_diff_filter);
+ FREE_AND_NULL(cfg->interactive_diff_algorithm);
+ memset(cfg, 0, sizeof(*cfg));
+ cfg->use_color = -1;
+}
+
static void add_p_state_clear(struct add_p_state *s)
{
size_t i;
@@ -299,9 +394,9 @@ static void err(struct add_p_state *s, const char *fmt, ...)
va_list args;
va_start(args, fmt);
- fputs(s->s.error_color, stdout);
+ fputs(s->s.cfg.error_color, stdout);
vprintf(fmt, args);
- puts(s->s.reset_color);
+ puts(s->s.cfg.reset_color);
va_end(args);
}
@@ -424,12 +519,12 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
int res;
strvec_pushv(&args, s->mode->diff_cmd);
- if (s->s.context != -1)
- strvec_pushf(&args, "--unified=%i", s->s.context);
- if (s->s.interhunkcontext != -1)
- strvec_pushf(&args, "--inter-hunk-context=%i", s->s.interhunkcontext);
- if (s->s.interactive_diff_algorithm)
- strvec_pushf(&args, "--diff-algorithm=%s", s->s.interactive_diff_algorithm);
+ if (s->s.cfg.context != -1)
+ strvec_pushf(&args, "--unified=%i", s->s.cfg.context);
+ if (s->s.cfg.interhunkcontext != -1)
+ strvec_pushf(&args, "--inter-hunk-context=%i", s->s.cfg.interhunkcontext);
+ if (s->s.cfg.interactive_diff_algorithm)
+ strvec_pushf(&args, "--diff-algorithm=%s", s->s.cfg.interactive_diff_algorithm);
if (s->revision) {
struct object_id oid;
strvec_push(&args,
@@ -460,7 +555,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
if (want_color_fd(1, -1)) {
struct child_process colored_cp = CHILD_PROCESS_INIT;
- const char *diff_filter = s->s.interactive_diff_filter;
+ const char *diff_filter = s->s.cfg.interactive_diff_filter;
setup_child_process(s, &colored_cp, NULL);
xsnprintf((char *)args.v[color_arg_index], 8, "--color");
@@ -693,7 +788,7 @@ static void render_hunk(struct add_p_state *s, struct hunk *hunk,
hunk->colored_end - hunk->colored_start);
return;
} else {
- strbuf_addstr(out, s->s.fraginfo_color);
+ strbuf_addstr(out, s->s.cfg.fraginfo_color);
p = s->colored.buf + header->colored_extra_start;
len = header->colored_extra_end
- header->colored_extra_start;
@@ -715,7 +810,7 @@ static void render_hunk(struct add_p_state *s, struct hunk *hunk,
if (len)
strbuf_add(out, p, len);
else if (colored)
- strbuf_addf(out, "%s\n", s->s.reset_color);
+ strbuf_addf(out, "%s\n", s->s.cfg.reset_color);
else
strbuf_addch(out, '\n');
}
@@ -1103,12 +1198,12 @@ static void recolor_hunk(struct add_p_state *s, struct hunk *hunk)
strbuf_addstr(&s->colored,
plain[current] == '-' ?
- s->s.file_old_color :
+ s->s.cfg.file_old_color :
plain[current] == '+' ?
- s->s.file_new_color :
- s->s.context_color);
+ s->s.cfg.file_new_color :
+ s->s.cfg.context_color);
strbuf_add(&s->colored, plain + current, eol - current);
- strbuf_addstr(&s->colored, s->s.reset_color);
+ strbuf_addstr(&s->colored, s->s.cfg.reset_color);
if (next > eol)
strbuf_add(&s->colored, plain + eol, next - eol);
current = next;
@@ -1227,7 +1322,7 @@ static int run_apply_check(struct add_p_state *s,
static int read_single_character(struct add_p_state *s)
{
- if (s->s.use_single_key) {
+ if (s->s.cfg.use_single_key) {
int res = read_key_without_echo(&s->answer);
printf("%s\n", res == EOF ? "" : s->answer.buf);
return res;
@@ -1241,7 +1336,7 @@ static int read_single_character(struct add_p_state *s)
static int prompt_yesno(struct add_p_state *s, const char *prompt)
{
for (;;) {
- color_fprintf(stdout, s->s.prompt_color, "%s", _(prompt));
+ color_fprintf(stdout, s->s.cfg.prompt_color, "%s", _(prompt));
fflush(stdout);
if (read_single_character(s) == EOF)
return -1;
@@ -1522,15 +1617,15 @@ static int patch_update_file(struct add_p_state *s,
else
prompt_mode_type = PROMPT_HUNK;
- printf("%s(%"PRIuMAX"/%"PRIuMAX") ", s->s.prompt_color,
+ printf("%s(%"PRIuMAX"/%"PRIuMAX") ", s->s.cfg.prompt_color,
(uintmax_t)hunk_index + 1,
(uintmax_t)(file_diff->hunk_nr
? file_diff->hunk_nr
: 1));
printf(_(s->mode->prompt_mode[prompt_mode_type]),
s->buf.buf);
- if (*s->s.reset_color)
- fputs(s->s.reset_color, stdout);
+ if (*s->s.cfg.reset_color)
+ fputs(s->s.cfg.reset_color, stdout);
fflush(stdout);
if (read_single_character(s) == EOF)
break;
@@ -1687,7 +1782,7 @@ static int patch_update_file(struct add_p_state *s,
err(s, _("Sorry, cannot split this hunk"));
} else if (!split_hunk(s, file_diff,
hunk - file_diff->hunk)) {
- color_fprintf_ln(stdout, s->s.header_color,
+ color_fprintf_ln(stdout, s->s.cfg.header_color,
_("Split into %d hunks."),
(int)splittable_into);
rendered_hunk_index = -1;
@@ -1705,7 +1800,7 @@ static int patch_update_file(struct add_p_state *s,
} else if (s->answer.buf[0] == '?') {
const char *p = _(help_patch_remainder), *eol = p;
- color_fprintf(stdout, s->s.help_color, "%s",
+ color_fprintf(stdout, s->s.cfg.help_color, "%s",
_(s->mode->help_patch_text));
/*
@@ -1723,7 +1818,7 @@ static int patch_update_file(struct add_p_state *s,
if (*p != '?' && !strchr(s->buf.buf, *p))
continue;
- color_fprintf_ln(stdout, s->s.help_color,
+ color_fprintf_ln(stdout, s->s.cfg.help_color,
"%.*s", (int)(eol - p), p);
}
} else {
@@ -1764,7 +1859,7 @@ static int patch_update_file(struct add_p_state *s,
}
int run_add_p(struct repository *r, enum add_p_mode mode,
- struct add_p_opt *o, const char *revision,
+ struct interactive_options *opts, const char *revision,
const struct pathspec *ps)
{
struct add_p_state s = {
@@ -1772,7 +1867,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
};
size_t i, binary_count = 0;
- init_add_i_state(&s.s, r, o);
+ init_add_i_state(&s.s, r, opts);
if (mode == ADD_P_STASH)
s.mode = &patch_mode_stash;
diff --git a/add-patch.h b/add-patch.h
index 4394c74107..51c0d7bce9 100644
--- a/add-patch.h
+++ b/add-patch.h
@@ -1,15 +1,42 @@
#ifndef ADD_PATCH_H
#define ADD_PATCH_H
+#include "color.h"
+
struct pathspec;
struct repository;
-struct add_p_opt {
+struct interactive_options {
int context;
int interhunkcontext;
};
-#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
+#define INTERACTIVE_OPTIONS_INIT { \
+ .context = -1, \
+ .interhunkcontext = -1, \
+}
+
+struct interactive_config {
+ int use_color;
+ char header_color[COLOR_MAXLEN];
+ char help_color[COLOR_MAXLEN];
+ char prompt_color[COLOR_MAXLEN];
+ char error_color[COLOR_MAXLEN];
+ char reset_color[COLOR_MAXLEN];
+ char fraginfo_color[COLOR_MAXLEN];
+ char context_color[COLOR_MAXLEN];
+ char file_old_color[COLOR_MAXLEN];
+ char file_new_color[COLOR_MAXLEN];
+
+ int use_single_key;
+ char *interactive_diff_filter, *interactive_diff_algorithm;
+ int context, interhunkcontext;
+};
+
+void interactive_config_init(struct interactive_config *cfg,
+ struct repository *r,
+ struct interactive_options *opts);
+void interactive_config_clear(struct interactive_config *cfg);
enum add_p_mode {
ADD_P_ADD,
@@ -20,7 +47,7 @@ enum add_p_mode {
};
int run_add_p(struct repository *r, enum add_p_mode mode,
- struct add_p_opt *o, const char *revision,
+ struct interactive_options *opts, const char *revision,
const struct pathspec *ps);
#endif
diff --git a/builtin/add.c b/builtin/add.c
index 0235854f80..a94c826c14 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -30,7 +30,7 @@ static const char * const builtin_add_usage[] = {
NULL
};
static int patch_interactive, add_interactive, edit_interactive;
-static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+static struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
static int take_worktree_changes;
static int add_renormalize;
static int pathspec_file_nul;
@@ -159,7 +159,7 @@ static int refresh(struct repository *repo, int verbose, const struct pathspec *
int interactive_add(struct repository *repo,
const char **argv,
const char *prefix,
- int patch, struct add_p_opt *add_p_opt)
+ int patch, struct interactive_options *interactive_opts)
{
struct pathspec pathspec;
int ret;
@@ -171,9 +171,9 @@ int interactive_add(struct repository *repo,
prefix, argv);
if (patch)
- ret = !!run_add_p(repo, ADD_P_ADD, add_p_opt, NULL, &pathspec);
+ ret = !!run_add_p(repo, ADD_P_ADD, interactive_opts, NULL, &pathspec);
else
- ret = !!run_add_i(repo, &pathspec, add_p_opt);
+ ret = !!run_add_i(repo, &pathspec, interactive_opts);
clear_pathspec(&pathspec);
return ret;
@@ -255,8 +255,8 @@ static struct option builtin_add_options[] = {
OPT_GROUP(""),
OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
- OPT_DIFF_UNIFIED(&add_p_opt.context),
- OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
+ OPT_DIFF_UNIFIED(&interactive_opts.context),
+ OPT_DIFF_INTERHUNK_CONTEXT(&interactive_opts.interhunkcontext),
OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
@@ -398,9 +398,9 @@ int cmd_add(int argc,
prepare_repo_settings(repo);
repo->settings.command_requires_full_index = 0;
- if (add_p_opt.context < -1)
+ if (interactive_opts.context < -1)
die(_("'%s' cannot be negative"), "--unified");
- if (add_p_opt.interhunkcontext < -1)
+ if (interactive_opts.interhunkcontext < -1)
die(_("'%s' cannot be negative"), "--inter-hunk-context");
if (patch_interactive)
@@ -410,11 +410,11 @@ int cmd_add(int argc,
die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
if (pathspec_from_file)
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
- exit(interactive_add(repo, argv + 1, prefix, patch_interactive, &add_p_opt));
+ exit(interactive_add(repo, argv + 1, prefix, patch_interactive, &interactive_opts));
} else {
- if (add_p_opt.context != -1)
+ if (interactive_opts.context != -1)
die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
- if (add_p_opt.interhunkcontext != -1)
+ if (interactive_opts.interhunkcontext != -1)
die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
}
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 43583c8d1b..0b90f398fe 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -546,7 +546,7 @@ static int checkout_paths(const struct checkout_opts *opts,
if (opts->patch_mode) {
enum add_p_mode patch_mode;
- struct add_p_opt add_p_opt = {
+ struct interactive_options interactive_opts = {
.context = opts->patch_context,
.interhunkcontext = opts->patch_interhunk_context,
};
@@ -575,7 +575,7 @@ static int checkout_paths(const struct checkout_opts *opts,
else
BUG("either flag must have been set, worktree=%d, index=%d",
opts->checkout_worktree, opts->checkout_index);
- return !!run_add_p(the_repository, patch_mode, &add_p_opt,
+ return !!run_add_p(the_repository, patch_mode, &interactive_opts,
rev, &opts->pathspec);
}
diff --git a/builtin/commit.c b/builtin/commit.c
index b5b9608813..767351fd87 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -123,7 +123,7 @@ static const char *edit_message, *use_message;
static char *fixup_message, *fixup_commit, *squash_message;
static const char *fixup_prefix;
static int all, also, interactive, patch_interactive, only, amend, signoff;
-static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+static struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
static int edit_flag = -1; /* unspecified */
static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
static int config_commit_verbose = -1; /* unspecified */
@@ -356,9 +356,9 @@ static const char *prepare_index(const char **argv, const char *prefix,
const char *ret;
char *path = NULL;
- if (add_p_opt.context < -1)
+ if (interactive_opts.context < -1)
die(_("'%s' cannot be negative"), "--unified");
- if (add_p_opt.interhunkcontext < -1)
+ if (interactive_opts.interhunkcontext < -1)
die(_("'%s' cannot be negative"), "--inter-hunk-context");
if (is_status)
@@ -407,7 +407,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
- if (interactive_add(the_repository, argv, prefix, patch_interactive, &add_p_opt) != 0)
+ if (interactive_add(the_repository, argv, prefix, patch_interactive, &interactive_opts) != 0)
die(_("interactive add failed"));
the_repository->index_file = old_repo_index_file;
@@ -432,9 +432,9 @@ static const char *prepare_index(const char **argv, const char *prefix,
ret = get_lock_file_path(&index_lock);
goto out;
} else {
- if (add_p_opt.context != -1)
+ if (interactive_opts.context != -1)
die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
- if (add_p_opt.interhunkcontext != -1)
+ if (interactive_opts.interhunkcontext != -1)
die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
}
@@ -1738,8 +1738,8 @@ int cmd_commit(int argc,
OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
- OPT_DIFF_UNIFIED(&add_p_opt.context),
- OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
+ OPT_DIFF_UNIFIED(&interactive_opts.context),
+ OPT_DIFF_INTERHUNK_CONTEXT(&interactive_opts.interhunkcontext),
OPT_BOOL('o', "only", &only, N_("commit only specified files")),
OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
diff --git a/builtin/reset.c b/builtin/reset.c
index ed35802af1..088449e120 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -346,7 +346,7 @@ int cmd_reset(int argc,
struct object_id oid;
struct pathspec pathspec;
int intent_to_add = 0;
- struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+ struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
const struct option options[] = {
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
OPT_BOOL(0, "no-refresh", &no_refresh,
@@ -371,8 +371,8 @@ int cmd_reset(int argc,
PARSE_OPT_OPTARG,
option_parse_recurse_submodules_worktree_updater),
OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
- OPT_DIFF_UNIFIED(&add_p_opt.context),
- OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
+ OPT_DIFF_UNIFIED(&interactive_opts.context),
+ OPT_DIFF_INTERHUNK_CONTEXT(&interactive_opts.interhunkcontext),
OPT_BOOL('N', "intent-to-add", &intent_to_add,
N_("record only the fact that removed paths will be added later")),
OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
@@ -423,9 +423,9 @@ int cmd_reset(int argc,
oidcpy(&oid, &tree->object.oid);
}
- if (add_p_opt.context < -1)
+ if (interactive_opts.context < -1)
die(_("'%s' cannot be negative"), "--unified");
- if (add_p_opt.interhunkcontext < -1)
+ if (interactive_opts.interhunkcontext < -1)
die(_("'%s' cannot be negative"), "--inter-hunk-context");
prepare_repo_settings(the_repository);
@@ -436,12 +436,12 @@ int cmd_reset(int argc,
die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
trace2_cmd_mode("patch-interactive");
update_ref_status = !!run_add_p(the_repository, ADD_P_RESET,
- &add_p_opt, rev, &pathspec);
+ &interactive_opts, rev, &pathspec);
goto cleanup;
} else {
- if (add_p_opt.context != -1)
+ if (interactive_opts.context != -1)
die(_("the option '%s' requires '%s'"), "--unified", "--patch");
- if (add_p_opt.interhunkcontext != -1)
+ if (interactive_opts.interhunkcontext != -1)
die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
}
diff --git a/builtin/stash.c b/builtin/stash.c
index 1977e50df2..5070b8a88f 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1302,7 +1302,7 @@ static int stash_staged(struct stash_info *info, struct strbuf *out_patch,
static int stash_patch(struct stash_info *info, const struct pathspec *ps,
struct strbuf *out_patch, int quiet,
- struct add_p_opt *add_p_opt)
+ struct interactive_options *interactive_opts)
{
int ret = 0;
struct child_process cp_read_tree = CHILD_PROCESS_INIT;
@@ -1327,7 +1327,7 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
- ret = !!run_add_p(the_repository, ADD_P_STASH, add_p_opt, NULL, ps);
+ ret = !!run_add_p(the_repository, ADD_P_STASH, interactive_opts, NULL, ps);
the_repository->index_file = old_repo_index_file;
if (old_index_env && *old_index_env)
@@ -1422,7 +1422,8 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
}
static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
- int include_untracked, int patch_mode, struct add_p_opt *add_p_opt,
+ int include_untracked, int patch_mode,
+ struct interactive_options *interactive_opts,
int only_staged, struct stash_info *info, struct strbuf *patch,
int quiet)
{
@@ -1504,7 +1505,7 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
untracked_commit_option = 1;
}
if (patch_mode) {
- ret = stash_patch(info, ps, patch, quiet, add_p_opt);
+ ret = stash_patch(info, ps, patch, quiet, interactive_opts);
if (ret < 0) {
if (!quiet)
fprintf_ln(stderr, _("Cannot save the current "
@@ -1590,7 +1591,8 @@ static int create_stash(int argc, const char **argv, const char *prefix UNUSED,
}
static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
- int keep_index, int patch_mode, struct add_p_opt *add_p_opt,
+ int keep_index, int patch_mode,
+ struct interactive_options *interactive_opts,
int include_untracked, int only_staged)
{
int ret = 0;
@@ -1662,7 +1664,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
if (stash_msg)
strbuf_addstr(&stash_msg_buf, stash_msg);
if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
- add_p_opt, only_staged, &info, &patch, quiet)) {
+ interactive_opts, only_staged, &info, &patch, quiet)) {
ret = -1;
goto done;
}
@@ -1835,7 +1837,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
const char *stash_msg = NULL;
char *pathspec_from_file = NULL;
struct pathspec ps;
- struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+ struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
struct option options[] = {
OPT_BOOL('k', "keep-index", &keep_index,
N_("keep index")),
@@ -1843,8 +1845,8 @@ static int push_stash(int argc, const char **argv, const char *prefix,
N_("stash staged changes only")),
OPT_BOOL('p', "patch", &patch_mode,
N_("stash in patch mode")),
- OPT_DIFF_UNIFIED(&add_p_opt.context),
- OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
+ OPT_DIFF_UNIFIED(&interactive_opts.context),
+ OPT_DIFF_INTERHUNK_CONTEXT(&interactive_opts.interhunkcontext),
OPT__QUIET(&quiet, N_("quiet mode")),
OPT_BOOL('u', "include-untracked", &include_untracked,
N_("include untracked files in stash")),
@@ -1901,19 +1903,19 @@ static int push_stash(int argc, const char **argv, const char *prefix,
}
if (!patch_mode) {
- if (add_p_opt.context != -1)
+ if (interactive_opts.context != -1)
die(_("the option '%s' requires '%s'"), "--unified", "--patch");
- if (add_p_opt.interhunkcontext != -1)
+ if (interactive_opts.interhunkcontext != -1)
die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
}
- if (add_p_opt.context < -1)
+ if (interactive_opts.context < -1)
die(_("'%s' cannot be negative"), "--unified");
- if (add_p_opt.interhunkcontext < -1)
+ if (interactive_opts.interhunkcontext < -1)
die(_("'%s' cannot be negative"), "--inter-hunk-context");
ret = do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
- &add_p_opt, include_untracked, only_staged);
+ &interactive_opts, include_untracked, only_staged);
clear_pathspec(&ps);
free(pathspec_from_file);
@@ -1938,7 +1940,7 @@ static int save_stash(int argc, const char **argv, const char *prefix,
const char *stash_msg = NULL;
struct pathspec ps;
struct strbuf stash_msg_buf = STRBUF_INIT;
- struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
+ struct interactive_options interactive_opts = INTERACTIVE_OPTIONS_INIT;
struct option options[] = {
OPT_BOOL('k', "keep-index", &keep_index,
N_("keep index")),
@@ -1946,8 +1948,8 @@ static int save_stash(int argc, const char **argv, const char *prefix,
N_("stash staged changes only")),
OPT_BOOL('p', "patch", &patch_mode,
N_("stash in patch mode")),
- OPT_DIFF_UNIFIED(&add_p_opt.context),
- OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
+ OPT_DIFF_UNIFIED(&interactive_opts.context),
+ OPT_DIFF_INTERHUNK_CONTEXT(&interactive_opts.interhunkcontext),
OPT__QUIET(&quiet, N_("quiet mode")),
OPT_BOOL('u', "include-untracked", &include_untracked,
N_("include untracked files in stash")),
@@ -1967,20 +1969,20 @@ static int save_stash(int argc, const char **argv, const char *prefix,
memset(&ps, 0, sizeof(ps));
- if (add_p_opt.context < -1)
+ if (interactive_opts.context < -1)
die(_("'%s' cannot be negative"), "--unified");
- if (add_p_opt.interhunkcontext < -1)
+ if (interactive_opts.interhunkcontext < -1)
die(_("'%s' cannot be negative"), "--inter-hunk-context");
if (!patch_mode) {
- if (add_p_opt.context != -1)
+ if (interactive_opts.context != -1)
die(_("the option '%s' requires '%s'"), "--unified", "--patch");
- if (add_p_opt.interhunkcontext != -1)
+ if (interactive_opts.interhunkcontext != -1)
die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
}
ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
- patch_mode, &add_p_opt, include_untracked,
+ patch_mode, &interactive_opts, include_untracked,
only_staged);
strbuf_release(&stash_msg_buf);
diff --git a/commit.h b/commit.h
index 1d6e0c7518..7b6e59d6c1 100644
--- a/commit.h
+++ b/commit.h
@@ -258,7 +258,7 @@ int for_each_commit_graft(each_commit_graft_fn, void *);
int interactive_add(struct repository *repo,
const char **argv,
const char *prefix,
- int patch, struct add_p_opt *add_p_opt);
+ int patch, struct interactive_options *opts);
struct commit_extra_header {
struct commit_extra_header *next;
--
2.51.0.261.g7ce5a0a67e.dirty
