]>
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" | |
0d781539 LT |
15 | |
16 | static const char builtin_add_usage[] = | |
480611d1 | 17 | "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>..."; |
0d781539 | 18 | |
93c44d49 | 19 | static int take_worktree_changes; |
896bdfa2 JB |
20 | static const char *excludes_file; |
21 | ||
0d781539 LT |
22 | static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) |
23 | { | |
f2593398 LT |
24 | char *seen; |
25 | int i, specs; | |
0d781539 LT |
26 | struct dir_entry **src, **dst; |
27 | ||
f2593398 LT |
28 | for (specs = 0; pathspec[specs]; specs++) |
29 | /* nothing */; | |
28f75818 | 30 | seen = xcalloc(specs, 1); |
f2593398 | 31 | |
0d781539 LT |
32 | src = dst = dir->entries; |
33 | i = dir->nr; | |
34 | while (--i >= 0) { | |
35 | struct dir_entry *entry = *src++; | |
4d06f8ac JH |
36 | if (match_pathspec(pathspec, entry->name, entry->len, |
37 | prefix, seen)) | |
38 | *dst++ = entry; | |
0d781539 LT |
39 | } |
40 | dir->nr = dst - dir->entries; | |
f2593398 LT |
41 | |
42 | for (i = 0; i < specs; i++) { | |
e96980ef JK |
43 | if (!seen[i] && !file_exists(pathspec[i])) |
44 | die("pathspec '%s' did not match any files", | |
45 | pathspec[i]); | |
f2593398 | 46 | } |
0d781539 LT |
47 | } |
48 | ||
e96980ef JK |
49 | static void fill_directory(struct dir_struct *dir, const char **pathspec, |
50 | int ignored_too) | |
0d781539 LT |
51 | { |
52 | const char *path, *base; | |
53 | int baselen; | |
54 | ||
55 | /* Set up the default git porcelain excludes */ | |
56 | memset(dir, 0, sizeof(*dir)); | |
e96980ef JK |
57 | if (!ignored_too) { |
58 | dir->collect_ignored = 1; | |
59 | dir->exclude_per_dir = ".gitignore"; | |
60 | path = git_path("info/exclude"); | |
61 | if (!access(path, R_OK)) | |
62 | add_excludes_from_file(dir, path); | |
8b4aee01 | 63 | if (excludes_file != NULL && !access(excludes_file, R_OK)) |
e96980ef JK |
64 | add_excludes_from_file(dir, excludes_file); |
65 | } | |
0d781539 LT |
66 | |
67 | /* | |
68 | * Calculate common prefix for the pathspec, and | |
69 | * use that to optimize the directory walk | |
70 | */ | |
71 | baselen = common_prefix(pathspec); | |
72 | path = "."; | |
73 | base = ""; | |
74 | if (baselen) { | |
75 | char *common = xmalloc(baselen + 1); | |
0d781539 LT |
76 | memcpy(common, *pathspec, baselen); |
77 | common[baselen] = 0; | |
78 | path = base = common; | |
79 | } | |
80 | ||
81 | /* Read the directory and prune it */ | |
9fc42d60 | 82 | read_directory(dir, path, base, baselen, pathspec); |
0d781539 LT |
83 | if (pathspec) |
84 | prune_directory(dir, pathspec, baselen); | |
85 | } | |
86 | ||
dfdac5d9 JH |
87 | static void update_callback(struct diff_queue_struct *q, |
88 | struct diff_options *opt, void *cbdata) | |
89 | { | |
90 | int i, verbose; | |
91 | ||
92 | verbose = *((int *)cbdata); | |
93 | for (i = 0; i < q->nr; i++) { | |
94 | struct diff_filepair *p = q->queue[i]; | |
95 | const char *path = p->one->path; | |
96 | switch (p->status) { | |
97 | default: | |
43b98acc | 98 | die("unexpected diff status %c", p->status); |
dfdac5d9 JH |
99 | case DIFF_STATUS_UNMERGED: |
100 | case DIFF_STATUS_MODIFIED: | |
767c98a5 | 101 | case DIFF_STATUS_TYPE_CHANGED: |
dfdac5d9 JH |
102 | add_file_to_cache(path, verbose); |
103 | break; | |
104 | case DIFF_STATUS_DELETED: | |
105 | remove_file_from_cache(path); | |
a4882c27 | 106 | cache_tree_invalidate_path(active_cache_tree, path); |
dfdac5d9 JH |
107 | if (verbose) |
108 | printf("remove '%s'\n", path); | |
109 | break; | |
110 | } | |
111 | } | |
112 | } | |
113 | ||
2ed2c222 | 114 | static void update(int verbose, const char *prefix, const char **files) |
dfdac5d9 JH |
115 | { |
116 | struct rev_info rev; | |
2ed2c222 | 117 | init_revisions(&rev, prefix); |
dfdac5d9 | 118 | setup_revisions(0, NULL, &rev, NULL); |
2ed2c222 | 119 | rev.prune_data = get_pathspec(prefix, files); |
dfdac5d9 JH |
120 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
121 | rev.diffopt.format_callback = update_callback; | |
122 | rev.diffopt.format_callback_data = &verbose; | |
123 | if (read_cache() < 0) | |
124 | die("index file corrupt"); | |
125 | run_diff_files(&rev, 0); | |
126 | } | |
127 | ||
d616813d AJ |
128 | static void refresh(int verbose, const char **pathspec) |
129 | { | |
130 | char *seen; | |
131 | int i, specs; | |
132 | ||
133 | for (specs = 0; pathspec[specs]; specs++) | |
134 | /* nothing */; | |
135 | seen = xcalloc(specs, 1); | |
136 | if (read_cache() < 0) | |
137 | die("index file corrupt"); | |
138 | refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen); | |
139 | for (i = 0; i < specs; i++) { | |
140 | if (!seen[i]) | |
141 | die("pathspec '%s' did not match any files", pathspec[i]); | |
142 | } | |
143 | } | |
144 | ||
896bdfa2 JB |
145 | static int git_add_config(const char *var, const char *value) |
146 | { | |
147 | if (!strcmp(var, "core.excludesfile")) { | |
148 | if (!value) | |
149 | die("core.excludesfile without value"); | |
150 | excludes_file = xstrdup(value); | |
151 | return 0; | |
152 | } | |
153 | ||
154 | return git_default_config(var, value); | |
155 | } | |
156 | ||
021b6e45 | 157 | static struct lock_file lock_file; |
0d781539 | 158 | |
b39c53e6 | 159 | static const char ignore_error[] = |
6a1ad325 JH |
160 | "The following paths are ignored by one of your .gitignore files:\n"; |
161 | ||
a633fca0 | 162 | int cmd_add(int argc, const char **argv, const char *prefix) |
0d781539 LT |
163 | { |
164 | int i, newfd; | |
d616813d | 165 | int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; |
0d781539 LT |
166 | const char **pathspec; |
167 | struct dir_struct dir; | |
5cde71d6 JH |
168 | int add_interactive = 0; |
169 | ||
170 | for (i = 1; i < argc; i++) { | |
df59afe3 JH |
171 | if (!strcmp("--interactive", argv[i]) || |
172 | !strcmp("-i", argv[i])) | |
5cde71d6 JH |
173 | add_interactive++; |
174 | } | |
175 | if (add_interactive) { | |
176 | const char *args[] = { "add--interactive", NULL }; | |
177 | ||
178 | if (add_interactive != 1 || argc != 2) | |
179 | die("add --interactive does not take any parameters"); | |
180 | execv_git_cmd(args); | |
181 | exit(1); | |
182 | } | |
0d781539 | 183 | |
896bdfa2 | 184 | git_config(git_add_config); |
0d781539 | 185 | |
30ca07a2 | 186 | newfd = hold_locked_index(&lock_file, 1); |
0d781539 | 187 | |
0d781539 LT |
188 | for (i = 1; i < argc; i++) { |
189 | const char *arg = argv[i]; | |
190 | ||
191 | if (arg[0] != '-') | |
192 | break; | |
193 | if (!strcmp(arg, "--")) { | |
194 | i++; | |
195 | break; | |
196 | } | |
197 | if (!strcmp(arg, "-n")) { | |
198 | show_only = 1; | |
199 | continue; | |
200 | } | |
6a1ad325 JH |
201 | if (!strcmp(arg, "-f")) { |
202 | ignored_too = 1; | |
203 | continue; | |
204 | } | |
0d781539 LT |
205 | if (!strcmp(arg, "-v")) { |
206 | verbose = 1; | |
207 | continue; | |
208 | } | |
dfdac5d9 | 209 | if (!strcmp(arg, "-u")) { |
93c44d49 | 210 | take_worktree_changes = 1; |
dfdac5d9 JH |
211 | continue; |
212 | } | |
d616813d AJ |
213 | if (!strcmp(arg, "--refresh")) { |
214 | refresh_only = 1; | |
215 | continue; | |
216 | } | |
8cdf3364 | 217 | usage(builtin_add_usage); |
0d781539 | 218 | } |
dfdac5d9 | 219 | |
93c44d49 | 220 | if (take_worktree_changes) { |
2ed2c222 | 221 | update(verbose, prefix, argv + i); |
dfdac5d9 JH |
222 | goto finish; |
223 | } | |
224 | ||
93b0d86a JH |
225 | if (argc <= i) { |
226 | fprintf(stderr, "Nothing specified, nothing added.\n"); | |
227 | fprintf(stderr, "Maybe you wanted to say 'git add .'?\n"); | |
228 | return 0; | |
229 | } | |
0d781539 LT |
230 | pathspec = get_pathspec(prefix, argv + i); |
231 | ||
d616813d AJ |
232 | if (refresh_only) { |
233 | refresh(verbose, pathspec); | |
234 | goto finish; | |
235 | } | |
236 | ||
e96980ef | 237 | fill_directory(&dir, pathspec, ignored_too); |
0d781539 LT |
238 | |
239 | if (show_only) { | |
240 | const char *sep = "", *eof = ""; | |
241 | for (i = 0; i < dir.nr; i++) { | |
242 | printf("%s%s", sep, dir.entries[i]->name); | |
243 | sep = " "; | |
244 | eof = "\n"; | |
245 | } | |
246 | fputs(eof, stdout); | |
247 | return 0; | |
248 | } | |
249 | ||
366bfcb6 NP |
250 | if (read_cache() < 0) |
251 | die("index file corrupt"); | |
252 | ||
e96980ef | 253 | if (dir.ignored_nr) { |
b39c53e6 | 254 | fprintf(stderr, ignore_error); |
e96980ef JK |
255 | for (i = 0; i < dir.ignored_nr; i++) { |
256 | fprintf(stderr, "%s\n", dir.ignored[i]->name); | |
6a1ad325 | 257 | } |
e96980ef | 258 | fprintf(stderr, "Use -f if you really want to add them.\n"); |
b39c53e6 | 259 | die("no files added"); |
6a1ad325 JH |
260 | } |
261 | ||
0d781539 | 262 | for (i = 0; i < dir.nr; i++) |
fd1c3bf0 | 263 | add_file_to_cache(dir.entries[i]->name, verbose); |
0d781539 | 264 | |
dfdac5d9 | 265 | finish: |
0d781539 LT |
266 | if (active_cache_changed) { |
267 | if (write_cache(newfd, active_cache, active_nr) || | |
30ca07a2 | 268 | close(newfd) || commit_locked_index(&lock_file)) |
0d781539 LT |
269 | die("Unable to write new index file"); |
270 | } | |
271 | ||
272 | return 0; | |
273 | } |