Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / builtin-add.c
blob5e6748f3566b17c7729576c0c42c61bcf0f7657d
1 /*
2 * "git add" builtin command
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 "diff.h"
12 #include "diffcore.h"
13 #include "commit.h"
14 #include "revision.h"
16 static const char builtin_add_usage[] =
17 "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>...";
19 static int take_all_worktree_changes;
20 static const char *excludes_file;
22 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
24 char *seen;
25 int i, specs;
26 struct dir_entry **src, **dst;
28 for (specs = 0; pathspec[specs]; specs++)
29 /* nothing */;
30 seen = xcalloc(specs, 1);
32 src = dst = dir->entries;
33 i = dir->nr;
34 while (--i >= 0) {
35 struct dir_entry *entry = *src++;
36 if (match_pathspec(pathspec, entry->name, entry->len,
37 prefix, seen))
38 *dst++ = entry;
40 dir->nr = dst - dir->entries;
42 for (i = 0; i < specs; i++) {
43 struct stat st;
44 const char *match;
45 if (seen[i])
46 continue;
48 match = pathspec[i];
49 if (!match[0])
50 continue;
52 /* Existing file? We must have ignored it */
53 if (!lstat(match, &st)) {
54 struct dir_entry *ent;
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;
62 die("pathspec '%s' did not match any files", match);
66 static void fill_directory(struct dir_struct *dir, const char **pathspec)
68 const char *path, *base;
69 int baselen;
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);
77 if (!access(excludes_file, R_OK))
78 add_excludes_from_file(dir, excludes_file);
81 * Calculate common prefix for the pathspec, and
82 * use that to optimize the directory walk
84 baselen = common_prefix(pathspec);
85 path = ".";
86 base = "";
87 if (baselen) {
88 char *common = xmalloc(baselen + 1);
89 memcpy(common, *pathspec, baselen);
90 common[baselen] = 0;
91 path = base = common;
94 /* Read the directory and prune it */
95 read_directory(dir, path, base, baselen, pathspec);
96 if (pathspec)
97 prune_directory(dir, pathspec, baselen);
100 static void update_callback(struct diff_queue_struct *q,
101 struct diff_options *opt, void *cbdata)
103 int i, verbose;
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;
125 static void update_all(int verbose)
127 struct rev_info rev;
128 init_revisions(&rev, "");
129 setup_revisions(0, NULL, &rev, NULL);
130 rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
131 rev.diffopt.format_callback = update_callback;
132 rev.diffopt.format_callback_data = &verbose;
133 if (read_cache() < 0)
134 die("index file corrupt");
135 run_diff_files(&rev, 0);
138 static int git_add_config(const char *var, const char *value)
140 if (!strcmp(var, "core.excludesfile")) {
141 if (!value)
142 die("core.excludesfile without value");
143 excludes_file = xstrdup(value);
144 return 0;
147 return git_default_config(var, value);
150 static struct lock_file lock_file;
152 static const char ignore_warning[] =
153 "The following paths are ignored by one of your .gitignore files:\n";
155 int cmd_add(int argc, const char **argv, const char *prefix)
157 int i, newfd;
158 int verbose = 0, show_only = 0, ignored_too = 0;
159 const char **pathspec;
160 struct dir_struct dir;
161 int add_interactive = 0;
163 for (i = 1; i < argc; i++) {
164 if (!strcmp("--interactive", argv[i]) ||
165 !strcmp("-i", argv[i]))
166 add_interactive++;
168 if (add_interactive) {
169 const char *args[] = { "add--interactive", NULL };
171 if (add_interactive != 1 || argc != 2)
172 die("add --interactive does not take any parameters");
173 execv_git_cmd(args);
174 exit(1);
177 git_config(git_add_config);
179 newfd = hold_locked_index(&lock_file, 1);
181 for (i = 1; i < argc; i++) {
182 const char *arg = argv[i];
184 if (arg[0] != '-')
185 break;
186 if (!strcmp(arg, "--")) {
187 i++;
188 break;
190 if (!strcmp(arg, "-n")) {
191 show_only = 1;
192 continue;
194 if (!strcmp(arg, "-f")) {
195 ignored_too = 1;
196 continue;
198 if (!strcmp(arg, "-v")) {
199 verbose = 1;
200 continue;
202 if (!strcmp(arg, "-u")) {
203 take_all_worktree_changes = 1;
204 continue;
206 usage(builtin_add_usage);
209 if (take_all_worktree_changes) {
210 if (i < argc)
211 die("-u and explicit paths are incompatible");
212 update_all(verbose);
213 goto finish;
216 if (argc <= i) {
217 fprintf(stderr, "Nothing specified, nothing added.\n");
218 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
219 return 0;
221 pathspec = get_pathspec(prefix, argv + i);
223 fill_directory(&dir, pathspec);
225 if (show_only) {
226 const char *sep = "", *eof = "";
227 for (i = 0; i < dir.nr; i++) {
228 if (!ignored_too && dir.entries[i]->ignored)
229 continue;
230 printf("%s%s", sep, dir.entries[i]->name);
231 sep = " ";
232 eof = "\n";
234 fputs(eof, stdout);
235 return 0;
238 if (read_cache() < 0)
239 die("index file corrupt");
241 if (!ignored_too) {
242 int has_ignored = 0;
243 for (i = 0; i < dir.nr; i++)
244 if (dir.entries[i]->ignored)
245 has_ignored = 1;
246 if (has_ignored) {
247 fprintf(stderr, ignore_warning);
248 for (i = 0; i < dir.nr; i++) {
249 if (!dir.entries[i]->ignored)
250 continue;
251 fprintf(stderr, "%s", dir.entries[i]->name);
252 if (dir.entries[i]->ignored_dir)
253 fprintf(stderr, " (directory)");
254 fputc('\n', stderr);
256 fprintf(stderr,
257 "Use -f if you really want to add them.\n");
258 exit(1);
262 for (i = 0; i < dir.nr; i++)
263 add_file_to_cache(dir.entries[i]->name, verbose);
265 finish:
266 if (active_cache_changed) {
267 if (write_cache(newfd, active_cache, active_nr) ||
268 close(newfd) || commit_locked_index(&lock_file))
269 die("Unable to write new index file");
272 return 0;