Merge branch 'rs/diff-parseopts-cleanup'
[git/gitster.git] / add-interactive.c
blobe17602b5e415d0f6fd0f96b9b012303751d3cbcb
1 #include "git-compat-util.h"
2 #include "add-interactive.h"
3 #include "color.h"
4 #include "config.h"
5 #include "diffcore.h"
6 #include "gettext.h"
7 #include "hash.h"
8 #include "hex.h"
9 #include "preload-index.h"
10 #include "read-cache-ll.h"
11 #include "repository.h"
12 #include "revision.h"
13 #include "refs.h"
14 #include "string-list.h"
15 #include "lockfile.h"
16 #include "dir.h"
17 #include "run-command.h"
18 #include "prompt.h"
19 #include "tree.h"
21 static void init_color(struct repository *r, struct add_i_state *s,
22 const char *section_and_slot, char *dst,
23 const char *default_color)
25 char *key = xstrfmt("color.%s", section_and_slot);
26 const char *value;
28 if (!s->use_color)
29 dst[0] = '\0';
30 else if (repo_config_get_value(r, key, &value) ||
31 color_parse(value, dst))
32 strlcpy(dst, default_color, COLOR_MAXLEN);
34 free(key);
37 void init_add_i_state(struct add_i_state *s, struct repository *r)
39 const char *value;
41 s->r = r;
43 if (repo_config_get_value(r, "color.interactive", &value))
44 s->use_color = -1;
45 else
46 s->use_color =
47 git_config_colorbool("color.interactive", value);
48 s->use_color = want_color(s->use_color);
50 init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD);
51 init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED);
52 init_color(r, s, "interactive.prompt", s->prompt_color,
53 GIT_COLOR_BOLD_BLUE);
54 init_color(r, s, "interactive.error", s->error_color,
55 GIT_COLOR_BOLD_RED);
57 init_color(r, s, "diff.frag", s->fraginfo_color,
58 diff_get_color(s->use_color, DIFF_FRAGINFO));
59 init_color(r, s, "diff.context", s->context_color, "fall back");
60 if (!strcmp(s->context_color, "fall back"))
61 init_color(r, s, "diff.plain", s->context_color,
62 diff_get_color(s->use_color, DIFF_CONTEXT));
63 init_color(r, s, "diff.old", s->file_old_color,
64 diff_get_color(s->use_color, DIFF_FILE_OLD));
65 init_color(r, s, "diff.new", s->file_new_color,
66 diff_get_color(s->use_color, DIFF_FILE_NEW));
68 strlcpy(s->reset_color,
69 s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
71 FREE_AND_NULL(s->interactive_diff_filter);
72 git_config_get_string("interactive.difffilter",
73 &s->interactive_diff_filter);
75 FREE_AND_NULL(s->interactive_diff_algorithm);
76 git_config_get_string("diff.algorithm",
77 &s->interactive_diff_algorithm);
79 git_config_get_bool("interactive.singlekey", &s->use_single_key);
80 if (s->use_single_key)
81 setbuf(stdin, NULL);
84 void clear_add_i_state(struct add_i_state *s)
86 FREE_AND_NULL(s->interactive_diff_filter);
87 FREE_AND_NULL(s->interactive_diff_algorithm);
88 memset(s, 0, sizeof(*s));
89 s->use_color = -1;
93 * A "prefix item list" is a list of items that are identified by a string, and
94 * a unique prefix (if any) is determined for each item.
96 * It is implemented in the form of a pair of `string_list`s, the first one
97 * duplicating the strings, with the `util` field pointing at a structure whose
98 * first field must be `size_t prefix_length`.
100 * That `prefix_length` field will be computed by `find_unique_prefixes()`; It
101 * will be set to zero if no valid, unique prefix could be found.
103 * The second `string_list` is called `sorted` and does _not_ duplicate the
104 * strings but simply reuses the first one's, with the `util` field pointing at
105 * the `string_item_list` of the first `string_list`. It will be populated and
106 * sorted by `find_unique_prefixes()`.
108 struct prefix_item_list {
109 struct string_list items;
110 struct string_list sorted;
111 int *selected; /* for multi-selections */
112 size_t min_length, max_length;
114 #define PREFIX_ITEM_LIST_INIT { \
115 .items = STRING_LIST_INIT_DUP, \
116 .sorted = STRING_LIST_INIT_NODUP, \
117 .min_length = 1, \
118 .max_length = 4, \
121 static void prefix_item_list_clear(struct prefix_item_list *list)
123 string_list_clear(&list->items, 1);
124 string_list_clear(&list->sorted, 0);
125 FREE_AND_NULL(list->selected);
128 static void extend_prefix_length(struct string_list_item *p,
129 const char *other_string, size_t max_length)
131 size_t *len = p->util;
133 if (!*len || memcmp(p->string, other_string, *len))
134 return;
136 for (;;) {
137 char c = p->string[*len];
140 * Is `p` a strict prefix of `other`? Or have we exhausted the
141 * maximal length of the prefix? Or is the current character a
142 * multi-byte UTF-8 one? If so, there is no valid, unique
143 * prefix.
145 if (!c || ++*len > max_length || !isascii(c)) {
146 *len = 0;
147 break;
150 if (c != other_string[*len - 1])
151 break;
155 static void find_unique_prefixes(struct prefix_item_list *list)
157 size_t i;
159 if (list->sorted.nr == list->items.nr)
160 return;
162 string_list_clear(&list->sorted, 0);
163 /* Avoid reallocating incrementally */
164 list->sorted.items = xmalloc(st_mult(sizeof(*list->sorted.items),
165 list->items.nr));
166 list->sorted.nr = list->sorted.alloc = list->items.nr;
168 for (i = 0; i < list->items.nr; i++) {
169 list->sorted.items[i].string = list->items.items[i].string;
170 list->sorted.items[i].util = list->items.items + i;
173 string_list_sort(&list->sorted);
175 for (i = 0; i < list->sorted.nr; i++) {
176 struct string_list_item *sorted_item = list->sorted.items + i;
177 struct string_list_item *item = sorted_item->util;
178 size_t *len = item->util;
180 *len = 0;
181 while (*len < list->min_length) {
182 char c = item->string[(*len)++];
184 if (!c || !isascii(c)) {
185 *len = 0;
186 break;
190 if (i > 0)
191 extend_prefix_length(item, sorted_item[-1].string,
192 list->max_length);
193 if (i + 1 < list->sorted.nr)
194 extend_prefix_length(item, sorted_item[1].string,
195 list->max_length);
199 static ssize_t find_unique(const char *string, struct prefix_item_list *list)
201 int index = string_list_find_insert_index(&list->sorted, string, 1);
202 struct string_list_item *item;
204 if (list->items.nr != list->sorted.nr)
205 BUG("prefix_item_list in inconsistent state (%"PRIuMAX
206 " vs %"PRIuMAX")",
207 (uintmax_t)list->items.nr, (uintmax_t)list->sorted.nr);
209 if (index < 0)
210 item = list->sorted.items[-1 - index].util;
211 else if (index > 0 &&
212 starts_with(list->sorted.items[index - 1].string, string))
213 return -1;
214 else if (index + 1 < list->sorted.nr &&
215 starts_with(list->sorted.items[index + 1].string, string))
216 return -1;
217 else if (index < list->sorted.nr &&
218 starts_with(list->sorted.items[index].string, string))
219 item = list->sorted.items[index].util;
220 else
221 return -1;
222 return item - list->items.items;
225 struct list_options {
226 int columns;
227 const char *header;
228 void (*print_item)(int i, int selected, struct string_list_item *item,
229 void *print_item_data);
230 void *print_item_data;
233 static void list(struct add_i_state *s, struct string_list *list, int *selected,
234 struct list_options *opts)
236 int i, last_lf = 0;
238 if (!list->nr)
239 return;
241 if (opts->header)
242 color_fprintf_ln(stdout, s->header_color,
243 "%s", opts->header);
245 for (i = 0; i < list->nr; i++) {
246 opts->print_item(i, selected ? selected[i] : 0, list->items + i,
247 opts->print_item_data);
249 if ((opts->columns) && ((i + 1) % (opts->columns))) {
250 putchar('\t');
251 last_lf = 0;
253 else {
254 putchar('\n');
255 last_lf = 1;
259 if (!last_lf)
260 putchar('\n');
262 struct list_and_choose_options {
263 struct list_options list_opts;
265 const char *prompt;
266 enum {
267 SINGLETON = (1<<0),
268 IMMEDIATE = (1<<1),
269 } flags;
270 void (*print_help)(struct add_i_state *s);
273 #define LIST_AND_CHOOSE_ERROR (-1)
274 #define LIST_AND_CHOOSE_QUIT (-2)
277 * Returns the selected index in singleton mode, the number of selected items
278 * otherwise.
280 * If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,
281 * `LIST_AND_CHOOSE_QUIT` is returned.
283 static ssize_t list_and_choose(struct add_i_state *s,
284 struct prefix_item_list *items,
285 struct list_and_choose_options *opts)
287 int singleton = opts->flags & SINGLETON;
288 int immediate = opts->flags & IMMEDIATE;
290 struct strbuf input = STRBUF_INIT;
291 ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0;
293 if (!singleton) {
294 free(items->selected);
295 CALLOC_ARRAY(items->selected, items->items.nr);
298 if (singleton && !immediate)
299 BUG("singleton requires immediate");
301 find_unique_prefixes(items);
303 for (;;) {
304 char *p;
306 strbuf_reset(&input);
308 list(s, &items->items, items->selected, &opts->list_opts);
310 color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
311 fputs(singleton ? "> " : ">> ", stdout);
312 fflush(stdout);
314 if (git_read_line_interactively(&input) == EOF) {
315 putchar('\n');
316 if (immediate)
317 res = LIST_AND_CHOOSE_QUIT;
318 break;
321 if (!input.len)
322 break;
324 if (!strcmp(input.buf, "?")) {
325 opts->print_help(s);
326 continue;
329 p = input.buf;
330 for (;;) {
331 size_t sep = strcspn(p, " \t\r\n,");
332 int choose = 1;
333 /* `from` is inclusive, `to` is exclusive */
334 ssize_t from = -1, to = -1;
336 if (!sep) {
337 if (!*p)
338 break;
339 p++;
340 continue;
343 /* Input that begins with '-'; de-select */
344 if (*p == '-') {
345 choose = 0;
346 p++;
347 sep--;
350 if (sep == 1 && *p == '*') {
351 from = 0;
352 to = items->items.nr;
353 } else if (isdigit(*p)) {
354 char *endp;
356 * A range can be specified like 5-7 or 5-.
358 * Note: `from` is 0-based while the user input
359 * is 1-based, hence we have to decrement by
360 * one. We do not have to decrement `to` even
361 * if it is 0-based because it is an exclusive
362 * boundary.
364 from = strtoul(p, &endp, 10) - 1;
365 if (endp == p + sep)
366 to = from + 1;
367 else if (*endp == '-') {
368 if (isdigit(*(++endp)))
369 to = strtoul(endp, &endp, 10);
370 else
371 to = items->items.nr;
372 /* extra characters after the range? */
373 if (endp != p + sep)
374 from = -1;
378 if (p[sep])
379 p[sep++] = '\0';
380 if (from < 0) {
381 from = find_unique(p, items);
382 if (from >= 0)
383 to = from + 1;
386 if (from < 0 || from >= items->items.nr ||
387 (singleton && from + 1 != to)) {
388 color_fprintf_ln(stderr, s->error_color,
389 _("Huh (%s)?"), p);
390 break;
391 } else if (singleton) {
392 res = from;
393 break;
396 if (to > items->items.nr)
397 to = items->items.nr;
399 for (; from < to; from++)
400 if (items->selected[from] != choose) {
401 items->selected[from] = choose;
402 res += choose ? +1 : -1;
405 p += sep;
408 if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||
409 !strcmp(input.buf, "*"))
410 break;
413 strbuf_release(&input);
414 return res;
417 struct adddel {
418 uintmax_t add, del;
419 unsigned seen:1, unmerged:1, binary:1;
422 struct file_item {
423 size_t prefix_length;
424 struct adddel index, worktree;
427 static void add_file_item(struct string_list *files, const char *name)
429 struct file_item *item = xcalloc(1, sizeof(*item));
431 string_list_append(files, name)->util = item;
434 struct pathname_entry {
435 struct hashmap_entry ent;
436 const char *name;
437 struct file_item *item;
440 static int pathname_entry_cmp(const void *cmp_data UNUSED,
441 const struct hashmap_entry *he1,
442 const struct hashmap_entry *he2,
443 const void *name)
445 const struct pathname_entry *e1 =
446 container_of(he1, const struct pathname_entry, ent);
447 const struct pathname_entry *e2 =
448 container_of(he2, const struct pathname_entry, ent);
450 return strcmp(e1->name, name ? (const char *)name : e2->name);
453 struct collection_status {
454 enum { FROM_WORKTREE = 0, FROM_INDEX = 1 } mode;
456 const char *reference;
458 unsigned skip_unseen:1;
459 size_t unmerged_count, binary_count;
460 struct string_list *files;
461 struct hashmap file_map;
464 static void collect_changes_cb(struct diff_queue_struct *q,
465 struct diff_options *options,
466 void *data)
468 struct collection_status *s = data;
469 struct diffstat_t stat = { 0 };
470 int i;
472 if (!q->nr)
473 return;
475 compute_diffstat(options, &stat, q);
477 for (i = 0; i < stat.nr; i++) {
478 const char *name = stat.files[i]->name;
479 int hash = strhash(name);
480 struct pathname_entry *entry;
481 struct file_item *file_item;
482 struct adddel *adddel, *other_adddel;
484 entry = hashmap_get_entry_from_hash(&s->file_map, hash, name,
485 struct pathname_entry, ent);
486 if (!entry) {
487 if (s->skip_unseen)
488 continue;
490 add_file_item(s->files, name);
492 CALLOC_ARRAY(entry, 1);
493 hashmap_entry_init(&entry->ent, hash);
494 entry->name = s->files->items[s->files->nr - 1].string;
495 entry->item = s->files->items[s->files->nr - 1].util;
496 hashmap_add(&s->file_map, &entry->ent);
499 file_item = entry->item;
500 adddel = s->mode == FROM_INDEX ?
501 &file_item->index : &file_item->worktree;
502 other_adddel = s->mode == FROM_INDEX ?
503 &file_item->worktree : &file_item->index;
504 adddel->seen = 1;
505 adddel->add = stat.files[i]->added;
506 adddel->del = stat.files[i]->deleted;
507 if (stat.files[i]->is_binary) {
508 if (!other_adddel->binary)
509 s->binary_count++;
510 adddel->binary = 1;
512 if (stat.files[i]->is_unmerged) {
513 if (!other_adddel->unmerged)
514 s->unmerged_count++;
515 adddel->unmerged = 1;
518 free_diffstat_info(&stat);
521 enum modified_files_filter {
522 NO_FILTER = 0,
523 WORKTREE_ONLY = 1,
524 INDEX_ONLY = 2,
527 static int get_modified_files(struct repository *r,
528 enum modified_files_filter filter,
529 struct prefix_item_list *files,
530 const struct pathspec *ps,
531 size_t *unmerged_count,
532 size_t *binary_count)
534 struct object_id head_oid;
535 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
536 &head_oid, NULL);
537 struct collection_status s = { 0 };
538 int i;
540 discard_index(r->index);
541 if (repo_read_index_preload(r, ps, 0) < 0)
542 return error(_("could not read index"));
544 prefix_item_list_clear(files);
545 s.files = &files->items;
546 hashmap_init(&s.file_map, pathname_entry_cmp, NULL, 0);
548 for (i = 0; i < 2; i++) {
549 struct rev_info rev;
550 struct setup_revision_opt opt = { 0 };
552 if (filter == INDEX_ONLY)
553 s.mode = (i == 0) ? FROM_INDEX : FROM_WORKTREE;
554 else
555 s.mode = (i == 0) ? FROM_WORKTREE : FROM_INDEX;
556 s.skip_unseen = filter && i;
558 opt.def = is_initial ?
559 empty_tree_oid_hex() : oid_to_hex(&head_oid);
561 repo_init_revisions(r, &rev, NULL);
562 setup_revisions(0, NULL, &rev, &opt);
564 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
565 rev.diffopt.format_callback = collect_changes_cb;
566 rev.diffopt.format_callback_data = &s;
568 if (ps)
569 copy_pathspec(&rev.prune_data, ps);
571 if (s.mode == FROM_INDEX)
572 run_diff_index(&rev, DIFF_INDEX_CACHED);
573 else {
574 rev.diffopt.flags.ignore_dirty_submodules = 1;
575 run_diff_files(&rev, 0);
578 release_revisions(&rev);
580 hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
581 if (unmerged_count)
582 *unmerged_count = s.unmerged_count;
583 if (binary_count)
584 *binary_count = s.binary_count;
586 /* While the diffs are ordered already, we ran *two* diffs... */
587 string_list_sort(&files->items);
589 return 0;
592 static void render_adddel(struct strbuf *buf,
593 struct adddel *ad, const char *no_changes)
595 if (ad->binary)
596 strbuf_addstr(buf, _("binary"));
597 else if (ad->seen)
598 strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX,
599 (uintmax_t)ad->add, (uintmax_t)ad->del);
600 else
601 strbuf_addstr(buf, no_changes);
604 /* filters out prefixes which have special meaning to list_and_choose() */
605 static int is_valid_prefix(const char *prefix, size_t prefix_len)
607 return prefix_len && prefix &&
609 * We expect `prefix` to be NUL terminated, therefore this
610 * `strcspn()` call is okay, even if it might do much more
611 * work than strictly necessary.
613 strcspn(prefix, " \t\r\n,") >= prefix_len && /* separators */
614 *prefix != '-' && /* deselection */
615 !isdigit(*prefix) && /* selection */
616 (prefix_len != 1 ||
617 (*prefix != '*' && /* "all" wildcard */
618 *prefix != '?')); /* prompt help */
621 struct print_file_item_data {
622 const char *modified_fmt, *color, *reset;
623 struct strbuf buf, name, index, worktree;
624 unsigned only_names:1;
627 static void print_file_item(int i, int selected, struct string_list_item *item,
628 void *print_file_item_data)
630 struct file_item *c = item->util;
631 struct print_file_item_data *d = print_file_item_data;
632 const char *highlighted = NULL;
634 strbuf_reset(&d->index);
635 strbuf_reset(&d->worktree);
636 strbuf_reset(&d->buf);
638 /* Format the item with the prefix highlighted. */
639 if (c->prefix_length > 0 &&
640 is_valid_prefix(item->string, c->prefix_length)) {
641 strbuf_reset(&d->name);
642 strbuf_addf(&d->name, "%s%.*s%s%s", d->color,
643 (int)c->prefix_length, item->string, d->reset,
644 item->string + c->prefix_length);
645 highlighted = d->name.buf;
648 if (d->only_names) {
649 printf("%c%2d: %s", selected ? '*' : ' ', i + 1,
650 highlighted ? highlighted : item->string);
651 return;
654 render_adddel(&d->worktree, &c->worktree, _("nothing"));
655 render_adddel(&d->index, &c->index, _("unchanged"));
657 strbuf_addf(&d->buf, d->modified_fmt, d->index.buf, d->worktree.buf,
658 highlighted ? highlighted : item->string);
660 printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf);
663 static int run_status(struct add_i_state *s, const struct pathspec *ps,
664 struct prefix_item_list *files,
665 struct list_and_choose_options *opts)
667 if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0)
668 return -1;
670 list(s, &files->items, NULL, &opts->list_opts);
671 putchar('\n');
673 return 0;
676 static int run_update(struct add_i_state *s, const struct pathspec *ps,
677 struct prefix_item_list *files,
678 struct list_and_choose_options *opts)
680 int res = 0, fd;
681 size_t count, i;
682 struct lock_file index_lock;
684 if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, NULL, NULL) < 0)
685 return -1;
687 if (!files->items.nr) {
688 putchar('\n');
689 return 0;
692 opts->prompt = N_("Update");
693 count = list_and_choose(s, files, opts);
694 if (count <= 0) {
695 putchar('\n');
696 return 0;
699 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
700 if (fd < 0) {
701 putchar('\n');
702 return -1;
705 for (i = 0; i < files->items.nr; i++) {
706 const char *name = files->items.items[i].string;
707 struct stat st;
709 if (!files->selected[i])
710 continue;
711 if (lstat(name, &st) && is_missing_file_error(errno)) {
712 if (remove_file_from_index(s->r->index, name) < 0) {
713 res = error(_("could not stage '%s'"), name);
714 break;
716 } else if (add_file_to_index(s->r->index, name, 0) < 0) {
717 res = error(_("could not stage '%s'"), name);
718 break;
722 if (!res && write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
723 res = error(_("could not write index"));
725 if (!res)
726 printf(Q_("updated %d path\n",
727 "updated %d paths\n", count), (int)count);
729 putchar('\n');
730 return res;
733 static void revert_from_diff(struct diff_queue_struct *q,
734 struct diff_options *opt, void *data UNUSED)
736 int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
738 for (i = 0; i < q->nr; i++) {
739 struct diff_filespec *one = q->queue[i]->one;
740 struct cache_entry *ce;
742 if (!(one->mode && !is_null_oid(&one->oid))) {
743 remove_file_from_index(opt->repo->index, one->path);
744 printf(_("note: %s is untracked now.\n"), one->path);
745 } else {
746 ce = make_cache_entry(opt->repo->index, one->mode,
747 &one->oid, one->path, 0, 0);
748 if (!ce)
749 die(_("make_cache_entry failed for path '%s'"),
750 one->path);
751 add_index_entry(opt->repo->index, ce, add_flags);
756 static int run_revert(struct add_i_state *s, const struct pathspec *ps,
757 struct prefix_item_list *files,
758 struct list_and_choose_options *opts)
760 int res = 0, fd;
761 size_t count, i, j;
763 struct object_id oid;
764 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
765 NULL);
766 struct lock_file index_lock;
767 const char **paths;
768 struct tree *tree;
769 struct diff_options diffopt = { NULL };
771 if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
772 return -1;
774 if (!files->items.nr) {
775 putchar('\n');
776 return 0;
779 opts->prompt = N_("Revert");
780 count = list_and_choose(s, files, opts);
781 if (count <= 0)
782 goto finish_revert;
784 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
785 if (fd < 0) {
786 res = -1;
787 goto finish_revert;
790 if (is_initial)
791 oidcpy(&oid, s->r->hash_algo->empty_tree);
792 else {
793 tree = parse_tree_indirect(&oid);
794 if (!tree) {
795 res = error(_("Could not parse HEAD^{tree}"));
796 goto finish_revert;
798 oidcpy(&oid, &tree->object.oid);
801 ALLOC_ARRAY(paths, count + 1);
802 for (i = j = 0; i < files->items.nr; i++)
803 if (files->selected[i])
804 paths[j++] = files->items.items[i].string;
805 paths[j] = NULL;
807 parse_pathspec(&diffopt.pathspec, 0,
808 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH,
809 NULL, paths);
811 diffopt.output_format = DIFF_FORMAT_CALLBACK;
812 diffopt.format_callback = revert_from_diff;
813 diffopt.flags.override_submodule_config = 1;
814 diffopt.repo = s->r;
816 if (do_diff_cache(&oid, &diffopt)) {
817 diff_free(&diffopt);
818 res = -1;
819 } else {
820 diffcore_std(&diffopt);
821 diff_flush(&diffopt);
823 free(paths);
825 if (!res && write_locked_index(s->r->index, &index_lock,
826 COMMIT_LOCK) < 0)
827 res = -1;
828 else
829 res = repo_refresh_and_write_index(s->r, REFRESH_QUIET, 0, 1,
830 NULL, NULL, NULL);
832 if (!res)
833 printf(Q_("reverted %d path\n",
834 "reverted %d paths\n", count), (int)count);
836 finish_revert:
837 putchar('\n');
838 return res;
841 static int get_untracked_files(struct repository *r,
842 struct prefix_item_list *files,
843 const struct pathspec *ps)
845 struct dir_struct dir = { 0 };
846 size_t i;
847 struct strbuf buf = STRBUF_INIT;
849 if (repo_read_index(r) < 0)
850 return error(_("could not read index"));
852 prefix_item_list_clear(files);
853 setup_standard_excludes(&dir);
854 add_pattern_list(&dir, EXC_CMDL, "--exclude option");
855 fill_directory(&dir, r->index, ps);
857 for (i = 0; i < dir.nr; i++) {
858 struct dir_entry *ent = dir.entries[i];
860 if (index_name_is_other(r->index, ent->name, ent->len)) {
861 strbuf_reset(&buf);
862 strbuf_add(&buf, ent->name, ent->len);
863 add_file_item(&files->items, buf.buf);
867 strbuf_release(&buf);
868 dir_clear(&dir);
869 return 0;
872 static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps,
873 struct prefix_item_list *files,
874 struct list_and_choose_options *opts)
876 struct print_file_item_data *d = opts->list_opts.print_item_data;
877 int res = 0, fd;
878 size_t count, i;
879 struct lock_file index_lock;
881 if (get_untracked_files(s->r, files, ps) < 0)
882 return -1;
884 if (!files->items.nr) {
885 printf(_("No untracked files.\n"));
886 goto finish_add_untracked;
889 opts->prompt = N_("Add untracked");
890 d->only_names = 1;
891 count = list_and_choose(s, files, opts);
892 d->only_names = 0;
893 if (count <= 0)
894 goto finish_add_untracked;
896 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
897 if (fd < 0) {
898 res = -1;
899 goto finish_add_untracked;
902 for (i = 0; i < files->items.nr; i++) {
903 const char *name = files->items.items[i].string;
904 if (files->selected[i] &&
905 add_file_to_index(s->r->index, name, 0) < 0) {
906 res = error(_("could not stage '%s'"), name);
907 break;
911 if (!res &&
912 write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
913 res = error(_("could not write index"));
915 if (!res)
916 printf(Q_("added %d path\n",
917 "added %d paths\n", count), (int)count);
919 finish_add_untracked:
920 putchar('\n');
921 return res;
924 static int run_patch(struct add_i_state *s, const struct pathspec *ps,
925 struct prefix_item_list *files,
926 struct list_and_choose_options *opts)
928 int res = 0;
929 ssize_t count, i, j;
930 size_t unmerged_count = 0, binary_count = 0;
932 if (get_modified_files(s->r, WORKTREE_ONLY, files, ps,
933 &unmerged_count, &binary_count) < 0)
934 return -1;
936 if (unmerged_count || binary_count) {
937 for (i = j = 0; i < files->items.nr; i++) {
938 struct file_item *item = files->items.items[i].util;
940 if (item->index.binary || item->worktree.binary) {
941 free(item);
942 free(files->items.items[i].string);
943 } else if (item->index.unmerged ||
944 item->worktree.unmerged) {
945 color_fprintf_ln(stderr, s->error_color,
946 _("ignoring unmerged: %s"),
947 files->items.items[i].string);
948 free(item);
949 free(files->items.items[i].string);
950 } else
951 files->items.items[j++] = files->items.items[i];
953 files->items.nr = j;
956 if (!files->items.nr) {
957 if (binary_count)
958 fprintf(stderr, _("Only binary files changed.\n"));
959 else
960 fprintf(stderr, _("No changes.\n"));
961 return 0;
964 opts->prompt = N_("Patch update");
965 count = list_and_choose(s, files, opts);
966 if (count > 0) {
967 struct strvec args = STRVEC_INIT;
968 struct pathspec ps_selected = { 0 };
970 for (i = 0; i < files->items.nr; i++)
971 if (files->selected[i])
972 strvec_push(&args,
973 files->items.items[i].string);
974 parse_pathspec(&ps_selected,
975 PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
976 PATHSPEC_LITERAL_PATH, "", args.v);
977 res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
978 strvec_clear(&args);
979 clear_pathspec(&ps_selected);
982 return res;
985 static int run_diff(struct add_i_state *s, const struct pathspec *ps,
986 struct prefix_item_list *files,
987 struct list_and_choose_options *opts)
989 int res = 0;
990 ssize_t count, i;
992 struct object_id oid;
993 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
994 NULL);
995 if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
996 return -1;
998 if (!files->items.nr) {
999 putchar('\n');
1000 return 0;
1003 opts->prompt = N_("Review diff");
1004 opts->flags = IMMEDIATE;
1005 count = list_and_choose(s, files, opts);
1006 opts->flags = 0;
1007 if (count > 0) {
1008 struct child_process cmd = CHILD_PROCESS_INIT;
1010 strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
1011 oid_to_hex(!is_initial ? &oid :
1012 s->r->hash_algo->empty_tree),
1013 "--", NULL);
1014 for (i = 0; i < files->items.nr; i++)
1015 if (files->selected[i])
1016 strvec_push(&cmd.args,
1017 files->items.items[i].string);
1018 res = run_command(&cmd);
1021 putchar('\n');
1022 return res;
1025 static int run_help(struct add_i_state *s, const struct pathspec *ps UNUSED,
1026 struct prefix_item_list *files UNUSED,
1027 struct list_and_choose_options *opts UNUSED)
1029 color_fprintf_ln(stdout, s->help_color, "status - %s",
1030 _("show paths with changes"));
1031 color_fprintf_ln(stdout, s->help_color, "update - %s",
1032 _("add working tree state to the staged set of changes"));
1033 color_fprintf_ln(stdout, s->help_color, "revert - %s",
1034 _("revert staged set of changes back to the HEAD version"));
1035 color_fprintf_ln(stdout, s->help_color, "patch - %s",
1036 _("pick hunks and update selectively"));
1037 color_fprintf_ln(stdout, s->help_color, "diff - %s",
1038 _("view diff between HEAD and index"));
1039 color_fprintf_ln(stdout, s->help_color, "add untracked - %s",
1040 _("add contents of untracked files to the staged set of changes"));
1042 return 0;
1045 static void choose_prompt_help(struct add_i_state *s)
1047 color_fprintf_ln(stdout, s->help_color, "%s",
1048 _("Prompt help:"));
1049 color_fprintf_ln(stdout, s->help_color, "1 - %s",
1050 _("select a single item"));
1051 color_fprintf_ln(stdout, s->help_color, "3-5 - %s",
1052 _("select a range of items"));
1053 color_fprintf_ln(stdout, s->help_color, "2-3,6-9 - %s",
1054 _("select multiple ranges"));
1055 color_fprintf_ln(stdout, s->help_color, "foo - %s",
1056 _("select item based on unique prefix"));
1057 color_fprintf_ln(stdout, s->help_color, "-... - %s",
1058 _("unselect specified items"));
1059 color_fprintf_ln(stdout, s->help_color, "* - %s",
1060 _("choose all items"));
1061 color_fprintf_ln(stdout, s->help_color, " - %s",
1062 _("(empty) finish selecting"));
1065 typedef int (*command_t)(struct add_i_state *s, const struct pathspec *ps,
1066 struct prefix_item_list *files,
1067 struct list_and_choose_options *opts);
1069 struct command_item {
1070 size_t prefix_length;
1071 command_t command;
1074 struct print_command_item_data {
1075 const char *color, *reset;
1078 static void print_command_item(int i, int selected UNUSED,
1079 struct string_list_item *item,
1080 void *print_command_item_data)
1082 struct print_command_item_data *d = print_command_item_data;
1083 struct command_item *util = item->util;
1085 if (!util->prefix_length ||
1086 !is_valid_prefix(item->string, util->prefix_length))
1087 printf(" %2d: %s", i + 1, item->string);
1088 else
1089 printf(" %2d: %s%.*s%s%s", i + 1,
1090 d->color, (int)util->prefix_length, item->string,
1091 d->reset, item->string + util->prefix_length);
1094 static void command_prompt_help(struct add_i_state *s)
1096 const char *help_color = s->help_color;
1097 color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));
1098 color_fprintf_ln(stdout, help_color, "1 - %s",
1099 _("select a numbered item"));
1100 color_fprintf_ln(stdout, help_color, "foo - %s",
1101 _("select item based on unique prefix"));
1102 color_fprintf_ln(stdout, help_color, " - %s",
1103 _("(empty) select nothing"));
1106 int run_add_i(struct repository *r, const struct pathspec *ps)
1108 struct add_i_state s = { NULL };
1109 struct print_command_item_data data = { "[", "]" };
1110 struct list_and_choose_options main_loop_opts = {
1111 { 4, N_("*** Commands ***"), print_command_item, &data },
1112 N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help
1114 struct {
1115 const char *string;
1116 command_t command;
1117 } command_list[] = {
1118 { "status", run_status },
1119 { "update", run_update },
1120 { "revert", run_revert },
1121 { "add untracked", run_add_untracked },
1122 { "patch", run_patch },
1123 { "diff", run_diff },
1124 { "quit", NULL },
1125 { "help", run_help },
1127 struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT;
1129 struct print_file_item_data print_file_item_data = {
1130 "%12s %12s %s", NULL, NULL,
1131 STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
1133 struct list_and_choose_options opts = {
1134 { 0, NULL, print_file_item, &print_file_item_data },
1135 NULL, 0, choose_prompt_help
1137 struct strbuf header = STRBUF_INIT;
1138 struct prefix_item_list files = PREFIX_ITEM_LIST_INIT;
1139 ssize_t i;
1140 int res = 0;
1142 for (i = 0; i < ARRAY_SIZE(command_list); i++) {
1143 struct command_item *util = xcalloc(1, sizeof(*util));
1144 util->command = command_list[i].command;
1145 string_list_append(&commands.items, command_list[i].string)
1146 ->util = util;
1149 init_add_i_state(&s, r);
1152 * When color was asked for, use the prompt color for
1153 * highlighting, otherwise use square brackets.
1155 if (s.use_color) {
1156 data.color = s.prompt_color;
1157 data.reset = s.reset_color;
1159 print_file_item_data.color = data.color;
1160 print_file_item_data.reset = data.reset;
1162 strbuf_addstr(&header, " ");
1163 strbuf_addf(&header, print_file_item_data.modified_fmt,
1164 _("staged"), _("unstaged"), _("path"));
1165 opts.list_opts.header = header.buf;
1167 discard_index(r->index);
1168 if (repo_read_index(r) < 0 ||
1169 repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
1170 NULL, NULL, NULL) < 0)
1171 warning(_("could not refresh index"));
1173 res = run_status(&s, ps, &files, &opts);
1175 for (;;) {
1176 struct command_item *util;
1178 i = list_and_choose(&s, &commands, &main_loop_opts);
1179 if (i < 0 || i >= commands.items.nr)
1180 util = NULL;
1181 else
1182 util = commands.items.items[i].util;
1184 if (i == LIST_AND_CHOOSE_QUIT || (util && !util->command)) {
1185 printf(_("Bye.\n"));
1186 res = 0;
1187 break;
1190 if (util)
1191 res = util->command(&s, ps, &files, &opts);
1194 prefix_item_list_clear(&files);
1195 strbuf_release(&print_file_item_data.buf);
1196 strbuf_release(&print_file_item_data.name);
1197 strbuf_release(&print_file_item_data.index);
1198 strbuf_release(&print_file_item_data.worktree);
1199 strbuf_release(&header);
1200 prefix_item_list_clear(&commands);
1201 clear_add_i_state(&s);
1203 return res;