Merge branch 'js/tag'
[git] / builtin-add.c
1 /*
2  * "git add" builtin command
3  *
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"
15
16 static const char builtin_add_usage[] =
17 "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>...";
18
19 static int take_worktree_changes;
20 static const char *excludes_file;
21
22 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
23 {
24         char *seen;
25         int i, specs;
26         struct dir_entry **src, **dst;
27
28         for (specs = 0; pathspec[specs];  specs++)
29                 /* nothing */;
30         seen = xcalloc(specs, 1);
31
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;
39         }
40         dir->nr = dst - dir->entries;
41
42         for (i = 0; i < specs; i++) {
43                 if (!seen[i] && !file_exists(pathspec[i]))
44                         die("pathspec '%s' did not match any files",
45                                         pathspec[i]);
46         }
47 }
48
49 static void fill_directory(struct dir_struct *dir, const char **pathspec,
50                 int ignored_too)
51 {
52         const char *path, *base;
53         int baselen;
54
55         /* Set up the default git porcelain excludes */
56         memset(dir, 0, sizeof(*dir));
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);
63                 if (excludes_file != NULL && !access(excludes_file, R_OK))
64                         add_excludes_from_file(dir, excludes_file);
65         }
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);
76                 memcpy(common, *pathspec, baselen);
77                 common[baselen] = 0;
78                 path = base = common;
79         }
80
81         /* Read the directory and prune it */
82         read_directory(dir, path, base, baselen, pathspec);
83         if (pathspec)
84                 prune_directory(dir, pathspec, baselen);
85 }
86
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:
98                         die("unexpected diff status %c", p->status);
99                 case DIFF_STATUS_UNMERGED:
100                 case DIFF_STATUS_MODIFIED:
101                 case DIFF_STATUS_TYPE_CHANGED:
102                         add_file_to_cache(path, verbose);
103                         break;
104                 case DIFF_STATUS_DELETED:
105                         remove_file_from_cache(path);
106                         cache_tree_invalidate_path(active_cache_tree, path);
107                         if (verbose)
108                                 printf("remove '%s'\n", path);
109                         break;
110                 }
111         }
112 }
113
114 static void update(int verbose, const char *prefix, const char **files)
115 {
116         struct rev_info rev;
117         init_revisions(&rev, prefix);
118         setup_revisions(0, NULL, &rev, NULL);
119         rev.prune_data = get_pathspec(prefix, files);
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
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
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
157 static struct lock_file lock_file;
158
159 static const char ignore_error[] =
160 "The following paths are ignored by one of your .gitignore files:\n";
161
162 int cmd_add(int argc, const char **argv, const char *prefix)
163 {
164         int i, newfd;
165         int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
166         const char **pathspec;
167         struct dir_struct dir;
168         int add_interactive = 0;
169
170         for (i = 1; i < argc; i++) {
171                 if (!strcmp("--interactive", argv[i]) ||
172                     !strcmp("-i", argv[i]))
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         }
183
184         git_config(git_add_config);
185
186         newfd = hold_locked_index(&lock_file, 1);
187
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                 }
201                 if (!strcmp(arg, "-f")) {
202                         ignored_too = 1;
203                         continue;
204                 }
205                 if (!strcmp(arg, "-v")) {
206                         verbose = 1;
207                         continue;
208                 }
209                 if (!strcmp(arg, "-u")) {
210                         take_worktree_changes = 1;
211                         continue;
212                 }
213                 if (!strcmp(arg, "--refresh")) {
214                         refresh_only = 1;
215                         continue;
216                 }
217                 usage(builtin_add_usage);
218         }
219
220         if (take_worktree_changes) {
221                 update(verbose, prefix, argv + i);
222                 goto finish;
223         }
224
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         }
230         pathspec = get_pathspec(prefix, argv + i);
231
232         if (refresh_only) {
233                 refresh(verbose, pathspec);
234                 goto finish;
235         }
236
237         fill_directory(&dir, pathspec, ignored_too);
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
250         if (read_cache() < 0)
251                 die("index file corrupt");
252
253         if (dir.ignored_nr) {
254                 fprintf(stderr, ignore_error);
255                 for (i = 0; i < dir.ignored_nr; i++) {
256                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
257                 }
258                 fprintf(stderr, "Use -f if you really want to add them.\n");
259                 die("no files added");
260         }
261
262         for (i = 0; i < dir.nr; i++)
263                 add_file_to_cache(dir.entries[i]->name, verbose);
264
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");
270         }
271
272         return 0;
273 }