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