mirror of
https://github.com/git/git.git
synced 2026-02-27 18:29:43 +00:00
06c81a1118
When using the interactive add, reset, stash or checkout machinery, we do not have the option of reworking with a file when selecting hunks, because the session automatically advances to the next file or ends if we have just one file. Introduce the flag `--auto-advance` which auto advances by default, when interactively selecting patches with the '--patch' option. However, the `--no-auto-advance` option does not auto advance, thereby allowing users the option to rework with files. Signed-off-by: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.4 KiB
C
58 lines
1.4 KiB
C
#ifndef ADD_INTERACTIVE_H
|
|
#define ADD_INTERACTIVE_H
|
|
|
|
#include "color.h"
|
|
|
|
struct add_p_opt {
|
|
int context;
|
|
int interhunkcontext;
|
|
int auto_advance;
|
|
};
|
|
|
|
#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1, .auto_advance = 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;
|
|
int auto_advance;
|
|
};
|
|
|
|
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
|