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