mirror of
https://github.com/git/git.git
synced 2025-12-05 18:47:16 -06:00
9d241b0113
Most of the diff code stores the decision about whether to show color as
a git_colorbool, and evaluates it at point-of-use with want_color().
This timing is important for reasons explained in daa0c3d971 (color:
delay auto-color decision until point of use, 2011-08-17).
The add-interactive code instead converts immediately to strict boolean
values using want_color(), and then evaluates those. This isn't wrong.
Even though we pass the bool values to diff_use_color(), which expects a
colorbool, the values are compatible. But it is unlike the rest of the
color code, and is questionable from a type-system perspective (but C's
typing between enums, ints, and bools is weak enough that the compiler
does not complain).
Let's switch it to the more usual way of calling want_color() at the
point of use.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.3 KiB
C
56 lines
1.3 KiB
C
#ifndef ADD_INTERACTIVE_H
|
|
#define ADD_INTERACTIVE_H
|
|
|
|
#include "color.h"
|
|
|
|
struct add_p_opt {
|
|
int context;
|
|
int interhunkcontext;
|
|
};
|
|
|
|
#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
|
|
|
|
struct add_i_state {
|
|
struct repository *r;
|
|
enum git_colorbool use_color_interactive;
|
|
enum git_colorbool use_color_diff;
|
|
char header_color[COLOR_MAXLEN];
|
|
char help_color[COLOR_MAXLEN];
|
|
char prompt_color[COLOR_MAXLEN];
|
|
char error_color[COLOR_MAXLEN];
|
|
char reset_color_interactive[COLOR_MAXLEN];
|
|
|
|
char fraginfo_color[COLOR_MAXLEN];
|
|
char context_color[COLOR_MAXLEN];
|
|
char file_old_color[COLOR_MAXLEN];
|
|
char file_new_color[COLOR_MAXLEN];
|
|
char reset_color_diff[COLOR_MAXLEN];
|
|
|
|
int use_single_key;
|
|
char *interactive_diff_filter, *interactive_diff_algorithm;
|
|
int context, interhunkcontext;
|
|
};
|
|
|
|
void init_add_i_state(struct add_i_state *s, struct repository *r,
|
|
struct add_p_opt *add_p_opt);
|
|
void clear_add_i_state(struct add_i_state *s);
|
|
|
|
struct repository;
|
|
struct pathspec;
|
|
int run_add_i(struct repository *r, const struct pathspec *ps,
|
|
struct add_p_opt *add_p_opt);
|
|
|
|
enum add_p_mode {
|
|
ADD_P_ADD,
|
|
ADD_P_STASH,
|
|
ADD_P_RESET,
|
|
ADD_P_CHECKOUT,
|
|
ADD_P_WORKTREE,
|
|
};
|
|
|
|
int run_add_p(struct repository *r, enum add_p_mode mode,
|
|
struct add_p_opt *o, const char *revision,
|
|
const struct pathspec *ps);
|
|
|
|
#endif
|