]> git.ipfire.org Git - thirdparty/git.git/blob - add-interactive.c
Merge branch 'jk/perf-lib-test-titles'
[thirdparty/git.git] / add-interactive.c
1 #include "cache.h"
2 #include "add-interactive.h"
3 #include "color.h"
4 #include "config.h"
5 #include "diffcore.h"
6 #include "revision.h"
7 #include "refs.h"
8 #include "string-list.h"
9 #include "lockfile.h"
10 #include "dir.h"
11 #include "run-command.h"
12 #include "prompt.h"
13
14 static void init_color(struct repository *r, struct add_i_state *s,
15 const char *section_and_slot, char *dst,
16 const char *default_color)
17 {
18 char *key = xstrfmt("color.%s", section_and_slot);
19 const char *value;
20
21 if (!s->use_color)
22 dst[0] = '\0';
23 else if (repo_config_get_value(r, key, &value) ||
24 color_parse(value, dst))
25 strlcpy(dst, default_color, COLOR_MAXLEN);
26
27 free(key);
28 }
29
30 void init_add_i_state(struct add_i_state *s, struct repository *r)
31 {
32 const char *value;
33
34 s->r = r;
35
36 if (repo_config_get_value(r, "color.interactive", &value))
37 s->use_color = -1;
38 else
39 s->use_color =
40 git_config_colorbool("color.interactive", value);
41 s->use_color = want_color(s->use_color);
42
43 init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD);
44 init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED);
45 init_color(r, s, "interactive.prompt", s->prompt_color,
46 GIT_COLOR_BOLD_BLUE);
47 init_color(r, s, "interactive.error", s->error_color,
48 GIT_COLOR_BOLD_RED);
49
50 init_color(r, s, "diff.frag", s->fraginfo_color,
51 diff_get_color(s->use_color, DIFF_FRAGINFO));
52 init_color(r, s, "diff.context", s->context_color, "fall back");
53 if (!strcmp(s->context_color, "fall back"))
54 init_color(r, s, "diff.plain", s->context_color,
55 diff_get_color(s->use_color, DIFF_CONTEXT));
56 init_color(r, s, "diff.old", s->file_old_color,
57 diff_get_color(s->use_color, DIFF_FILE_OLD));
58 init_color(r, s, "diff.new", s->file_new_color,
59 diff_get_color(s->use_color, DIFF_FILE_NEW));
60
61 strlcpy(s->reset_color,
62 s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
63
64 FREE_AND_NULL(s->interactive_diff_filter);
65 git_config_get_string("interactive.difffilter",
66 &s->interactive_diff_filter);
67
68 FREE_AND_NULL(s->interactive_diff_algorithm);
69 git_config_get_string("diff.algorithm",
70 &s->interactive_diff_algorithm);
71
72 git_config_get_bool("interactive.singlekey", &s->use_single_key);
73 if (s->use_single_key)
74 setbuf(stdin, NULL);
75 }
76
77 void clear_add_i_state(struct add_i_state *s)
78 {
79 FREE_AND_NULL(s->interactive_diff_filter);
80 FREE_AND_NULL(s->interactive_diff_algorithm);
81 memset(s, 0, sizeof(*s));
82 s->use_color = -1;
83 }
84
85 /*
86 * A "prefix item list" is a list of items that are identified by a string, and
87 * a unique prefix (if any) is determined for each item.
88 *
89 * It is implemented in the form of a pair of `string_list`s, the first one
90 * duplicating the strings, with the `util` field pointing at a structure whose
91 * first field must be `size_t prefix_length`.
92 *
93 * That `prefix_length` field will be computed by `find_unique_prefixes()`; It
94 * will be set to zero if no valid, unique prefix could be found.
95 *
96 * The second `string_list` is called `sorted` and does _not_ duplicate the
97 * strings but simply reuses the first one's, with the `util` field pointing at
98 * the `string_item_list` of the first `string_list`. It will be populated and
99 * sorted by `find_unique_prefixes()`.
100 */
101 struct prefix_item_list {
102 struct string_list items;
103 struct string_list sorted;
104 int *selected; /* for multi-selections */
105 size_t min_length, max_length;
106 };
107 #define PREFIX_ITEM_LIST_INIT { \
108 .items = STRING_LIST_INIT_DUP, \
109 .sorted = STRING_LIST_INIT_NODUP, \
110 .min_length = 1, \
111 .max_length = 4, \
112 }
113
114 static void prefix_item_list_clear(struct prefix_item_list *list)
115 {
116 string_list_clear(&list->items, 1);
117 string_list_clear(&list->sorted, 0);
118 FREE_AND_NULL(list->selected);
119 }
120
121 static void extend_prefix_length(struct string_list_item *p,
122 const char *other_string, size_t max_length)
123 {
124 size_t *len = p->util;
125
126 if (!*len || memcmp(p->string, other_string, *len))
127 return;
128
129 for (;;) {
130 char c = p->string[*len];
131
132 /*
133 * Is `p` a strict prefix of `other`? Or have we exhausted the
134 * maximal length of the prefix? Or is the current character a
135 * multi-byte UTF-8 one? If so, there is no valid, unique
136 * prefix.
137 */
138 if (!c || ++*len > max_length || !isascii(c)) {
139 *len = 0;
140 break;
141 }
142
143 if (c != other_string[*len - 1])
144 break;
145 }
146 }
147
148 static void find_unique_prefixes(struct prefix_item_list *list)
149 {
150 size_t i;
151
152 if (list->sorted.nr == list->items.nr)
153 return;
154
155 string_list_clear(&list->sorted, 0);
156 /* Avoid reallocating incrementally */
157 list->sorted.items = xmalloc(st_mult(sizeof(*list->sorted.items),
158 list->items.nr));
159 list->sorted.nr = list->sorted.alloc = list->items.nr;
160
161 for (i = 0; i < list->items.nr; i++) {
162 list->sorted.items[i].string = list->items.items[i].string;
163 list->sorted.items[i].util = list->items.items + i;
164 }
165
166 string_list_sort(&list->sorted);
167
168 for (i = 0; i < list->sorted.nr; i++) {
169 struct string_list_item *sorted_item = list->sorted.items + i;
170 struct string_list_item *item = sorted_item->util;
171 size_t *len = item->util;
172
173 *len = 0;
174 while (*len < list->min_length) {
175 char c = item->string[(*len)++];
176
177 if (!c || !isascii(c)) {
178 *len = 0;
179 break;
180 }
181 }
182
183 if (i > 0)
184 extend_prefix_length(item, sorted_item[-1].string,
185 list->max_length);
186 if (i + 1 < list->sorted.nr)
187 extend_prefix_length(item, sorted_item[1].string,
188 list->max_length);
189 }
190 }
191
192 static ssize_t find_unique(const char *string, struct prefix_item_list *list)
193 {
194 int index = string_list_find_insert_index(&list->sorted, string, 1);
195 struct string_list_item *item;
196
197 if (list->items.nr != list->sorted.nr)
198 BUG("prefix_item_list in inconsistent state (%"PRIuMAX
199 " vs %"PRIuMAX")",
200 (uintmax_t)list->items.nr, (uintmax_t)list->sorted.nr);
201
202 if (index < 0)
203 item = list->sorted.items[-1 - index].util;
204 else if (index > 0 &&
205 starts_with(list->sorted.items[index - 1].string, string))
206 return -1;
207 else if (index + 1 < list->sorted.nr &&
208 starts_with(list->sorted.items[index + 1].string, string))
209 return -1;
210 else if (index < list->sorted.nr &&
211 starts_with(list->sorted.items[index].string, string))
212 item = list->sorted.items[index].util;
213 else
214 return -1;
215 return item - list->items.items;
216 }
217
218 struct list_options {
219 int columns;
220 const char *header;
221 void (*print_item)(int i, int selected, struct string_list_item *item,
222 void *print_item_data);
223 void *print_item_data;
224 };
225
226 static void list(struct add_i_state *s, struct string_list *list, int *selected,
227 struct list_options *opts)
228 {
229 int i, last_lf = 0;
230
231 if (!list->nr)
232 return;
233
234 if (opts->header)
235 color_fprintf_ln(stdout, s->header_color,
236 "%s", opts->header);
237
238 for (i = 0; i < list->nr; i++) {
239 opts->print_item(i, selected ? selected[i] : 0, list->items + i,
240 opts->print_item_data);
241
242 if ((opts->columns) && ((i + 1) % (opts->columns))) {
243 putchar('\t');
244 last_lf = 0;
245 }
246 else {
247 putchar('\n');
248 last_lf = 1;
249 }
250 }
251
252 if (!last_lf)
253 putchar('\n');
254 }
255 struct list_and_choose_options {
256 struct list_options list_opts;
257
258 const char *prompt;
259 enum {
260 SINGLETON = (1<<0),
261 IMMEDIATE = (1<<1),
262 } flags;
263 void (*print_help)(struct add_i_state *s);
264 };
265
266 #define LIST_AND_CHOOSE_ERROR (-1)
267 #define LIST_AND_CHOOSE_QUIT (-2)
268
269 /*
270 * Returns the selected index in singleton mode, the number of selected items
271 * otherwise.
272 *
273 * If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,
274 * `LIST_AND_CHOOSE_QUIT` is returned.
275 */
276 static ssize_t list_and_choose(struct add_i_state *s,
277 struct prefix_item_list *items,
278 struct list_and_choose_options *opts)
279 {
280 int singleton = opts->flags & SINGLETON;
281 int immediate = opts->flags & IMMEDIATE;
282
283 struct strbuf input = STRBUF_INIT;
284 ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0;
285
286 if (!singleton) {
287 free(items->selected);
288 CALLOC_ARRAY(items->selected, items->items.nr);
289 }
290
291 if (singleton && !immediate)
292 BUG("singleton requires immediate");
293
294 find_unique_prefixes(items);
295
296 for (;;) {
297 char *p;
298
299 strbuf_reset(&input);
300
301 list(s, &items->items, items->selected, &opts->list_opts);
302
303 color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
304 fputs(singleton ? "> " : ">> ", stdout);
305 fflush(stdout);
306
307 if (git_read_line_interactively(&input) == EOF) {
308 putchar('\n');
309 if (immediate)
310 res = LIST_AND_CHOOSE_QUIT;
311 break;
312 }
313
314 if (!input.len)
315 break;
316
317 if (!strcmp(input.buf, "?")) {
318 opts->print_help(s);
319 continue;
320 }
321
322 p = input.buf;
323 for (;;) {
324 size_t sep = strcspn(p, " \t\r\n,");
325 int choose = 1;
326 /* `from` is inclusive, `to` is exclusive */
327 ssize_t from = -1, to = -1;
328
329 if (!sep) {
330 if (!*p)
331 break;
332 p++;
333 continue;
334 }
335
336 /* Input that begins with '-'; de-select */
337 if (*p == '-') {
338 choose = 0;
339 p++;
340 sep--;
341 }
342
343 if (sep == 1 && *p == '*') {
344 from = 0;
345 to = items->items.nr;
346 } else if (isdigit(*p)) {
347 char *endp;
348 /*
349 * A range can be specified like 5-7 or 5-.
350 *
351 * Note: `from` is 0-based while the user input
352 * is 1-based, hence we have to decrement by
353 * one. We do not have to decrement `to` even
354 * if it is 0-based because it is an exclusive
355 * boundary.
356 */
357 from = strtoul(p, &endp, 10) - 1;
358 if (endp == p + sep)
359 to = from + 1;
360 else if (*endp == '-') {
361 if (isdigit(*(++endp)))
362 to = strtoul(endp, &endp, 10);
363 else
364 to = items->items.nr;
365 /* extra characters after the range? */
366 if (endp != p + sep)
367 from = -1;
368 }
369 }
370
371 if (p[sep])
372 p[sep++] = '\0';
373 if (from < 0) {
374 from = find_unique(p, items);
375 if (from >= 0)
376 to = from + 1;
377 }
378
379 if (from < 0 || from >= items->items.nr ||
380 (singleton && from + 1 != to)) {
381 color_fprintf_ln(stderr, s->error_color,
382 _("Huh (%s)?"), p);
383 break;
384 } else if (singleton) {
385 res = from;
386 break;
387 }
388
389 if (to > items->items.nr)
390 to = items->items.nr;
391
392 for (; from < to; from++)
393 if (items->selected[from] != choose) {
394 items->selected[from] = choose;
395 res += choose ? +1 : -1;
396 }
397
398 p += sep;
399 }
400
401 if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||
402 !strcmp(input.buf, "*"))
403 break;
404 }
405
406 strbuf_release(&input);
407 return res;
408 }
409
410 struct adddel {
411 uintmax_t add, del;
412 unsigned seen:1, unmerged:1, binary:1;
413 };
414
415 struct file_item {
416 size_t prefix_length;
417 struct adddel index, worktree;
418 };
419
420 static void add_file_item(struct string_list *files, const char *name)
421 {
422 struct file_item *item = xcalloc(1, sizeof(*item));
423
424 string_list_append(files, name)->util = item;
425 }
426
427 struct pathname_entry {
428 struct hashmap_entry ent;
429 const char *name;
430 struct file_item *item;
431 };
432
433 static int pathname_entry_cmp(const void *unused_cmp_data,
434 const struct hashmap_entry *he1,
435 const struct hashmap_entry *he2,
436 const void *name)
437 {
438 const struct pathname_entry *e1 =
439 container_of(he1, const struct pathname_entry, ent);
440 const struct pathname_entry *e2 =
441 container_of(he2, const struct pathname_entry, ent);
442
443 return strcmp(e1->name, name ? (const char *)name : e2->name);
444 }
445
446 struct collection_status {
447 enum { FROM_WORKTREE = 0, FROM_INDEX = 1 } mode;
448
449 const char *reference;
450
451 unsigned skip_unseen:1;
452 size_t unmerged_count, binary_count;
453 struct string_list *files;
454 struct hashmap file_map;
455 };
456
457 static void collect_changes_cb(struct diff_queue_struct *q,
458 struct diff_options *options,
459 void *data)
460 {
461 struct collection_status *s = data;
462 struct diffstat_t stat = { 0 };
463 int i;
464
465 if (!q->nr)
466 return;
467
468 compute_diffstat(options, &stat, q);
469
470 for (i = 0; i < stat.nr; i++) {
471 const char *name = stat.files[i]->name;
472 int hash = strhash(name);
473 struct pathname_entry *entry;
474 struct file_item *file_item;
475 struct adddel *adddel, *other_adddel;
476
477 entry = hashmap_get_entry_from_hash(&s->file_map, hash, name,
478 struct pathname_entry, ent);
479 if (!entry) {
480 if (s->skip_unseen)
481 continue;
482
483 add_file_item(s->files, name);
484
485 CALLOC_ARRAY(entry, 1);
486 hashmap_entry_init(&entry->ent, hash);
487 entry->name = s->files->items[s->files->nr - 1].string;
488 entry->item = s->files->items[s->files->nr - 1].util;
489 hashmap_add(&s->file_map, &entry->ent);
490 }
491
492 file_item = entry->item;
493 adddel = s->mode == FROM_INDEX ?
494 &file_item->index : &file_item->worktree;
495 other_adddel = s->mode == FROM_INDEX ?
496 &file_item->worktree : &file_item->index;
497 adddel->seen = 1;
498 adddel->add = stat.files[i]->added;
499 adddel->del = stat.files[i]->deleted;
500 if (stat.files[i]->is_binary) {
501 if (!other_adddel->binary)
502 s->binary_count++;
503 adddel->binary = 1;
504 }
505 if (stat.files[i]->is_unmerged) {
506 if (!other_adddel->unmerged)
507 s->unmerged_count++;
508 adddel->unmerged = 1;
509 }
510 }
511 free_diffstat_info(&stat);
512 }
513
514 enum modified_files_filter {
515 NO_FILTER = 0,
516 WORKTREE_ONLY = 1,
517 INDEX_ONLY = 2,
518 };
519
520 static int get_modified_files(struct repository *r,
521 enum modified_files_filter filter,
522 struct prefix_item_list *files,
523 const struct pathspec *ps,
524 size_t *unmerged_count,
525 size_t *binary_count)
526 {
527 struct object_id head_oid;
528 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
529 &head_oid, NULL);
530 struct collection_status s = { 0 };
531 int i;
532
533 if (discard_index(r->index) < 0 ||
534 repo_read_index_preload(r, ps, 0) < 0)
535 return error(_("could not read index"));
536
537 prefix_item_list_clear(files);
538 s.files = &files->items;
539 hashmap_init(&s.file_map, pathname_entry_cmp, NULL, 0);
540
541 for (i = 0; i < 2; i++) {
542 struct rev_info rev;
543 struct setup_revision_opt opt = { 0 };
544
545 if (filter == INDEX_ONLY)
546 s.mode = (i == 0) ? FROM_INDEX : FROM_WORKTREE;
547 else
548 s.mode = (i == 0) ? FROM_WORKTREE : FROM_INDEX;
549 s.skip_unseen = filter && i;
550
551 opt.def = is_initial ?
552 empty_tree_oid_hex() : oid_to_hex(&head_oid);
553
554 init_revisions(&rev, NULL);
555 setup_revisions(0, NULL, &rev, &opt);
556
557 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
558 rev.diffopt.format_callback = collect_changes_cb;
559 rev.diffopt.format_callback_data = &s;
560
561 if (ps)
562 copy_pathspec(&rev.prune_data, ps);
563
564 if (s.mode == FROM_INDEX)
565 run_diff_index(&rev, 1);
566 else {
567 rev.diffopt.flags.ignore_dirty_submodules = 1;
568 run_diff_files(&rev, 0);
569 }
570
571 release_revisions(&rev);
572 }
573 hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
574 if (unmerged_count)
575 *unmerged_count = s.unmerged_count;
576 if (binary_count)
577 *binary_count = s.binary_count;
578
579 /* While the diffs are ordered already, we ran *two* diffs... */
580 string_list_sort(&files->items);
581
582 return 0;
583 }
584
585 static void render_adddel(struct strbuf *buf,
586 struct adddel *ad, const char *no_changes)
587 {
588 if (ad->binary)
589 strbuf_addstr(buf, _("binary"));
590 else if (ad->seen)
591 strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX,
592 (uintmax_t)ad->add, (uintmax_t)ad->del);
593 else
594 strbuf_addstr(buf, no_changes);
595 }
596
597 /* filters out prefixes which have special meaning to list_and_choose() */
598 static int is_valid_prefix(const char *prefix, size_t prefix_len)
599 {
600 return prefix_len && prefix &&
601 /*
602 * We expect `prefix` to be NUL terminated, therefore this
603 * `strcspn()` call is okay, even if it might do much more
604 * work than strictly necessary.
605 */
606 strcspn(prefix, " \t\r\n,") >= prefix_len && /* separators */
607 *prefix != '-' && /* deselection */
608 !isdigit(*prefix) && /* selection */
609 (prefix_len != 1 ||
610 (*prefix != '*' && /* "all" wildcard */
611 *prefix != '?')); /* prompt help */
612 }
613
614 struct print_file_item_data {
615 const char *modified_fmt, *color, *reset;
616 struct strbuf buf, name, index, worktree;
617 unsigned only_names:1;
618 };
619
620 static void print_file_item(int i, int selected, struct string_list_item *item,
621 void *print_file_item_data)
622 {
623 struct file_item *c = item->util;
624 struct print_file_item_data *d = print_file_item_data;
625 const char *highlighted = NULL;
626
627 strbuf_reset(&d->index);
628 strbuf_reset(&d->worktree);
629 strbuf_reset(&d->buf);
630
631 /* Format the item with the prefix highlighted. */
632 if (c->prefix_length > 0 &&
633 is_valid_prefix(item->string, c->prefix_length)) {
634 strbuf_reset(&d->name);
635 strbuf_addf(&d->name, "%s%.*s%s%s", d->color,
636 (int)c->prefix_length, item->string, d->reset,
637 item->string + c->prefix_length);
638 highlighted = d->name.buf;
639 }
640
641 if (d->only_names) {
642 printf("%c%2d: %s", selected ? '*' : ' ', i + 1,
643 highlighted ? highlighted : item->string);
644 return;
645 }
646
647 render_adddel(&d->worktree, &c->worktree, _("nothing"));
648 render_adddel(&d->index, &c->index, _("unchanged"));
649
650 strbuf_addf(&d->buf, d->modified_fmt, d->index.buf, d->worktree.buf,
651 highlighted ? highlighted : item->string);
652
653 printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf);
654 }
655
656 static int run_status(struct add_i_state *s, const struct pathspec *ps,
657 struct prefix_item_list *files,
658 struct list_and_choose_options *opts)
659 {
660 if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0)
661 return -1;
662
663 list(s, &files->items, NULL, &opts->list_opts);
664 putchar('\n');
665
666 return 0;
667 }
668
669 static int run_update(struct add_i_state *s, const struct pathspec *ps,
670 struct prefix_item_list *files,
671 struct list_and_choose_options *opts)
672 {
673 int res = 0, fd;
674 size_t count, i;
675 struct lock_file index_lock;
676
677 if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, NULL, NULL) < 0)
678 return -1;
679
680 if (!files->items.nr) {
681 putchar('\n');
682 return 0;
683 }
684
685 opts->prompt = N_("Update");
686 count = list_and_choose(s, files, opts);
687 if (count <= 0) {
688 putchar('\n');
689 return 0;
690 }
691
692 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
693 if (fd < 0) {
694 putchar('\n');
695 return -1;
696 }
697
698 for (i = 0; i < files->items.nr; i++) {
699 const char *name = files->items.items[i].string;
700 if (files->selected[i] &&
701 add_file_to_index(s->r->index, name, 0) < 0) {
702 res = error(_("could not stage '%s'"), name);
703 break;
704 }
705 }
706
707 if (!res && write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
708 res = error(_("could not write index"));
709
710 if (!res)
711 printf(Q_("updated %d path\n",
712 "updated %d paths\n", count), (int)count);
713
714 putchar('\n');
715 return res;
716 }
717
718 static void revert_from_diff(struct diff_queue_struct *q,
719 struct diff_options *opt, void *data)
720 {
721 int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
722
723 for (i = 0; i < q->nr; i++) {
724 struct diff_filespec *one = q->queue[i]->one;
725 struct cache_entry *ce;
726
727 if (!(one->mode && !is_null_oid(&one->oid))) {
728 remove_file_from_index(opt->repo->index, one->path);
729 printf(_("note: %s is untracked now.\n"), one->path);
730 } else {
731 ce = make_cache_entry(opt->repo->index, one->mode,
732 &one->oid, one->path, 0, 0);
733 if (!ce)
734 die(_("make_cache_entry failed for path '%s'"),
735 one->path);
736 add_index_entry(opt->repo->index, ce, add_flags);
737 }
738 }
739 }
740
741 static int run_revert(struct add_i_state *s, const struct pathspec *ps,
742 struct prefix_item_list *files,
743 struct list_and_choose_options *opts)
744 {
745 int res = 0, fd;
746 size_t count, i, j;
747
748 struct object_id oid;
749 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
750 NULL);
751 struct lock_file index_lock;
752 const char **paths;
753 struct tree *tree;
754 struct diff_options diffopt = { NULL };
755
756 if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
757 return -1;
758
759 if (!files->items.nr) {
760 putchar('\n');
761 return 0;
762 }
763
764 opts->prompt = N_("Revert");
765 count = list_and_choose(s, files, opts);
766 if (count <= 0)
767 goto finish_revert;
768
769 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
770 if (fd < 0) {
771 res = -1;
772 goto finish_revert;
773 }
774
775 if (is_initial)
776 oidcpy(&oid, s->r->hash_algo->empty_tree);
777 else {
778 tree = parse_tree_indirect(&oid);
779 if (!tree) {
780 res = error(_("Could not parse HEAD^{tree}"));
781 goto finish_revert;
782 }
783 oidcpy(&oid, &tree->object.oid);
784 }
785
786 ALLOC_ARRAY(paths, count + 1);
787 for (i = j = 0; i < files->items.nr; i++)
788 if (files->selected[i])
789 paths[j++] = files->items.items[i].string;
790 paths[j] = NULL;
791
792 parse_pathspec(&diffopt.pathspec, 0,
793 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH,
794 NULL, paths);
795
796 diffopt.output_format = DIFF_FORMAT_CALLBACK;
797 diffopt.format_callback = revert_from_diff;
798 diffopt.flags.override_submodule_config = 1;
799 diffopt.repo = s->r;
800
801 if (do_diff_cache(&oid, &diffopt)) {
802 diff_free(&diffopt);
803 res = -1;
804 } else {
805 diffcore_std(&diffopt);
806 diff_flush(&diffopt);
807 }
808 free(paths);
809
810 if (!res && write_locked_index(s->r->index, &index_lock,
811 COMMIT_LOCK) < 0)
812 res = -1;
813 else
814 res = repo_refresh_and_write_index(s->r, REFRESH_QUIET, 0, 1,
815 NULL, NULL, NULL);
816
817 if (!res)
818 printf(Q_("reverted %d path\n",
819 "reverted %d paths\n", count), (int)count);
820
821 finish_revert:
822 putchar('\n');
823 return res;
824 }
825
826 static int get_untracked_files(struct repository *r,
827 struct prefix_item_list *files,
828 const struct pathspec *ps)
829 {
830 struct dir_struct dir = { 0 };
831 size_t i;
832 struct strbuf buf = STRBUF_INIT;
833
834 if (repo_read_index(r) < 0)
835 return error(_("could not read index"));
836
837 prefix_item_list_clear(files);
838 setup_standard_excludes(&dir);
839 add_pattern_list(&dir, EXC_CMDL, "--exclude option");
840 fill_directory(&dir, r->index, ps);
841
842 for (i = 0; i < dir.nr; i++) {
843 struct dir_entry *ent = dir.entries[i];
844
845 if (index_name_is_other(r->index, ent->name, ent->len)) {
846 strbuf_reset(&buf);
847 strbuf_add(&buf, ent->name, ent->len);
848 add_file_item(&files->items, buf.buf);
849 }
850 }
851
852 strbuf_release(&buf);
853 return 0;
854 }
855
856 static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps,
857 struct prefix_item_list *files,
858 struct list_and_choose_options *opts)
859 {
860 struct print_file_item_data *d = opts->list_opts.print_item_data;
861 int res = 0, fd;
862 size_t count, i;
863 struct lock_file index_lock;
864
865 if (get_untracked_files(s->r, files, ps) < 0)
866 return -1;
867
868 if (!files->items.nr) {
869 printf(_("No untracked files.\n"));
870 goto finish_add_untracked;
871 }
872
873 opts->prompt = N_("Add untracked");
874 d->only_names = 1;
875 count = list_and_choose(s, files, opts);
876 d->only_names = 0;
877 if (count <= 0)
878 goto finish_add_untracked;
879
880 fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
881 if (fd < 0) {
882 res = -1;
883 goto finish_add_untracked;
884 }
885
886 for (i = 0; i < files->items.nr; i++) {
887 const char *name = files->items.items[i].string;
888 if (files->selected[i] &&
889 add_file_to_index(s->r->index, name, 0) < 0) {
890 res = error(_("could not stage '%s'"), name);
891 break;
892 }
893 }
894
895 if (!res &&
896 write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
897 res = error(_("could not write index"));
898
899 if (!res)
900 printf(Q_("added %d path\n",
901 "added %d paths\n", count), (int)count);
902
903 finish_add_untracked:
904 putchar('\n');
905 return res;
906 }
907
908 static int run_patch(struct add_i_state *s, const struct pathspec *ps,
909 struct prefix_item_list *files,
910 struct list_and_choose_options *opts)
911 {
912 int res = 0;
913 ssize_t count, i, j;
914 size_t unmerged_count = 0, binary_count = 0;
915
916 if (get_modified_files(s->r, WORKTREE_ONLY, files, ps,
917 &unmerged_count, &binary_count) < 0)
918 return -1;
919
920 if (unmerged_count || binary_count) {
921 for (i = j = 0; i < files->items.nr; i++) {
922 struct file_item *item = files->items.items[i].util;
923
924 if (item->index.binary || item->worktree.binary) {
925 free(item);
926 free(files->items.items[i].string);
927 } else if (item->index.unmerged ||
928 item->worktree.unmerged) {
929 color_fprintf_ln(stderr, s->error_color,
930 _("ignoring unmerged: %s"),
931 files->items.items[i].string);
932 free(item);
933 free(files->items.items[i].string);
934 } else
935 files->items.items[j++] = files->items.items[i];
936 }
937 files->items.nr = j;
938 }
939
940 if (!files->items.nr) {
941 if (binary_count)
942 fprintf(stderr, _("Only binary files changed.\n"));
943 else
944 fprintf(stderr, _("No changes.\n"));
945 return 0;
946 }
947
948 opts->prompt = N_("Patch update");
949 count = list_and_choose(s, files, opts);
950 if (count > 0) {
951 struct strvec args = STRVEC_INIT;
952 struct pathspec ps_selected = { 0 };
953
954 for (i = 0; i < files->items.nr; i++)
955 if (files->selected[i])
956 strvec_push(&args,
957 files->items.items[i].string);
958 parse_pathspec(&ps_selected,
959 PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
960 PATHSPEC_LITERAL_PATH, "", args.v);
961 res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
962 strvec_clear(&args);
963 clear_pathspec(&ps_selected);
964 }
965
966 return res;
967 }
968
969 static int run_diff(struct add_i_state *s, const struct pathspec *ps,
970 struct prefix_item_list *files,
971 struct list_and_choose_options *opts)
972 {
973 int res = 0;
974 ssize_t count, i;
975
976 struct object_id oid;
977 int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
978 NULL);
979 if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
980 return -1;
981
982 if (!files->items.nr) {
983 putchar('\n');
984 return 0;
985 }
986
987 opts->prompt = N_("Review diff");
988 opts->flags = IMMEDIATE;
989 count = list_and_choose(s, files, opts);
990 opts->flags = 0;
991 if (count > 0) {
992 struct strvec args = STRVEC_INIT;
993
994 strvec_pushl(&args, "git", "diff", "-p", "--cached",
995 oid_to_hex(!is_initial ? &oid :
996 s->r->hash_algo->empty_tree),
997 "--", NULL);
998 for (i = 0; i < files->items.nr; i++)
999 if (files->selected[i])
1000 strvec_push(&args,
1001 files->items.items[i].string);
1002 res = run_command_v_opt(args.v, 0);
1003 strvec_clear(&args);
1004 }
1005
1006 putchar('\n');
1007 return res;
1008 }
1009
1010 static int run_help(struct add_i_state *s, const struct pathspec *unused_ps,
1011 struct prefix_item_list *unused_files,
1012 struct list_and_choose_options *unused_opts)
1013 {
1014 color_fprintf_ln(stdout, s->help_color, "status - %s",
1015 _("show paths with changes"));
1016 color_fprintf_ln(stdout, s->help_color, "update - %s",
1017 _("add working tree state to the staged set of changes"));
1018 color_fprintf_ln(stdout, s->help_color, "revert - %s",
1019 _("revert staged set of changes back to the HEAD version"));
1020 color_fprintf_ln(stdout, s->help_color, "patch - %s",
1021 _("pick hunks and update selectively"));
1022 color_fprintf_ln(stdout, s->help_color, "diff - %s",
1023 _("view diff between HEAD and index"));
1024 color_fprintf_ln(stdout, s->help_color, "add untracked - %s",
1025 _("add contents of untracked files to the staged set of changes"));
1026
1027 return 0;
1028 }
1029
1030 static void choose_prompt_help(struct add_i_state *s)
1031 {
1032 color_fprintf_ln(stdout, s->help_color, "%s",
1033 _("Prompt help:"));
1034 color_fprintf_ln(stdout, s->help_color, "1 - %s",
1035 _("select a single item"));
1036 color_fprintf_ln(stdout, s->help_color, "3-5 - %s",
1037 _("select a range of items"));
1038 color_fprintf_ln(stdout, s->help_color, "2-3,6-9 - %s",
1039 _("select multiple ranges"));
1040 color_fprintf_ln(stdout, s->help_color, "foo - %s",
1041 _("select item based on unique prefix"));
1042 color_fprintf_ln(stdout, s->help_color, "-... - %s",
1043 _("unselect specified items"));
1044 color_fprintf_ln(stdout, s->help_color, "* - %s",
1045 _("choose all items"));
1046 color_fprintf_ln(stdout, s->help_color, " - %s",
1047 _("(empty) finish selecting"));
1048 }
1049
1050 typedef int (*command_t)(struct add_i_state *s, const struct pathspec *ps,
1051 struct prefix_item_list *files,
1052 struct list_and_choose_options *opts);
1053
1054 struct command_item {
1055 size_t prefix_length;
1056 command_t command;
1057 };
1058
1059 struct print_command_item_data {
1060 const char *color, *reset;
1061 };
1062
1063 static void print_command_item(int i, int selected,
1064 struct string_list_item *item,
1065 void *print_command_item_data)
1066 {
1067 struct print_command_item_data *d = print_command_item_data;
1068 struct command_item *util = item->util;
1069
1070 if (!util->prefix_length ||
1071 !is_valid_prefix(item->string, util->prefix_length))
1072 printf(" %2d: %s", i + 1, item->string);
1073 else
1074 printf(" %2d: %s%.*s%s%s", i + 1,
1075 d->color, (int)util->prefix_length, item->string,
1076 d->reset, item->string + util->prefix_length);
1077 }
1078
1079 static void command_prompt_help(struct add_i_state *s)
1080 {
1081 const char *help_color = s->help_color;
1082 color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));
1083 color_fprintf_ln(stdout, help_color, "1 - %s",
1084 _("select a numbered item"));
1085 color_fprintf_ln(stdout, help_color, "foo - %s",
1086 _("select item based on unique prefix"));
1087 color_fprintf_ln(stdout, help_color, " - %s",
1088 _("(empty) select nothing"));
1089 }
1090
1091 int run_add_i(struct repository *r, const struct pathspec *ps)
1092 {
1093 struct add_i_state s = { NULL };
1094 struct print_command_item_data data = { "[", "]" };
1095 struct list_and_choose_options main_loop_opts = {
1096 { 4, N_("*** Commands ***"), print_command_item, &data },
1097 N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help
1098 };
1099 struct {
1100 const char *string;
1101 command_t command;
1102 } command_list[] = {
1103 { "status", run_status },
1104 { "update", run_update },
1105 { "revert", run_revert },
1106 { "add untracked", run_add_untracked },
1107 { "patch", run_patch },
1108 { "diff", run_diff },
1109 { "quit", NULL },
1110 { "help", run_help },
1111 };
1112 struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT;
1113
1114 struct print_file_item_data print_file_item_data = {
1115 "%12s %12s %s", NULL, NULL,
1116 STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
1117 };
1118 struct list_and_choose_options opts = {
1119 { 0, NULL, print_file_item, &print_file_item_data },
1120 NULL, 0, choose_prompt_help
1121 };
1122 struct strbuf header = STRBUF_INIT;
1123 struct prefix_item_list files = PREFIX_ITEM_LIST_INIT;
1124 ssize_t i;
1125 int res = 0;
1126
1127 for (i = 0; i < ARRAY_SIZE(command_list); i++) {
1128 struct command_item *util = xcalloc(1, sizeof(*util));
1129 util->command = command_list[i].command;
1130 string_list_append(&commands.items, command_list[i].string)
1131 ->util = util;
1132 }
1133
1134 init_add_i_state(&s, r);
1135
1136 /*
1137 * When color was asked for, use the prompt color for
1138 * highlighting, otherwise use square brackets.
1139 */
1140 if (s.use_color) {
1141 data.color = s.prompt_color;
1142 data.reset = s.reset_color;
1143 }
1144 print_file_item_data.color = data.color;
1145 print_file_item_data.reset = data.reset;
1146
1147 strbuf_addstr(&header, " ");
1148 strbuf_addf(&header, print_file_item_data.modified_fmt,
1149 _("staged"), _("unstaged"), _("path"));
1150 opts.list_opts.header = header.buf;
1151
1152 if (discard_index(r->index) < 0 ||
1153 repo_read_index(r) < 0 ||
1154 repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
1155 NULL, NULL, NULL) < 0)
1156 warning(_("could not refresh index"));
1157
1158 res = run_status(&s, ps, &files, &opts);
1159
1160 for (;;) {
1161 struct command_item *util;
1162
1163 i = list_and_choose(&s, &commands, &main_loop_opts);
1164 if (i < 0 || i >= commands.items.nr)
1165 util = NULL;
1166 else
1167 util = commands.items.items[i].util;
1168
1169 if (i == LIST_AND_CHOOSE_QUIT || (util && !util->command)) {
1170 printf(_("Bye.\n"));
1171 res = 0;
1172 break;
1173 }
1174
1175 if (util)
1176 res = util->command(&s, ps, &files, &opts);
1177 }
1178
1179 prefix_item_list_clear(&files);
1180 strbuf_release(&print_file_item_data.buf);
1181 strbuf_release(&print_file_item_data.name);
1182 strbuf_release(&print_file_item_data.index);
1183 strbuf_release(&print_file_item_data.worktree);
1184 strbuf_release(&header);
1185 prefix_item_list_clear(&commands);
1186 clear_add_i_state(&s);
1187
1188 return res;
1189 }