built-in add -i: prepare for multi-selection commands
The `update`, `revert` and `add-untracked` commands allow selecting multiple entries. Let's extend the `list_and_choose()` function to accommodate those use cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
Junio C Hamano
parent
c08171d156
commit
f37c226454
@ -72,15 +72,17 @@ static void init_add_i_state(struct add_i_state *s, struct repository *r)
|
||||
struct prefix_item_list {
|
||||
struct string_list items;
|
||||
struct string_list sorted;
|
||||
int *selected; /* for multi-selections */
|
||||
size_t min_length, max_length;
|
||||
};
|
||||
#define PREFIX_ITEM_LIST_INIT \
|
||||
{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, 1, 4 }
|
||||
{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 }
|
||||
|
||||
static void prefix_item_list_clear(struct prefix_item_list *list)
|
||||
{
|
||||
string_list_clear(&list->items, 1);
|
||||
string_list_clear(&list->sorted, 0);
|
||||
FREE_AND_NULL(list->selected);
|
||||
}
|
||||
|
||||
static void extend_prefix_length(struct string_list_item *p,
|
||||
@ -182,11 +184,12 @@ static ssize_t find_unique(const char *string, struct prefix_item_list *list)
|
||||
struct list_options {
|
||||
int columns;
|
||||
const char *header;
|
||||
void (*print_item)(int i, struct string_list_item *item, void *print_item_data);
|
||||
void (*print_item)(int i, int selected, struct string_list_item *item,
|
||||
void *print_item_data);
|
||||
void *print_item_data;
|
||||
};
|
||||
|
||||
static void list(struct add_i_state *s, struct string_list *list,
|
||||
static void list(struct add_i_state *s, struct string_list *list, int *selected,
|
||||
struct list_options *opts)
|
||||
{
|
||||
int i, last_lf = 0;
|
||||
@ -199,7 +202,8 @@ static void list(struct add_i_state *s, struct string_list *list,
|
||||
"%s", opts->header);
|
||||
|
||||
for (i = 0; i < list->nr; i++) {
|
||||
opts->print_item(i, list->items + i, opts->print_item_data);
|
||||
opts->print_item(i, selected ? selected[i] : 0, list->items + i,
|
||||
opts->print_item_data);
|
||||
|
||||
if ((opts->columns) && ((i + 1) % (opts->columns))) {
|
||||
putchar('\t');
|
||||
@ -218,6 +222,10 @@ struct list_and_choose_options {
|
||||
struct list_options list_opts;
|
||||
|
||||
const char *prompt;
|
||||
enum {
|
||||
SINGLETON = (1<<0),
|
||||
IMMEDIATE = (1<<1),
|
||||
} flags;
|
||||
void (*print_help)(struct add_i_state *s);
|
||||
};
|
||||
|
||||
@ -225,7 +233,8 @@ struct list_and_choose_options {
|
||||
#define LIST_AND_CHOOSE_QUIT (-2)
|
||||
|
||||
/*
|
||||
* Returns the selected index.
|
||||
* Returns the selected index in singleton mode, the number of selected items
|
||||
* otherwise.
|
||||
*
|
||||
* If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,
|
||||
* `LIST_AND_CHOOSE_QUIT` is returned.
|
||||
@ -234,8 +243,19 @@ static ssize_t list_and_choose(struct add_i_state *s,
|
||||
struct prefix_item_list *items,
|
||||
struct list_and_choose_options *opts)
|
||||
{
|
||||
int singleton = opts->flags & SINGLETON;
|
||||
int immediate = opts->flags & IMMEDIATE;
|
||||
|
||||
struct strbuf input = STRBUF_INIT;
|
||||
ssize_t res = LIST_AND_CHOOSE_ERROR;
|
||||
ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0;
|
||||
|
||||
if (!singleton) {
|
||||
free(items->selected);
|
||||
CALLOC_ARRAY(items->selected, items->items.nr);
|
||||
}
|
||||
|
||||
if (singleton && !immediate)
|
||||
BUG("singleton requires immediate");
|
||||
|
||||
find_unique_prefixes(items);
|
||||
|
||||
@ -244,14 +264,15 @@ static ssize_t list_and_choose(struct add_i_state *s,
|
||||
|
||||
strbuf_reset(&input);
|
||||
|
||||
list(s, &items->items, &opts->list_opts);
|
||||
list(s, &items->items, items->selected, &opts->list_opts);
|
||||
|
||||
color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
|
||||
fputs("> ", stdout);
|
||||
fputs(singleton ? "> " : ">> ", stdout);
|
||||
fflush(stdout);
|
||||
|
||||
if (strbuf_getline(&input, stdin) == EOF) {
|
||||
putchar('\n');
|
||||
if (immediate)
|
||||
res = LIST_AND_CHOOSE_QUIT;
|
||||
break;
|
||||
}
|
||||
@ -268,7 +289,9 @@ static ssize_t list_and_choose(struct add_i_state *s,
|
||||
p = input.buf;
|
||||
for (;;) {
|
||||
size_t sep = strcspn(p, " \t\r\n,");
|
||||
ssize_t index = -1;
|
||||
int choose = 1;
|
||||
/* `from` is inclusive, `to` is exclusive */
|
||||
ssize_t from = -1, to = -1;
|
||||
|
||||
if (!sep) {
|
||||
if (!*p)
|
||||
@ -277,30 +300,70 @@ static ssize_t list_and_choose(struct add_i_state *s,
|
||||
continue;
|
||||
}
|
||||
|
||||
if (isdigit(*p)) {
|
||||
/* Input that begins with '-'; de-select */
|
||||
if (*p == '-') {
|
||||
choose = 0;
|
||||
p++;
|
||||
sep--;
|
||||
}
|
||||
|
||||
if (sep == 1 && *p == '*') {
|
||||
from = 0;
|
||||
to = items->items.nr;
|
||||
} else if (isdigit(*p)) {
|
||||
char *endp;
|
||||
index = strtoul(p, &endp, 10) - 1;
|
||||
/*
|
||||
* A range can be specified like 5-7 or 5-.
|
||||
*
|
||||
* Note: `from` is 0-based while the user input
|
||||
* is 1-based, hence we have to decrement by
|
||||
* one. We do not have to decrement `to` even
|
||||
* if it is 0-based because it is an exclusive
|
||||
* boundary.
|
||||
*/
|
||||
from = strtoul(p, &endp, 10) - 1;
|
||||
if (endp == p + sep)
|
||||
to = from + 1;
|
||||
else if (*endp == '-') {
|
||||
to = strtoul(++endp, &endp, 10);
|
||||
/* extra characters after the range? */
|
||||
if (endp != p + sep)
|
||||
index = -1;
|
||||
from = -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (p[sep])
|
||||
p[sep++] = '\0';
|
||||
if (index < 0)
|
||||
index = find_unique(p, items);
|
||||
if (from < 0) {
|
||||
from = find_unique(p, items);
|
||||
if (from >= 0)
|
||||
to = from + 1;
|
||||
}
|
||||
|
||||
if (index < 0 || index >= items->items.nr)
|
||||
if (from < 0 || from >= items->items.nr ||
|
||||
(singleton && from + 1 != to)) {
|
||||
color_fprintf_ln(stdout, s->error_color,
|
||||
_("Huh (%s)?"), p);
|
||||
else {
|
||||
res = index;
|
||||
break;
|
||||
} else if (singleton) {
|
||||
res = from;
|
||||
break;
|
||||
}
|
||||
|
||||
if (to > items->items.nr)
|
||||
to = items->items.nr;
|
||||
|
||||
for (; from < to; from++)
|
||||
if (items->selected[from] != choose) {
|
||||
items->selected[from] = choose;
|
||||
res += choose ? +1 : -1;
|
||||
}
|
||||
|
||||
p += sep;
|
||||
}
|
||||
|
||||
if (res != LIST_AND_CHOOSE_ERROR)
|
||||
if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||
|
||||
!strcmp(input.buf, "*"))
|
||||
break;
|
||||
}
|
||||
|
||||
@ -500,7 +563,7 @@ struct print_file_item_data {
|
||||
struct strbuf buf, index, worktree;
|
||||
};
|
||||
|
||||
static void print_file_item(int i, struct string_list_item *item,
|
||||
static void print_file_item(int i, int selected, struct string_list_item *item,
|
||||
void *print_file_item_data)
|
||||
{
|
||||
struct file_item *c = item->util;
|
||||
@ -515,7 +578,7 @@ static void print_file_item(int i, struct string_list_item *item,
|
||||
strbuf_addf(&d->buf, d->modified_fmt,
|
||||
d->index.buf, d->worktree.buf, item->string);
|
||||
|
||||
printf(" %2d: %s", i + 1, d->buf.buf);
|
||||
printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf);
|
||||
}
|
||||
|
||||
static int run_status(struct add_i_state *s, const struct pathspec *ps,
|
||||
@ -524,7 +587,7 @@ static int run_status(struct add_i_state *s, const struct pathspec *ps,
|
||||
if (get_modified_files(s->r, NO_FILTER, files, ps) < 0)
|
||||
return -1;
|
||||
|
||||
list(s, files, opts);
|
||||
list(s, files, NULL, opts);
|
||||
putchar('\n');
|
||||
|
||||
return 0;
|
||||
@ -563,7 +626,8 @@ struct print_command_item_data {
|
||||
const char *color, *reset;
|
||||
};
|
||||
|
||||
static void print_command_item(int i, struct string_list_item *item,
|
||||
static void print_command_item(int i, int selected,
|
||||
struct string_list_item *item,
|
||||
void *print_command_item_data)
|
||||
{
|
||||
struct print_command_item_data *d = print_command_item_data;
|
||||
@ -596,7 +660,7 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
|
||||
struct print_command_item_data data = { "[", "]" };
|
||||
struct list_and_choose_options main_loop_opts = {
|
||||
{ 4, N_("*** Commands ***"), print_command_item, &data },
|
||||
N_("What now"), command_prompt_help
|
||||
N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help
|
||||
};
|
||||
struct {
|
||||
const char *string;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user