git
/
add-interactive.c
1211 строк · 31.1 Кб
1#define USE_THE_REPOSITORY_VARIABLE2{27char *key = xstrfmt("color.%s", section_and_slot);28const char *value;29}38{41const char *value;42}85{88FREE_AND_NULL(s->interactive_diff_filter);89FREE_AND_NULL(s->interactive_diff_algorithm);90memset(s, 0, sizeof(*s));91s->use_color = -1;92}93/*95* A "prefix item list" is a list of items that are identified by a string, and96* a unique prefix (if any) is determined for each item.97*98* It is implemented in the form of a pair of `string_list`s, the first one99* duplicating the strings, with the `util` field pointing at a structure whose100* first field must be `size_t prefix_length`.101*102* That `prefix_length` field will be computed by `find_unique_prefixes()`; It103* will be set to zero if no valid, unique prefix could be found.104*105* The second `string_list` is called `sorted` and does _not_ duplicate the106* strings but simply reuses the first one's, with the `util` field pointing at107* the `string_item_list` of the first `string_list`. It will be populated and108* sorted by `find_unique_prefixes()`.109*/110struct prefix_item_list {111struct string_list items;112struct string_list sorted;113int *selected; /* for multi-selections */114size_t min_length, max_length;115};116#define PREFIX_ITEM_LIST_INIT { \117.items = STRING_LIST_INIT_DUP, \118.sorted = STRING_LIST_INIT_NODUP, \119.min_length = 1, \120.max_length = 4, \121}122{125string_list_clear(&list->items, 1);126string_list_clear(&list->sorted, 0);127FREE_AND_NULL(list->selected);128}129{133size_t *len = p->util;134* Is `p` a strict prefix of `other`? Or have we exhausted the143* maximal length of the prefix? Or is the current character a144* multi-byte UTF-8 one? If so, there is no valid, unique145* prefix.146*/147if (!c || ++*len > max_length || !isascii(c)) {148*len = 0;149break;150}151}156{159size_t i;160}200{203int index = string_list_find_insert_index(&list->sorted, string, 1);204struct string_list_item *item;205}226{238int i, last_lf = 0;239}264struct list_and_choose_options {265struct list_options list_opts;266/*279* Returns the selected index in singleton mode, the number of selected items280* otherwise.281*282* If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,283* `LIST_AND_CHOOSE_QUIT` is returned.284*/285static ssize_t list_and_choose(struct add_i_state *s,286struct prefix_item_list *items,287struct list_and_choose_options *opts)288{289int singleton = opts->flags & SINGLETON;290int immediate = opts->flags & IMMEDIATE;291* A range can be specified like 5-7 or 5-.359*360* Note: `from` is 0-based while the user input361* is 1-based, hence we have to decrement by362* one. We do not have to decrement `to` even363* if it is 0-based because it is an exclusive364* boundary.365*/366from = strtoul(p, &endp, 10) - 1;367if (endp == p + sep)368to = from + 1;369else if (*endp == '-') {370if (isdigit(*(++endp)))371to = strtoul(endp, &endp, 10);372else373to = items->items.nr;374/* extra characters after the range? */375if (endp != p + sep)376from = -1;377}378}379}418{431struct file_item *item = xcalloc(1, sizeof(*item));432}435{447const struct pathname_entry *e1 =448container_of(he1, const struct pathname_entry, ent);449const struct pathname_entry *e2 =450container_of(he2, const struct pathname_entry, ent);451}454{470struct collection_status *s = data;471struct diffstat_t stat = { 0 };472int i;473}522{536struct object_id head_oid;537int is_initial = !refs_resolve_ref_unsafe(get_main_ref_store(the_repository),538"HEAD", RESOLVE_REF_READING,539&head_oid, NULL);540struct collection_status s = { 0 };541int i;542}594{598if (ad->binary)599strbuf_addstr(buf, _("binary"));600else if (ad->seen)601strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX,602(uintmax_t)ad->add, (uintmax_t)ad->del);603else604strbuf_addstr(buf, no_changes);605}606/* filters out prefixes which have special meaning to list_and_choose() */608static int is_valid_prefix(const char *prefix, size_t prefix_len)609{610return prefix_len && prefix &&611/*612* We expect `prefix` to be NUL terminated, therefore this613* `strcspn()` call is okay, even if it might do much more614* work than strictly necessary.615*/616strcspn(prefix, " \t\r\n,") >= prefix_len && /* separators */617*prefix != '-' && /* deselection */618!isdigit(*prefix) && /* selection */619(prefix_len != 1 ||620(*prefix != '*' && /* "all" wildcard */621*prefix != '?')); /* prompt help */622}623{633struct file_item *c = item->util;634struct print_file_item_data *d = print_file_item_data;635const char *highlighted = NULL;636}665{670if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0)671return -1;672}678{683int res = 0, fd;684size_t count, i;685struct lock_file index_lock;686}735{739int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;740}758{763int res = 0, fd;764size_t count, i, j;765}845{850struct dir_struct dir = { 0 };851size_t i;852struct strbuf buf = STRBUF_INIT;853}876{881struct print_file_item_data *d = opts->list_opts.print_item_data;882int res = 0, fd;883size_t count, i;884struct lock_file index_lock;885}928{933int res = 0;934ssize_t count, i, j;935size_t unmerged_count = 0, binary_count = 0;936}989{994int res = 0;995ssize_t count, i;996}1031{1036color_fprintf_ln(stdout, s->help_color, "status - %s",1037_("show paths with changes"));1038color_fprintf_ln(stdout, s->help_color, "update - %s",1039_("add working tree state to the staged set of changes"));1040color_fprintf_ln(stdout, s->help_color, "revert - %s",1041_("revert staged set of changes back to the HEAD version"));1042color_fprintf_ln(stdout, s->help_color, "patch - %s",1043_("pick hunks and update selectively"));1044color_fprintf_ln(stdout, s->help_color, "diff - %s",1045_("view diff between HEAD and index"));1046color_fprintf_ln(stdout, s->help_color, "add untracked - %s",1047_("add contents of untracked files to the staged set of changes"));1048}1051{1054color_fprintf_ln(stdout, s->help_color, "%s",1055_("Prompt help:"));1056color_fprintf_ln(stdout, s->help_color, "1 - %s",1057_("select a single item"));1058color_fprintf_ln(stdout, s->help_color, "3-5 - %s",1059_("select a range of items"));1060color_fprintf_ln(stdout, s->help_color, "2-3,6-9 - %s",1061_("select multiple ranges"));1062color_fprintf_ln(stdout, s->help_color, "foo - %s",1063_("select item based on unique prefix"));1064color_fprintf_ln(stdout, s->help_color, "-... - %s",1065_("unselect specified items"));1066color_fprintf_ln(stdout, s->help_color, "* - %s",1067_("choose all items"));1068color_fprintf_ln(stdout, s->help_color, " - %s",1069_("(empty) finish selecting"));1070}1071{1089struct print_command_item_data *d = print_command_item_data;1090struct command_item *util = item->util;1091}1100{1103const char *help_color = s->help_color;1104color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));1105color_fprintf_ln(stdout, help_color, "1 - %s",1106_("select a numbered item"));1107color_fprintf_ln(stdout, help_color, "foo - %s",1108_("select item based on unique prefix"));1109color_fprintf_ln(stdout, help_color, " - %s",1110_("(empty) select nothing"));1111}1112{1115struct add_i_state s = { NULL };1116struct print_command_item_data data = { "[", "]" };1117struct list_and_choose_options main_loop_opts = {1118{ 4, N_("*** Commands ***"), print_command_item, &data },1119N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help1120};1121struct {1122const char *string;1123command_t command;1124} command_list[] = {1125{ "status", run_status },1126{ "update", run_update },1127{ "revert", run_revert },1128{ "add untracked", run_add_untracked },1129{ "patch", run_patch },1130{ "diff", run_diff },1131{ "quit", NULL },1132{ "help", run_help },1133};1134struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT;1135* When color was asked for, use the prompt color for1160* highlighting, otherwise use square brackets.1161*/1162if (s.use_color) {1163data.color = s.prompt_color;1164data.reset = s.reset_color;1165}1166print_file_item_data.color = data.color;1167print_file_item_data.reset = data.reset;1168}1212