pathspec.c: rename newly public functions for clarity
[git/git.git] / builtin / add.c
CommitLineData
0d781539
LT
1/*
2 * "git add" builtin command
3 *
4 * Copyright (C) 2006 Linus Torvalds
5 */
0d781539
LT
6#include "cache.h"
7#include "builtin.h"
8#include "dir.h"
6f525e71 9#include "pathspec.h"
5cde71d6 10#include "exec_cmd.h"
93872e07 11#include "cache-tree.h"
58680165 12#include "run-command.h"
5c46f754 13#include "parse-options.h"
c59cb03a 14#include "diff.h"
fb7d3f32 15#include "diffcore.h"
c59cb03a 16#include "revision.h"
568508e7 17#include "bulk-checkin.h"
0d781539 18
5c46f754 19static const char * const builtin_add_usage[] = {
1b1dd23f 20 "git add [options] [--] <filepattern>...",
5c46f754
KH
21 NULL
22};
c59cb03a 23static int patch_interactive, add_interactive, edit_interactive;
93c44d49 24static int take_worktree_changes;
896bdfa2 25
9cba13ca 26struct update_callback_data {
fb7d3f32
LT
27 int flags;
28 int add_errors;
29};
30
75973b2c
JH
31static int fix_unmerged_status(struct diff_filepair *p,
32 struct update_callback_data *data)
33{
34 if (p->status != DIFF_STATUS_UNMERGED)
35 return p->status;
36 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL) && !p->two->mode)
37 /*
38 * This is not an explicit add request, and the
39 * path is missing from the working tree (deleted)
40 */
41 return DIFF_STATUS_DELETED;
42 else
43 /*
44 * Either an explicit add request, or path exists
45 * in the working tree. An attempt to explicitly
46 * add a path that does not exist in the working tree
47 * will be caught as an error by the caller immediately.
48 */
49 return DIFF_STATUS_MODIFIED;
50}
51
fb7d3f32
LT
52static void update_callback(struct diff_queue_struct *q,
53 struct diff_options *opt, void *cbdata)
54{
55 int i;
56 struct update_callback_data *data = cbdata;
57
58 for (i = 0; i < q->nr; i++) {
59 struct diff_filepair *p = q->queue[i];
60 const char *path = p->one->path;
75973b2c 61 switch (fix_unmerged_status(p, data)) {
fb7d3f32 62 default:
990ac4be 63 die(_("unexpected diff status %c"), p->status);
fb7d3f32
LT
64 case DIFF_STATUS_MODIFIED:
65 case DIFF_STATUS_TYPE_CHANGED:
66 if (add_file_to_index(&the_index, path, data->flags)) {
67 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
990ac4be 68 die(_("updating files failed"));
fb7d3f32
LT
69 data->add_errors++;
70 }
71 break;
72 case DIFF_STATUS_DELETED:
73 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
74 break;
75 if (!(data->flags & ADD_CACHE_PRETEND))
76 remove_file_from_index(&the_index, path);
77 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
475c73eb 78 printf(_("remove '%s'\n"), path);
fb7d3f32
LT
79 break;
80 }
81 }
82}
83
84int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
85{
86 struct update_callback_data data;
87 struct rev_info rev;
88 init_revisions(&rev, prefix);
89 setup_revisions(0, NULL, &rev, NULL);
afe069d1 90 init_pathspec(&rev.prune_data, pathspec);
fb7d3f32
LT
91 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
92 rev.diffopt.format_callback = update_callback;
93 data.flags = flags;
94 data.add_errors = 0;
95 rev.diffopt.format_callback_data = &data;
75973b2c 96 rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
fb7d3f32
LT
97 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
98 return !!data.add_errors;
99}
100
81f45e7d 101static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
0d781539 102{
f2593398
LT
103 char *seen;
104 int i, specs;
0d781539
LT
105 struct dir_entry **src, **dst;
106
f2593398
LT
107 for (specs = 0; pathspec[specs]; specs++)
108 /* nothing */;
28f75818 109 seen = xcalloc(specs, 1);
f2593398 110
0d781539
LT
111 src = dst = dir->entries;
112 i = dir->nr;
113 while (--i >= 0) {
114 struct dir_entry *entry = *src++;
4d06f8ac
JH
115 if (match_pathspec(pathspec, entry->name, entry->len,
116 prefix, seen))
117 *dst++ = entry;
0d781539
LT
118 }
119 dir->nr = dst - dir->entries;
4b78d7bc 120 add_pathspec_matches_against_index(pathspec, seen, specs);
81f45e7d 121 return seen;
0d781539
LT
122}
123
2ce53f9b
JS
124static void treat_gitlinks(const char **pathspec)
125{
126 int i;
127
128 if (!pathspec || !*pathspec)
129 return;
130
131 for (i = 0; i < active_nr; i++) {
132 struct cache_entry *ce = active_cache[i];
133 if (S_ISGITLINK(ce->ce_mode)) {
134 int len = ce_namelen(ce), j;
135 for (j = 0; pathspec[j]; j++) {
136 int len2 = strlen(pathspec[j]);
137 if (len2 <= len || pathspec[j][len] != '/' ||
138 memcmp(ce->name, pathspec[j], len))
139 continue;
140 if (len2 == len + 1)
141 /* strip trailing slash */
142 pathspec[j] = xstrndup(ce->name, len);
143 else
990ac4be 144 die (_("Path '%s' is in submodule '%.*s'"),
2ce53f9b
JS
145 pathspec[j], len, ce->name);
146 }
147 }
148 }
149}
150
d616813d
AJ
151static void refresh(int verbose, const char **pathspec)
152{
153 char *seen;
154 int i, specs;
155
156 for (specs = 0; pathspec[specs]; specs++)
157 /* nothing */;
158 seen = xcalloc(specs, 1);
43673fdd 159 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
ed2a808d 160 pathspec, seen, _("Unstaged changes after refreshing the index:"));
d616813d
AJ
161 for (i = 0; i < specs; i++) {
162 if (!seen[i])
990ac4be 163 die(_("pathspec '%s' did not match any files"), pathspec[i]);
d616813d 164 }
399f0a8e 165 free(seen);
d616813d
AJ
166}
167
f8a1113b 168static const char **validate_pathspec(const char **argv, const char *prefix)
3f061887
JH
169{
170 const char **pathspec = get_pathspec(prefix, argv);
171
725b0605
JH
172 if (pathspec) {
173 const char **p;
174 for (p = pathspec; *p; p++) {
57199892 175 if (has_symlink_leading_path(*p, strlen(*p))) {
725b0605 176 int len = prefix ? strlen(prefix) : 0;
990ac4be 177 die(_("'%s' is beyond a symbolic link"), *p + len);
725b0605
JH
178 }
179 }
180 }
181
3f061887
JH
182 return pathspec;
183}
184
46b5139c
TR
185int run_add_interactive(const char *revision, const char *patch_mode,
186 const char **pathspec)
58680165 187{
46b5139c 188 int status, ac, pc = 0;
3f061887 189 const char **args;
3f061887 190
46b5139c
TR
191 if (pathspec)
192 while (pathspec[pc])
193 pc++;
324ccbd6 194
46b5139c 195 args = xcalloc(sizeof(const char *), (pc + 5));
b63e9950
WC
196 ac = 0;
197 args[ac++] = "add--interactive";
46b5139c
TR
198 if (patch_mode)
199 args[ac++] = patch_mode;
200 if (revision)
201 args[ac++] = revision;
b63e9950 202 args[ac++] = "--";
46b5139c
TR
203 if (pc) {
204 memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
205 ac += pc;
b63e9950
WC
206 }
207 args[ac] = NULL;
7c0ab445
WC
208
209 status = run_command_v_opt(args, RUN_GIT_CMD);
210 free(args);
211 return status;
58680165
KH
212}
213
b4bd4668 214int interactive_add(int argc, const char **argv, const char *prefix, int patch)
46b5139c
TR
215{
216 const char **pathspec = NULL;
217
218 if (argc) {
f8a1113b 219 pathspec = validate_pathspec(argv, prefix);
46b5139c
TR
220 if (!pathspec)
221 return -1;
222 }
223
224 return run_add_interactive(NULL,
b4bd4668 225 patch ? "--patch" : NULL,
46b5139c
TR
226 pathspec);
227}
228
2af202be 229static int edit_patch(int argc, const char **argv, const char *prefix)
c59cb03a
JS
230{
231 char *file = xstrdup(git_path("ADD_EDIT.patch"));
232 const char *apply_argv[] = { "apply", "--recount", "--cached",
66dbfd55 233 NULL, NULL };
c59cb03a
JS
234 struct child_process child;
235 struct rev_info rev;
236 int out;
237 struct stat st;
238
66dbfd55
GV
239 apply_argv[3] = file;
240
c59cb03a
JS
241 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
242
243 if (read_cache() < 0)
990ac4be 244 die (_("Could not read the index"));
c59cb03a
JS
245
246 init_revisions(&rev, prefix);
247 rev.diffopt.context = 7;
248
249 argc = setup_revisions(argc, argv, &rev, NULL);
250 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
701825de 251 DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
6ff2b729 252 out = open(file, O_CREAT | O_WRONLY, 0666);
c59cb03a 253 if (out < 0)
990ac4be 254 die (_("Could not open '%s' for writing."), file);
41698375 255 rev.diffopt.file = xfdopen(out, "w");
c59cb03a
JS
256 rev.diffopt.close_file = 1;
257 if (run_diff_files(&rev, 0))
990ac4be 258 die (_("Could not write patch"));
c59cb03a
JS
259
260 launch_editor(file, NULL, NULL);
261
262 if (stat(file, &st))
990ac4be 263 die_errno(_("Could not stat '%s'"), file);
c59cb03a 264 if (!st.st_size)
990ac4be 265 die(_("Empty patch. Aborted."));
c59cb03a
JS
266
267 memset(&child, 0, sizeof(child));
268 child.git_cmd = 1;
269 child.argv = apply_argv;
270 if (run_command(&child))
990ac4be 271 die (_("Could not apply '%s'"), file);
c59cb03a
JS
272
273 unlink(file);
274 return 0;
275}
276
021b6e45 277static struct lock_file lock_file;
0d781539 278
b39c53e6 279static const char ignore_error[] =
439fb829 280N_("The following paths are ignored by one of your .gitignore files:\n");
6a1ad325 281
5c46f754 282static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
108da0db 283static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
5c46f754
KH
284
285static struct option builtin_add_options[] = {
e21adb8c 286 OPT__DRY_RUN(&show_only, "dry run"),
fd03881a 287 OPT__VERBOSE(&verbose, "be verbose"),
5c46f754
KH
288 OPT_GROUP(""),
289 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
08918e4a 290 OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"),
c59cb03a 291 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
76946b76 292 OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
69c61c4f 293 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
39425819 294 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
6e7293e3 295 OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"),
5c46f754 296 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
984b83ef 297 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
108da0db 298 OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
5c46f754
KH
299 OPT_END(),
300};
301
9bd81e42 302static int add_config(const char *var, const char *value, void *cb)
dad25e4a 303{
8c2be75f
JN
304 if (!strcmp(var, "add.ignoreerrors") ||
305 !strcmp(var, "add.ignore-errors")) {
dad25e4a
AR
306 ignore_add_errors = git_config_bool(var, value);
307 return 0;
308 }
9bd81e42 309 return git_default_config(var, value, cb);
dad25e4a
AR
310}
311
c972ec04
JH
312static int add_files(struct dir_struct *dir, int flags)
313{
314 int i, exit_status = 0;
315
316 if (dir->ignored_nr) {
439fb829 317 fprintf(stderr, _(ignore_error));
c972ec04
JH
318 for (i = 0; i < dir->ignored_nr; i++)
319 fprintf(stderr, "%s\n", dir->ignored[i]->name);
439fb829
ÆAB
320 fprintf(stderr, _("Use -f if you really want to add them.\n"));
321 die(_("no files added"));
c972ec04
JH
322 }
323
324 for (i = 0; i < dir->nr; i++)
325 if (add_file_to_cache(dir->entries[i]->name, flags)) {
326 if (!ignore_add_errors)
990ac4be 327 die(_("adding files failed"));
c972ec04
JH
328 exit_status = 1;
329 }
330 return exit_status;
331}
332
a633fca0 333int cmd_add(int argc, const char **argv, const char *prefix)
0d781539 334{
7ae02a30 335 int exit_status = 0;
c972ec04 336 int newfd;
0d781539
LT
337 const char **pathspec;
338 struct dir_struct dir;
205ffa94 339 int flags;
c972ec04
JH
340 int add_new_files;
341 int require_pathspec;
81f45e7d 342 char *seen = NULL;
5cde71d6 343
ed342fde
SB
344 git_config(add_config, NULL);
345
37782920 346 argc = parse_options(argc, argv, prefix, builtin_add_options,
c59cb03a 347 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
b63e9950
WC
348 if (patch_interactive)
349 add_interactive = 1;
7c0ab445 350 if (add_interactive)
b4bd4668 351 exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
0d781539 352
c59cb03a
JS
353 if (edit_interactive)
354 return(edit_patch(argc, argv, prefix));
355 argc--;
356 argv++;
357
3ba1f114 358 if (addremove && take_worktree_changes)
990ac4be 359 die(_("-A and -u are mutually incompatible"));
108da0db 360 if (!show_only && ignore_missing)
990ac4be 361 die(_("Option --ignore-missing can only be used together with --dry-run"));
1e5f764c 362 if ((addremove || take_worktree_changes) && !argc) {
3ba1f114
JH
363 static const char *here[2] = { ".", NULL };
364 argc = 1;
365 argv = here;
366 }
367
c972ec04
JH
368 add_new_files = !take_worktree_changes && !refresh_only;
369 require_pathspec = !take_worktree_changes;
370
30ca07a2 371 newfd = hold_locked_index(&lock_file, 1);
0d781539 372
205ffa94 373 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
01665924 374 (show_only ? ADD_CACHE_PRETEND : 0) |
39425819 375 (intent_to_add ? ADD_CACHE_INTENT : 0) |
1e5f764c
JH
376 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
377 (!(addremove || take_worktree_changes)
378 ? ADD_CACHE_IGNORE_REMOVAL : 0));
205ffa94 379
c972ec04 380 if (require_pathspec && argc == 0) {
990ac4be
ÆAB
381 fprintf(stderr, _("Nothing specified, nothing added.\n"));
382 fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
93b0d86a
JH
383 return 0;
384 }
f8a1113b 385 pathspec = validate_pathspec(argv, prefix);
0d781539 386
366bfcb6 387 if (read_cache() < 0)
990ac4be 388 die(_("index file corrupt"));
2ce53f9b 389 treat_gitlinks(pathspec);
366bfcb6 390
1d8842d9
LT
391 if (add_new_files) {
392 int baselen;
393
394 /* Set up the default git porcelain excludes */
395 memset(&dir, 0, sizeof(dir));
396 if (!ignored_too) {
397 dir.flags |= DIR_COLLECT_IGNORED;
398 setup_standard_excludes(&dir);
399 }
400
1e5f764c 401 /* This picks up the paths that are not tracked */
1d8842d9
LT
402 baselen = fill_directory(&dir, pathspec);
403 if (pathspec)
81f45e7d 404 seen = prune_directory(&dir, pathspec, baselen);
1d8842d9 405 }
1e5f764c 406
c972ec04
JH
407 if (refresh_only) {
408 refresh(verbose, pathspec);
409 goto finish;
6a1ad325
JH
410 }
411
81f45e7d
JH
412 if (pathspec) {
413 int i;
eb69934b
JH
414 struct path_exclude_check check;
415
416 path_exclude_check_init(&check, &dir);
81f45e7d 417 if (!seen)
4b78d7bc 418 seen = find_pathspecs_matching_against_index(pathspec);
81f45e7d
JH
419 for (i = 0; pathspec[i]; i++) {
420 if (!seen[i] && pathspec[i][0]
108da0db
JL
421 && !file_exists(pathspec[i])) {
422 if (ignore_missing) {
0188f6b3 423 int dtype = DT_UNKNOWN;
9013089c 424 if (is_path_excluded(&check, pathspec[i], -1, &dtype))
108da0db
JL
425 dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
426 } else
48168851 427 die(_("pathspec '%s' did not match any files"),
108da0db
JL
428 pathspec[i]);
429 }
81f45e7d
JH
430 }
431 free(seen);
eb69934b 432 path_exclude_check_clear(&check);
81f45e7d
JH
433 }
434
568508e7
JH
435 plug_bulk_checkin();
436
1e5f764c 437 exit_status |= add_files_to_cache(prefix, pathspec, flags);
c972ec04
JH
438
439 if (add_new_files)
440 exit_status |= add_files(&dir, flags);
0d781539 441
568508e7
JH
442 unplug_bulk_checkin();
443
dfdac5d9 444 finish:
0d781539
LT
445 if (active_cache_changed) {
446 if (write_cache(newfd, active_cache, active_nr) ||
4ed7cd3a 447 commit_locked_index(&lock_file))
990ac4be 448 die(_("Unable to write new index file"));
0d781539
LT
449 }
450
7ae02a30 451 return exit_status;
0d781539 452}