]>
Commit | Line | Data |
---|---|---|
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" | |
5cde71d6 | 9 | #include "exec_cmd.h" |
93872e07 | 10 | #include "cache-tree.h" |
dfdac5d9 JH |
11 | #include "diff.h" |
12 | #include "diffcore.h" | |
13 | #include "commit.h" | |
14 | #include "revision.h" | |
58680165 | 15 | #include "run-command.h" |
5c46f754 | 16 | #include "parse-options.h" |
0d781539 | 17 | |
5c46f754 | 18 | static const char * const builtin_add_usage[] = { |
1b1dd23f | 19 | "git add [options] [--] <filepattern>...", |
5c46f754 KH |
20 | NULL |
21 | }; | |
b63e9950 | 22 | static int patch_interactive = 0, add_interactive = 0; |
93c44d49 | 23 | static int take_worktree_changes; |
896bdfa2 | 24 | |
0d781539 LT |
25 | static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) |
26 | { | |
f2593398 LT |
27 | char *seen; |
28 | int i, specs; | |
0d781539 LT |
29 | struct dir_entry **src, **dst; |
30 | ||
f2593398 LT |
31 | for (specs = 0; pathspec[specs]; specs++) |
32 | /* nothing */; | |
28f75818 | 33 | seen = xcalloc(specs, 1); |
f2593398 | 34 | |
0d781539 LT |
35 | src = dst = dir->entries; |
36 | i = dir->nr; | |
37 | while (--i >= 0) { | |
38 | struct dir_entry *entry = *src++; | |
4d06f8ac JH |
39 | if (match_pathspec(pathspec, entry->name, entry->len, |
40 | prefix, seen)) | |
41 | *dst++ = entry; | |
0d781539 LT |
42 | } |
43 | dir->nr = dst - dir->entries; | |
f2593398 LT |
44 | |
45 | for (i = 0; i < specs; i++) { | |
e96980ef JK |
46 | if (!seen[i] && !file_exists(pathspec[i])) |
47 | die("pathspec '%s' did not match any files", | |
48 | pathspec[i]); | |
f2593398 | 49 | } |
399f0a8e | 50 | free(seen); |
0d781539 LT |
51 | } |
52 | ||
e96980ef JK |
53 | static void fill_directory(struct dir_struct *dir, const char **pathspec, |
54 | int ignored_too) | |
0d781539 LT |
55 | { |
56 | const char *path, *base; | |
57 | int baselen; | |
58 | ||
59 | /* Set up the default git porcelain excludes */ | |
60 | memset(dir, 0, sizeof(*dir)); | |
e96980ef JK |
61 | if (!ignored_too) { |
62 | dir->collect_ignored = 1; | |
039bc64e | 63 | setup_standard_excludes(dir); |
e96980ef | 64 | } |
0d781539 LT |
65 | |
66 | /* | |
67 | * Calculate common prefix for the pathspec, and | |
68 | * use that to optimize the directory walk | |
69 | */ | |
70 | baselen = common_prefix(pathspec); | |
71 | path = "."; | |
72 | base = ""; | |
182af834 PH |
73 | if (baselen) |
74 | path = base = xmemdupz(*pathspec, baselen); | |
0d781539 LT |
75 | |
76 | /* Read the directory and prune it */ | |
9fc42d60 | 77 | read_directory(dir, path, base, baselen, pathspec); |
0d781539 LT |
78 | if (pathspec) |
79 | prune_directory(dir, pathspec, baselen); | |
80 | } | |
81 | ||
7ae02a30 AR |
82 | struct update_callback_data |
83 | { | |
84 | int flags; | |
85 | int add_errors; | |
86 | }; | |
87 | ||
dfdac5d9 JH |
88 | static void update_callback(struct diff_queue_struct *q, |
89 | struct diff_options *opt, void *cbdata) | |
90 | { | |
7ae02a30 AR |
91 | int i; |
92 | struct update_callback_data *data = cbdata; | |
dfdac5d9 | 93 | |
dfdac5d9 JH |
94 | for (i = 0; i < q->nr; i++) { |
95 | struct diff_filepair *p = q->queue[i]; | |
96 | const char *path = p->one->path; | |
97 | switch (p->status) { | |
98 | default: | |
43b98acc | 99 | die("unexpected diff status %c", p->status); |
dfdac5d9 JH |
100 | case DIFF_STATUS_UNMERGED: |
101 | case DIFF_STATUS_MODIFIED: | |
767c98a5 | 102 | case DIFF_STATUS_TYPE_CHANGED: |
01665924 JH |
103 | if (add_file_to_cache(path, data->flags)) { |
104 | if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) | |
7ae02a30 AR |
105 | die("updating files failed"); |
106 | data->add_errors++; | |
107 | } | |
dfdac5d9 JH |
108 | break; |
109 | case DIFF_STATUS_DELETED: | |
01665924 | 110 | if (!(data->flags & ADD_CACHE_PRETEND)) |
38ed1d89 | 111 | remove_file_from_cache(path); |
01665924 | 112 | if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE)) |
dfdac5d9 JH |
113 | printf("remove '%s'\n", path); |
114 | break; | |
115 | } | |
116 | } | |
117 | } | |
118 | ||
7ae02a30 | 119 | int add_files_to_cache(const char *prefix, const char **pathspec, int flags) |
dfdac5d9 | 120 | { |
7ae02a30 | 121 | struct update_callback_data data; |
dfdac5d9 | 122 | struct rev_info rev; |
2ed2c222 | 123 | init_revisions(&rev, prefix); |
dfdac5d9 | 124 | setup_revisions(0, NULL, &rev, NULL); |
b6ec1d61 | 125 | rev.prune_data = pathspec; |
dfdac5d9 JH |
126 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
127 | rev.diffopt.format_callback = update_callback; | |
7ae02a30 AR |
128 | data.flags = flags; |
129 | data.add_errors = 0; | |
130 | rev.diffopt.format_callback_data = &data; | |
fb63d7f8 | 131 | run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); |
7ae02a30 | 132 | return !!data.add_errors; |
dfdac5d9 JH |
133 | } |
134 | ||
d616813d AJ |
135 | static void refresh(int verbose, const char **pathspec) |
136 | { | |
137 | char *seen; | |
138 | int i, specs; | |
139 | ||
140 | for (specs = 0; pathspec[specs]; specs++) | |
141 | /* nothing */; | |
142 | seen = xcalloc(specs, 1); | |
d14e7407 JH |
143 | refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET, |
144 | pathspec, seen); | |
d616813d AJ |
145 | for (i = 0; i < specs; i++) { |
146 | if (!seen[i]) | |
147 | die("pathspec '%s' did not match any files", pathspec[i]); | |
148 | } | |
399f0a8e | 149 | free(seen); |
d616813d AJ |
150 | } |
151 | ||
3f061887 JH |
152 | static const char **validate_pathspec(int argc, const char **argv, const char *prefix) |
153 | { | |
154 | const char **pathspec = get_pathspec(prefix, argv); | |
155 | ||
156 | return pathspec; | |
157 | } | |
158 | ||
159 | int interactive_add(int argc, const char **argv, const char *prefix) | |
58680165 | 160 | { |
b63e9950 | 161 | int status, ac; |
3f061887 JH |
162 | const char **args; |
163 | const char **pathspec = NULL; | |
164 | ||
165 | if (argc) { | |
166 | pathspec = validate_pathspec(argc, argv, prefix); | |
167 | if (!pathspec) | |
168 | return -1; | |
169 | } | |
324ccbd6 | 170 | |
b63e9950 WC |
171 | args = xcalloc(sizeof(const char *), (argc + 4)); |
172 | ac = 0; | |
173 | args[ac++] = "add--interactive"; | |
174 | if (patch_interactive) | |
175 | args[ac++] = "--patch"; | |
176 | args[ac++] = "--"; | |
177 | if (argc) { | |
178 | memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc); | |
179 | ac += argc; | |
180 | } | |
181 | args[ac] = NULL; | |
7c0ab445 WC |
182 | |
183 | status = run_command_v_opt(args, RUN_GIT_CMD); | |
184 | free(args); | |
185 | return status; | |
58680165 KH |
186 | } |
187 | ||
021b6e45 | 188 | static struct lock_file lock_file; |
0d781539 | 189 | |
b39c53e6 | 190 | static const char ignore_error[] = |
6a1ad325 JH |
191 | "The following paths are ignored by one of your .gitignore files:\n"; |
192 | ||
5c46f754 | 193 | static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; |
3ba1f114 | 194 | static int ignore_add_errors, addremove; |
5c46f754 KH |
195 | |
196 | static struct option builtin_add_options[] = { | |
197 | OPT__DRY_RUN(&show_only), | |
198 | OPT__VERBOSE(&verbose), | |
199 | OPT_GROUP(""), | |
200 | OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), | |
b63e9950 | 201 | OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), |
69c61c4f SG |
202 | OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"), |
203 | OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"), | |
3ba1f114 | 204 | OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"), |
5c46f754 | 205 | OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), |
984b83ef | 206 | OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"), |
5c46f754 KH |
207 | OPT_END(), |
208 | }; | |
209 | ||
9bd81e42 | 210 | static int add_config(const char *var, const char *value, void *cb) |
dad25e4a AR |
211 | { |
212 | if (!strcasecmp(var, "add.ignore-errors")) { | |
213 | ignore_add_errors = git_config_bool(var, value); | |
214 | return 0; | |
215 | } | |
9bd81e42 | 216 | return git_default_config(var, value, cb); |
dad25e4a AR |
217 | } |
218 | ||
c972ec04 JH |
219 | static int add_files(struct dir_struct *dir, int flags) |
220 | { | |
221 | int i, exit_status = 0; | |
222 | ||
223 | if (dir->ignored_nr) { | |
224 | fprintf(stderr, ignore_error); | |
225 | for (i = 0; i < dir->ignored_nr; i++) | |
226 | fprintf(stderr, "%s\n", dir->ignored[i]->name); | |
227 | fprintf(stderr, "Use -f if you really want to add them.\n"); | |
228 | die("no files added"); | |
229 | } | |
230 | ||
231 | for (i = 0; i < dir->nr; i++) | |
232 | if (add_file_to_cache(dir->entries[i]->name, flags)) { | |
233 | if (!ignore_add_errors) | |
234 | die("adding files failed"); | |
235 | exit_status = 1; | |
236 | } | |
237 | return exit_status; | |
238 | } | |
239 | ||
a633fca0 | 240 | int cmd_add(int argc, const char **argv, const char *prefix) |
0d781539 | 241 | { |
7ae02a30 | 242 | int exit_status = 0; |
c972ec04 | 243 | int newfd; |
0d781539 LT |
244 | const char **pathspec; |
245 | struct dir_struct dir; | |
205ffa94 | 246 | int flags; |
c972ec04 JH |
247 | int add_new_files; |
248 | int require_pathspec; | |
5cde71d6 | 249 | |
5c46f754 KH |
250 | argc = parse_options(argc, argv, builtin_add_options, |
251 | builtin_add_usage, 0); | |
b63e9950 WC |
252 | if (patch_interactive) |
253 | add_interactive = 1; | |
7c0ab445 | 254 | if (add_interactive) |
3f061887 | 255 | exit(interactive_add(argc, argv, prefix)); |
0d781539 | 256 | |
9bd81e42 | 257 | git_config(add_config, NULL); |
0d781539 | 258 | |
3ba1f114 JH |
259 | if (addremove && take_worktree_changes) |
260 | die("-A and -u are mutually incompatible"); | |
261 | if (addremove && !argc) { | |
262 | static const char *here[2] = { ".", NULL }; | |
263 | argc = 1; | |
264 | argv = here; | |
265 | } | |
266 | ||
c972ec04 JH |
267 | add_new_files = !take_worktree_changes && !refresh_only; |
268 | require_pathspec = !take_worktree_changes; | |
269 | ||
30ca07a2 | 270 | newfd = hold_locked_index(&lock_file, 1); |
0d781539 | 271 | |
205ffa94 | 272 | flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | |
01665924 JH |
273 | (show_only ? ADD_CACHE_PRETEND : 0) | |
274 | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0)); | |
205ffa94 | 275 | |
c972ec04 | 276 | if (require_pathspec && argc == 0) { |
93b0d86a JH |
277 | fprintf(stderr, "Nothing specified, nothing added.\n"); |
278 | fprintf(stderr, "Maybe you wanted to say 'git add .'?\n"); | |
279 | return 0; | |
280 | } | |
5c46f754 | 281 | pathspec = get_pathspec(prefix, argv); |
0d781539 | 282 | |
c972ec04 JH |
283 | /* |
284 | * If we are adding new files, we need to scan the working | |
285 | * tree to find the ones that match pathspecs; this needs | |
286 | * to be done before we read the index. | |
287 | */ | |
288 | if (add_new_files) | |
289 | fill_directory(&dir, pathspec, ignored_too); | |
0d781539 | 290 | |
366bfcb6 NP |
291 | if (read_cache() < 0) |
292 | die("index file corrupt"); | |
293 | ||
c972ec04 JH |
294 | if (refresh_only) { |
295 | refresh(verbose, pathspec); | |
296 | goto finish; | |
6a1ad325 JH |
297 | } |
298 | ||
3ba1f114 | 299 | if (take_worktree_changes || addremove) |
c972ec04 JH |
300 | exit_status |= add_files_to_cache(prefix, pathspec, flags); |
301 | ||
302 | if (add_new_files) | |
303 | exit_status |= add_files(&dir, flags); | |
0d781539 | 304 | |
dfdac5d9 | 305 | finish: |
0d781539 LT |
306 | if (active_cache_changed) { |
307 | if (write_cache(newfd, active_cache, active_nr) || | |
4ed7cd3a | 308 | commit_locked_index(&lock_file)) |
0d781539 LT |
309 | die("Unable to write new index file"); |
310 | } | |
311 | ||
7ae02a30 | 312 | return exit_status; |
0d781539 | 313 | } |