Merge branch 'maint'
[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                 path = base = xmemdupz(*pathspec, baselen);
76
77         /* Read the directory and prune it */
78         read_directory(dir, path, base, baselen, pathspec);
79         if (pathspec)
80                 prune_directory(dir, pathspec, baselen);
81 }
82
83 static void update_callback(struct diff_queue_struct *q,
84                             struct diff_options *opt, void *cbdata)
85 {
86         int i, verbose;
87
88         verbose = *((int *)cbdata);
89         for (i = 0; i < q->nr; i++) {
90                 struct diff_filepair *p = q->queue[i];
91                 const char *path = p->one->path;
92                 switch (p->status) {
93                 default:
94                         die("unexpected diff status %c", p->status);
95                 case DIFF_STATUS_UNMERGED:
96                 case DIFF_STATUS_MODIFIED:
97                 case DIFF_STATUS_TYPE_CHANGED:
98                         add_file_to_cache(path, verbose);
99                         break;
100                 case DIFF_STATUS_DELETED:
101                         remove_file_from_cache(path);
102                         if (verbose)
103                                 printf("remove '%s'\n", path);
104                         break;
105                 }
106         }
107 }
108
109 static void update(int verbose, const char *prefix, const char **files)
110 {
111         struct rev_info rev;
112         init_revisions(&rev, prefix);
113         setup_revisions(0, NULL, &rev, NULL);
114         rev.prune_data = get_pathspec(prefix, files);
115         rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
116         rev.diffopt.format_callback = update_callback;
117         rev.diffopt.format_callback_data = &verbose;
118         if (read_cache() < 0)
119                 die("index file corrupt");
120         run_diff_files(&rev, 0);
121 }
122
123 static void refresh(int verbose, const char **pathspec)
124 {
125         char *seen;
126         int i, specs;
127
128         for (specs = 0; pathspec[specs];  specs++)
129                 /* nothing */;
130         seen = xcalloc(specs, 1);
131         if (read_cache() < 0)
132                 die("index file corrupt");
133         refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
134         for (i = 0; i < specs; i++) {
135                 if (!seen[i])
136                         die("pathspec '%s' did not match any files", pathspec[i]);
137         }
138 }
139
140 static int git_add_config(const char *var, const char *value)
141 {
142         if (!strcmp(var, "core.excludesfile")) {
143                 if (!value)
144                         die("core.excludesfile without value");
145                 excludes_file = xstrdup(value);
146                 return 0;
147         }
148
149         return git_default_config(var, value);
150 }
151
152 static struct lock_file lock_file;
153
154 static const char ignore_error[] =
155 "The following paths are ignored by one of your .gitignore files:\n";
156
157 int cmd_add(int argc, const char **argv, const char *prefix)
158 {
159         int i, newfd;
160         int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
161         const char **pathspec;
162         struct dir_struct dir;
163         int add_interactive = 0;
164
165         for (i = 1; i < argc; i++) {
166                 if (!strcmp("--interactive", argv[i]) ||
167                     !strcmp("-i", argv[i]))
168                         add_interactive++;
169         }
170         if (add_interactive) {
171                 const char *args[] = { "add--interactive", NULL };
172
173                 if (add_interactive != 1 || argc != 2)
174                         die("add --interactive does not take any parameters");
175                 execv_git_cmd(args);
176                 exit(1);
177         }
178
179         git_config(git_add_config);
180
181         newfd = hold_locked_index(&lock_file, 1);
182
183         for (i = 1; i < argc; i++) {
184                 const char *arg = argv[i];
185
186                 if (arg[0] != '-')
187                         break;
188                 if (!strcmp(arg, "--")) {
189                         i++;
190                         break;
191                 }
192                 if (!strcmp(arg, "-n")) {
193                         show_only = 1;
194                         continue;
195                 }
196                 if (!strcmp(arg, "-f")) {
197                         ignored_too = 1;
198                         continue;
199                 }
200                 if (!strcmp(arg, "-v")) {
201                         verbose = 1;
202                         continue;
203                 }
204                 if (!strcmp(arg, "-u")) {
205                         take_worktree_changes = 1;
206                         continue;
207                 }
208                 if (!strcmp(arg, "--refresh")) {
209                         refresh_only = 1;
210                         continue;
211                 }
212                 usage(builtin_add_usage);
213         }
214
215         if (take_worktree_changes) {
216                 update(verbose, prefix, argv + i);
217                 goto finish;
218         }
219
220         if (argc <= i) {
221                 fprintf(stderr, "Nothing specified, nothing added.\n");
222                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
223                 return 0;
224         }
225         pathspec = get_pathspec(prefix, argv + i);
226
227         if (refresh_only) {
228                 refresh(verbose, pathspec);
229                 goto finish;
230         }
231
232         fill_directory(&dir, pathspec, ignored_too);
233
234         if (show_only) {
235                 const char *sep = "", *eof = "";
236                 for (i = 0; i < dir.nr; i++) {
237                         printf("%s%s", sep, dir.entries[i]->name);
238                         sep = " ";
239                         eof = "\n";
240                 }
241                 fputs(eof, stdout);
242                 return 0;
243         }
244
245         if (read_cache() < 0)
246                 die("index file corrupt");
247
248         if (dir.ignored_nr) {
249                 fprintf(stderr, ignore_error);
250                 for (i = 0; i < dir.ignored_nr; i++) {
251                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
252                 }
253                 fprintf(stderr, "Use -f if you really want to add them.\n");
254                 die("no files added");
255         }
256
257         for (i = 0; i < dir.nr; i++)
258                 add_file_to_cache(dir.entries[i]->name, verbose);
259
260  finish:
261         if (active_cache_changed) {
262                 if (write_cache(newfd, active_cache, active_nr) ||
263                     close(newfd) || commit_locked_index(&lock_file))
264                         die("Unable to write new index file");
265         }
266
267         return 0;
268 }