git-svn: don't sanitize remote names in config
[git/dscho.git] / builtin-add.c
blob9930cf53f5e94cb7389e7c0b2b760b113a366e51
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 #include "run-command.h"
16 #include "parse-options.h"
18 static const char * const builtin_add_usage[] = {
19         "git-add [options] [--] <filepattern>...",
20         NULL
22 static int patch_interactive = 0, add_interactive = 0;
23 static int take_worktree_changes;
25 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
27         char *seen;
28         int i, specs;
29         struct dir_entry **src, **dst;
31         for (specs = 0; pathspec[specs];  specs++)
32                 /* nothing */;
33         seen = xcalloc(specs, 1);
35         src = dst = dir->entries;
36         i = dir->nr;
37         while (--i >= 0) {
38                 struct dir_entry *entry = *src++;
39                 if (match_pathspec(pathspec, entry->name, entry->len,
40                                    prefix, seen))
41                         *dst++ = entry;
42         }
43         dir->nr = dst - dir->entries;
45         for (i = 0; i < specs; i++) {
46                 if (!seen[i] && !file_exists(pathspec[i]))
47                         die("pathspec '%s' did not match any files",
48                                         pathspec[i]);
49         }
50         free(seen);
53 static void fill_directory(struct dir_struct *dir, const char **pathspec,
54                 int ignored_too)
56         const char *path, *base;
57         int baselen;
59         /* Set up the default git porcelain excludes */
60         memset(dir, 0, sizeof(*dir));
61         if (!ignored_too) {
62                 dir->collect_ignored = 1;
63                 setup_standard_excludes(dir);
64         }
66         /*
67          * Calculate common prefix for the pathspec, and
68          * use that to optimize the directory walk
69          */
70         baselen = common_prefix(pathspec);
71         path = ".";
72         base = "";
73         if (baselen)
74                 path = base = xmemdupz(*pathspec, baselen);
76         /* Read the directory and prune it */
77         read_directory(dir, path, base, baselen, pathspec);
78         if (pathspec)
79                 prune_directory(dir, pathspec, baselen);
82 struct update_callback_data
84         int flags;
85         int add_errors;
88 static void update_callback(struct diff_queue_struct *q,
89                             struct diff_options *opt, void *cbdata)
91         int i;
92         struct update_callback_data *data = cbdata;
94         for (i = 0; i < q->nr; i++) {
95                 struct diff_filepair *p = q->queue[i];
96                 const char *path = p->one->path;
97                 switch (p->status) {
98                 default:
99                         die("unexpected diff status %c", p->status);
100                 case DIFF_STATUS_UNMERGED:
101                 case DIFF_STATUS_MODIFIED:
102                 case DIFF_STATUS_TYPE_CHANGED:
103                         if (add_file_to_cache(path, data->flags)) {
104                                 if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
105                                         die("updating files failed");
106                                 data->add_errors++;
107                         }
108                         break;
109                 case DIFF_STATUS_DELETED:
110                         if (!(data->flags & ADD_CACHE_PRETEND))
111                                 remove_file_from_cache(path);
112                         if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
113                                 printf("remove '%s'\n", path);
114                         break;
115                 }
116         }
119 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
121         struct update_callback_data data;
122         struct rev_info rev;
123         init_revisions(&rev, prefix);
124         setup_revisions(0, NULL, &rev, NULL);
125         rev.prune_data = pathspec;
126         rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
127         rev.diffopt.format_callback = update_callback;
128         data.flags = flags;
129         data.add_errors = 0;
130         rev.diffopt.format_callback_data = &data;
131         run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
132         return !!data.add_errors;
135 static void refresh(int verbose, const char **pathspec)
137         char *seen;
138         int i, specs;
140         for (specs = 0; pathspec[specs];  specs++)
141                 /* nothing */;
142         seen = xcalloc(specs, 1);
143         if (read_cache() < 0)
144                 die("index file corrupt");
145         refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
146         for (i = 0; i < specs; i++) {
147                 if (!seen[i])
148                         die("pathspec '%s' did not match any files", pathspec[i]);
149         }
150         free(seen);
153 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
155         const char **pathspec = get_pathspec(prefix, argv);
157         return pathspec;
160 int interactive_add(int argc, const char **argv, const char *prefix)
162         int status, ac;
163         const char **args;
164         const char **pathspec = NULL;
166         if (argc) {
167                 pathspec = validate_pathspec(argc, argv, prefix);
168                 if (!pathspec)
169                         return -1;
170         }
172         args = xcalloc(sizeof(const char *), (argc + 4));
173         ac = 0;
174         args[ac++] = "add--interactive";
175         if (patch_interactive)
176                 args[ac++] = "--patch";
177         args[ac++] = "--";
178         if (argc) {
179                 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
180                 ac += argc;
181         }
182         args[ac] = NULL;
184         status = run_command_v_opt(args, RUN_GIT_CMD);
185         free(args);
186         return status;
189 static struct lock_file lock_file;
191 static const char ignore_error[] =
192 "The following paths are ignored by one of your .gitignore files:\n";
194 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
195 static int ignore_add_errors;
197 static struct option builtin_add_options[] = {
198         OPT__DRY_RUN(&show_only),
199         OPT__VERBOSE(&verbose),
200         OPT_GROUP(""),
201         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
202         OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
203         OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
204         OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
205         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
206         OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
207         OPT_END(),
210 static int add_config(const char *var, const char *value, void *cb)
212         if (!strcasecmp(var, "add.ignore-errors")) {
213                 ignore_add_errors = git_config_bool(var, value);
214                 return 0;
215         }
216         return git_default_config(var, value, cb);
219 int cmd_add(int argc, const char **argv, const char *prefix)
221         int exit_status = 0;
222         int i, newfd;
223         const char **pathspec;
224         struct dir_struct dir;
225         int flags;
227         argc = parse_options(argc, argv, builtin_add_options,
228                           builtin_add_usage, 0);
229         if (patch_interactive)
230                 add_interactive = 1;
231         if (add_interactive)
232                 exit(interactive_add(argc, argv, prefix));
234         git_config(add_config, NULL);
236         newfd = hold_locked_index(&lock_file, 1);
238         flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
239                  (show_only ? ADD_CACHE_PRETEND : 0) |
240                  (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0));
242         if (take_worktree_changes) {
243                 const char **pathspec;
244                 if (read_cache() < 0)
245                         die("index file corrupt");
246                 pathspec = get_pathspec(prefix, argv);
247                 exit_status = add_files_to_cache(prefix, pathspec, flags);
248                 goto finish;
249         }
251         if (argc == 0) {
252                 fprintf(stderr, "Nothing specified, nothing added.\n");
253                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
254                 return 0;
255         }
256         pathspec = get_pathspec(prefix, argv);
258         if (refresh_only) {
259                 refresh(verbose, pathspec);
260                 goto finish;
261         }
263         fill_directory(&dir, pathspec, ignored_too);
265         if (read_cache() < 0)
266                 die("index file corrupt");
268         if (dir.ignored_nr) {
269                 fprintf(stderr, ignore_error);
270                 for (i = 0; i < dir.ignored_nr; i++) {
271                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
272                 }
273                 fprintf(stderr, "Use -f if you really want to add them.\n");
274                 die("no files added");
275         }
277         for (i = 0; i < dir.nr; i++)
278                 if (add_file_to_cache(dir.entries[i]->name, flags)) {
279                         if (!ignore_add_errors)
280                                 die("adding files failed");
281                         exit_status = 1;
282                 }
284  finish:
285         if (active_cache_changed) {
286                 if (write_cache(newfd, active_cache, active_nr) ||
287                     commit_locked_index(&lock_file))
288                         die("Unable to write new index file");
289         }
291         return exit_status;