standardize brace placement in struct definitions
[git/git.git] / builtin / add.c
1 /*
2 * "git add" builtin command
3 *
4 * Copyright (C) 2006 Linus Torvalds
5 */
6 #include "cache.h"
7 #include "builtin.h"
8 #include "dir.h"
9 #include "exec_cmd.h"
10 #include "cache-tree.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "diff.h"
14 #include "diffcore.h"
15 #include "revision.h"
16
17 static const char * const builtin_add_usage[] = {
18 "git add [options] [--] <filepattern>...",
19 NULL
20 };
21 static int patch_interactive, add_interactive, edit_interactive;
22 static int take_worktree_changes;
23
24 struct update_callback_data {
25 int flags;
26 int add_errors;
27 };
28
29 static void update_callback(struct diff_queue_struct *q,
30 struct diff_options *opt, void *cbdata)
31 {
32 int i;
33 struct update_callback_data *data = cbdata;
34
35 for (i = 0; i < q->nr; i++) {
36 struct diff_filepair *p = q->queue[i];
37 const char *path = p->one->path;
38 switch (p->status) {
39 default:
40 die("unexpected diff status %c", p->status);
41 case DIFF_STATUS_UNMERGED:
42 /*
43 * ADD_CACHE_IGNORE_REMOVAL is unset if "git
44 * add -u" is calling us, In such a case, a
45 * missing work tree file needs to be removed
46 * if there is an unmerged entry at stage #2,
47 * but such a diff record is followed by
48 * another with DIFF_STATUS_DELETED (and if
49 * there is no stage #2, we won't see DELETED
50 * nor MODIFIED). We can simply continue
51 * either way.
52 */
53 if (!(data->flags & ADD_CACHE_IGNORE_REMOVAL))
54 continue;
55 /*
56 * Otherwise, it is "git add path" is asking
57 * to explicitly add it; we fall through. A
58 * missing work tree file is an error and is
59 * caught by add_file_to_index() in such a
60 * case.
61 */
62 case DIFF_STATUS_MODIFIED:
63 case DIFF_STATUS_TYPE_CHANGED:
64 if (add_file_to_index(&the_index, path, data->flags)) {
65 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
66 die("updating files failed");
67 data->add_errors++;
68 }
69 break;
70 case DIFF_STATUS_DELETED:
71 if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
72 break;
73 if (!(data->flags & ADD_CACHE_PRETEND))
74 remove_file_from_index(&the_index, path);
75 if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
76 printf("remove '%s'\n", path);
77 break;
78 }
79 }
80 }
81
82 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
83 {
84 struct update_callback_data data;
85 struct rev_info rev;
86 init_revisions(&rev, prefix);
87 setup_revisions(0, NULL, &rev, NULL);
88 rev.prune_data = pathspec;
89 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
90 rev.diffopt.format_callback = update_callback;
91 data.flags = flags;
92 data.add_errors = 0;
93 rev.diffopt.format_callback_data = &data;
94 run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
95 return !!data.add_errors;
96 }
97
98 static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
99 {
100 int num_unmatched = 0, i;
101
102 /*
103 * Since we are walking the index as if we were walking the directory,
104 * we have to mark the matched pathspec as seen; otherwise we will
105 * mistakenly think that the user gave a pathspec that did not match
106 * anything.
107 */
108 for (i = 0; i < specs; i++)
109 if (!seen[i])
110 num_unmatched++;
111 if (!num_unmatched)
112 return;
113 for (i = 0; i < active_nr; i++) {
114 struct cache_entry *ce = active_cache[i];
115 match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
116 }
117 }
118
119 static char *find_used_pathspec(const char **pathspec)
120 {
121 char *seen;
122 int i;
123
124 for (i = 0; pathspec[i]; i++)
125 ; /* just counting */
126 seen = xcalloc(i, 1);
127 fill_pathspec_matches(pathspec, seen, i);
128 return seen;
129 }
130
131 static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
132 {
133 char *seen;
134 int i, specs;
135 struct dir_entry **src, **dst;
136
137 for (specs = 0; pathspec[specs]; specs++)
138 /* nothing */;
139 seen = xcalloc(specs, 1);
140
141 src = dst = dir->entries;
142 i = dir->nr;
143 while (--i >= 0) {
144 struct dir_entry *entry = *src++;
145 if (match_pathspec(pathspec, entry->name, entry->len,
146 prefix, seen))
147 *dst++ = entry;
148 }
149 dir->nr = dst - dir->entries;
150 fill_pathspec_matches(pathspec, seen, specs);
151 return seen;
152 }
153
154 static void treat_gitlinks(const char **pathspec)
155 {
156 int i;
157
158 if (!pathspec || !*pathspec)
159 return;
160
161 for (i = 0; i < active_nr; i++) {
162 struct cache_entry *ce = active_cache[i];
163 if (S_ISGITLINK(ce->ce_mode)) {
164 int len = ce_namelen(ce), j;
165 for (j = 0; pathspec[j]; j++) {
166 int len2 = strlen(pathspec[j]);
167 if (len2 <= len || pathspec[j][len] != '/' ||
168 memcmp(ce->name, pathspec[j], len))
169 continue;
170 if (len2 == len + 1)
171 /* strip trailing slash */
172 pathspec[j] = xstrndup(ce->name, len);
173 else
174 die ("Path '%s' is in submodule '%.*s'",
175 pathspec[j], len, ce->name);
176 }
177 }
178 }
179 }
180
181 static void refresh(int verbose, const char **pathspec)
182 {
183 char *seen;
184 int i, specs;
185
186 for (specs = 0; pathspec[specs]; specs++)
187 /* nothing */;
188 seen = xcalloc(specs, 1);
189 refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
190 pathspec, seen, "Unstaged changes after refreshing the index:");
191 for (i = 0; i < specs; i++) {
192 if (!seen[i])
193 die("pathspec '%s' did not match any files", pathspec[i]);
194 }
195 free(seen);
196 }
197
198 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
199 {
200 const char **pathspec = get_pathspec(prefix, argv);
201
202 if (pathspec) {
203 const char **p;
204 for (p = pathspec; *p; p++) {
205 if (has_symlink_leading_path(*p, strlen(*p))) {
206 int len = prefix ? strlen(prefix) : 0;
207 die("'%s' is beyond a symbolic link", *p + len);
208 }
209 }
210 }
211
212 return pathspec;
213 }
214
215 int run_add_interactive(const char *revision, const char *patch_mode,
216 const char **pathspec)
217 {
218 int status, ac, pc = 0;
219 const char **args;
220
221 if (pathspec)
222 while (pathspec[pc])
223 pc++;
224
225 args = xcalloc(sizeof(const char *), (pc + 5));
226 ac = 0;
227 args[ac++] = "add--interactive";
228 if (patch_mode)
229 args[ac++] = patch_mode;
230 if (revision)
231 args[ac++] = revision;
232 args[ac++] = "--";
233 if (pc) {
234 memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc);
235 ac += pc;
236 }
237 args[ac] = NULL;
238
239 status = run_command_v_opt(args, RUN_GIT_CMD);
240 free(args);
241 return status;
242 }
243
244 int interactive_add(int argc, const char **argv, const char *prefix)
245 {
246 const char **pathspec = NULL;
247
248 if (argc) {
249 pathspec = validate_pathspec(argc, argv, prefix);
250 if (!pathspec)
251 return -1;
252 }
253
254 return run_add_interactive(NULL,
255 patch_interactive ? "--patch" : NULL,
256 pathspec);
257 }
258
259 static int edit_patch(int argc, const char **argv, const char *prefix)
260 {
261 char *file = xstrdup(git_path("ADD_EDIT.patch"));
262 const char *apply_argv[] = { "apply", "--recount", "--cached",
263 NULL, NULL };
264 struct child_process child;
265 struct rev_info rev;
266 int out;
267 struct stat st;
268
269 apply_argv[3] = file;
270
271 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
272
273 if (read_cache() < 0)
274 die ("Could not read the index");
275
276 init_revisions(&rev, prefix);
277 rev.diffopt.context = 7;
278
279 argc = setup_revisions(argc, argv, &rev, NULL);
280 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
281 out = open(file, O_CREAT | O_WRONLY, 0644);
282 if (out < 0)
283 die ("Could not open '%s' for writing.", file);
284 rev.diffopt.file = xfdopen(out, "w");
285 rev.diffopt.close_file = 1;
286 if (run_diff_files(&rev, 0))
287 die ("Could not write patch");
288
289 launch_editor(file, NULL, NULL);
290
291 if (stat(file, &st))
292 die_errno("Could not stat '%s'", file);
293 if (!st.st_size)
294 die("Empty patch. Aborted.");
295
296 memset(&child, 0, sizeof(child));
297 child.git_cmd = 1;
298 child.argv = apply_argv;
299 if (run_command(&child))
300 die ("Could not apply '%s'", file);
301
302 unlink(file);
303 return 0;
304 }
305
306 static struct lock_file lock_file;
307
308 static const char ignore_error[] =
309 "The following paths are ignored by one of your .gitignore files:\n";
310
311 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
312 static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
313
314 static struct option builtin_add_options[] = {
315 OPT__DRY_RUN(&show_only, "dry run"),
316 OPT__VERBOSE(&verbose, "be verbose"),
317 OPT_GROUP(""),
318 OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
319 OPT_BOOLEAN('p', "patch", &patch_interactive, "select hunks interactively"),
320 OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
321 OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
322 OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
323 OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
324 OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
325 OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
326 OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
327 OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"),
328 OPT_END(),
329 };
330
331 static int add_config(const char *var, const char *value, void *cb)
332 {
333 if (!strcasecmp(var, "add.ignoreerrors") ||
334 !strcasecmp(var, "add.ignore-errors")) {
335 ignore_add_errors = git_config_bool(var, value);
336 return 0;
337 }
338 return git_default_config(var, value, cb);
339 }
340
341 static int add_files(struct dir_struct *dir, int flags)
342 {
343 int i, exit_status = 0;
344
345 if (dir->ignored_nr) {
346 fprintf(stderr, ignore_error);
347 for (i = 0; i < dir->ignored_nr; i++)
348 fprintf(stderr, "%s\n", dir->ignored[i]->name);
349 fprintf(stderr, "Use -f if you really want to add them.\n");
350 die("no files added");
351 }
352
353 for (i = 0; i < dir->nr; i++)
354 if (add_file_to_cache(dir->entries[i]->name, flags)) {
355 if (!ignore_add_errors)
356 die("adding files failed");
357 exit_status = 1;
358 }
359 return exit_status;
360 }
361
362 int cmd_add(int argc, const char **argv, const char *prefix)
363 {
364 int exit_status = 0;
365 int newfd;
366 const char **pathspec;
367 struct dir_struct dir;
368 int flags;
369 int add_new_files;
370 int require_pathspec;
371 char *seen = NULL;
372
373 git_config(add_config, NULL);
374
375 argc = parse_options(argc, argv, prefix, builtin_add_options,
376 builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
377 if (patch_interactive)
378 add_interactive = 1;
379 if (add_interactive)
380 exit(interactive_add(argc - 1, argv + 1, prefix));
381
382 if (edit_interactive)
383 return(edit_patch(argc, argv, prefix));
384 argc--;
385 argv++;
386
387 if (addremove && take_worktree_changes)
388 die("-A and -u are mutually incompatible");
389 if (!show_only && ignore_missing)
390 die("Option --ignore-missing can only be used together with --dry-run");
391 if ((addremove || take_worktree_changes) && !argc) {
392 static const char *here[2] = { ".", NULL };
393 argc = 1;
394 argv = here;
395 }
396
397 add_new_files = !take_worktree_changes && !refresh_only;
398 require_pathspec = !take_worktree_changes;
399
400 newfd = hold_locked_index(&lock_file, 1);
401
402 flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
403 (show_only ? ADD_CACHE_PRETEND : 0) |
404 (intent_to_add ? ADD_CACHE_INTENT : 0) |
405 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
406 (!(addremove || take_worktree_changes)
407 ? ADD_CACHE_IGNORE_REMOVAL : 0));
408
409 if (require_pathspec && argc == 0) {
410 fprintf(stderr, "Nothing specified, nothing added.\n");
411 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
412 return 0;
413 }
414 pathspec = validate_pathspec(argc, argv, prefix);
415
416 if (read_cache() < 0)
417 die("index file corrupt");
418 treat_gitlinks(pathspec);
419
420 if (add_new_files) {
421 int baselen;
422
423 /* Set up the default git porcelain excludes */
424 memset(&dir, 0, sizeof(dir));
425 if (!ignored_too) {
426 dir.flags |= DIR_COLLECT_IGNORED;
427 setup_standard_excludes(&dir);
428 }
429
430 /* This picks up the paths that are not tracked */
431 baselen = fill_directory(&dir, pathspec);
432 if (pathspec)
433 seen = prune_directory(&dir, pathspec, baselen);
434 }
435
436 if (refresh_only) {
437 refresh(verbose, pathspec);
438 goto finish;
439 }
440
441 if (pathspec) {
442 int i;
443 if (!seen)
444 seen = find_used_pathspec(pathspec);
445 for (i = 0; pathspec[i]; i++) {
446 if (!seen[i] && pathspec[i][0]
447 && !file_exists(pathspec[i])) {
448 if (ignore_missing) {
449 int dtype = DT_UNKNOWN;
450 if (excluded(&dir, pathspec[i], &dtype))
451 dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
452 } else
453 die("pathspec '%s' did not match any files",
454 pathspec[i]);
455 }
456 }
457 free(seen);
458 }
459
460 exit_status |= add_files_to_cache(prefix, pathspec, flags);
461
462 if (add_new_files)
463 exit_status |= add_files(&dir, flags);
464
465 finish:
466 if (active_cache_changed) {
467 if (write_cache(newfd, active_cache, active_nr) ||
468 commit_locked_index(&lock_file))
469 die("Unable to write new index file");
470 }
471
472 return exit_status;
473 }