blob: 9847b7e019ece82f19e3e5decf8647eb921c4291 [file] [log] [blame]
Linus Torvalds0d781532006-05-17 09:33:32 -07001/*
2 * "git add" builtin command
3 *
4 * Copyright (C) 2006 Linus Torvalds
5 */
Linus Torvalds0d781532006-05-17 09:33:32 -07006#include "cache.h"
7#include "builtin.h"
8#include "dir.h"
Junio C Hamano5cde71d2006-12-10 20:55:50 -08009#include "exec_cmd.h"
Junio C Hamano93872e02006-05-20 01:28:49 -070010#include "cache-tree.h"
Junio C Hamanodfdac5d2007-04-20 01:39:39 -070011#include "diff.h"
12#include "diffcore.h"
13#include "commit.h"
14#include "revision.h"
Linus Torvalds0d781532006-05-17 09:33:32 -070015
16static const char builtin_add_usage[] =
Brian Hetro480611d2007-08-25 23:20:06 -040017"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>...";
Linus Torvalds0d781532006-05-17 09:33:32 -070018
Jeff King93c44d42007-05-12 02:42:00 -040019static int take_worktree_changes;
James Bowes896bdfa2007-02-27 22:31:10 -050020static const char *excludes_file;
21
Linus Torvalds0d781532006-05-17 09:33:32 -070022static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
23{
Linus Torvaldsf2593392006-05-17 13:23:19 -070024 char *seen;
25 int i, specs;
Linus Torvalds0d781532006-05-17 09:33:32 -070026 struct dir_entry **src, **dst;
27
Linus Torvaldsf2593392006-05-17 13:23:19 -070028 for (specs = 0; pathspec[specs]; specs++)
29 /* nothing */;
Peter Eriksen28f75812006-07-25 09:30:18 +020030 seen = xcalloc(specs, 1);
Linus Torvaldsf2593392006-05-17 13:23:19 -070031
Linus Torvalds0d781532006-05-17 09:33:32 -070032 src = dst = dir->entries;
33 i = dir->nr;
34 while (--i >= 0) {
35 struct dir_entry *entry = *src++;
Junio C Hamano4d06f8a2006-12-29 11:01:31 -080036 if (match_pathspec(pathspec, entry->name, entry->len,
37 prefix, seen))
38 *dst++ = entry;
Linus Torvalds0d781532006-05-17 09:33:32 -070039 }
40 dir->nr = dst - dir->entries;
Linus Torvaldsf2593392006-05-17 13:23:19 -070041
42 for (i = 0; i < specs; i++) {
Jeff Kinge96980e2007-06-12 23:42:14 +020043 if (!seen[i] && !file_exists(pathspec[i]))
44 die("pathspec '%s' did not match any files",
45 pathspec[i]);
Linus Torvaldsf2593392006-05-17 13:23:19 -070046 }
Linus Torvalds0d781532006-05-17 09:33:32 -070047}
48
Jeff Kinge96980e2007-06-12 23:42:14 +020049static void fill_directory(struct dir_struct *dir, const char **pathspec,
50 int ignored_too)
Linus Torvalds0d781532006-05-17 09:33:32 -070051{
52 const char *path, *base;
53 int baselen;
54
55 /* Set up the default git porcelain excludes */
56 memset(dir, 0, sizeof(*dir));
Jeff Kinge96980e2007-06-12 23:42:14 +020057 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);
Thomas Schwinge8b4aee02007-07-28 20:26:35 +020063 if (excludes_file != NULL && !access(excludes_file, R_OK))
Jeff Kinge96980e2007-06-12 23:42:14 +020064 add_excludes_from_file(dir, excludes_file);
65 }
Linus Torvalds0d781532006-05-17 09:33:32 -070066
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);
Linus Torvalds0d781532006-05-17 09:33:32 -070076 memcpy(common, *pathspec, baselen);
77 common[baselen] = 0;
78 path = base = common;
79 }
80
81 /* Read the directory and prune it */
Linus Torvalds9fc42d62007-03-30 20:39:30 -070082 read_directory(dir, path, base, baselen, pathspec);
Linus Torvalds0d781532006-05-17 09:33:32 -070083 if (pathspec)
84 prune_directory(dir, pathspec, baselen);
85}
86
Junio C Hamanodfdac5d2007-04-20 01:39:39 -070087static 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("unexpacted diff status %c", p->status);
99 case DIFF_STATUS_UNMERGED:
100 case DIFF_STATUS_MODIFIED:
Junio C Hamano767c98a2007-09-14 00:45:29 -0700101 case DIFF_STATUS_TYPE_CHANGED:
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700102 add_file_to_cache(path, verbose);
103 break;
104 case DIFF_STATUS_DELETED:
105 remove_file_from_cache(path);
Junio C Hamanoa4882c22007-08-15 14:12:14 -0700106 cache_tree_invalidate_path(active_cache_tree, path);
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700107 if (verbose)
108 printf("remove '%s'\n", path);
109 break;
110 }
111 }
112}
113
Salikh Zakirov2ed2c222007-08-16 02:01:43 +0900114static void update(int verbose, const char *prefix, const char **files)
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700115{
116 struct rev_info rev;
Salikh Zakirov2ed2c222007-08-16 02:01:43 +0900117 init_revisions(&rev, prefix);
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700118 setup_revisions(0, NULL, &rev, NULL);
Salikh Zakirov2ed2c222007-08-16 02:01:43 +0900119 rev.prune_data = get_pathspec(prefix, files);
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700120 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
Alexandre Julliardd6168132007-08-11 23:59:01 +0200128static 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
James Bowes896bdfa2007-02-27 22:31:10 -0500145static 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
Junio C Hamano021b6e42006-06-06 12:51:49 -0700157static struct lock_file lock_file;
Linus Torvalds0d781532006-05-17 09:33:32 -0700158
Petr Baudisb39c53e2007-08-29 00:41:23 +0200159static const char ignore_error[] =
Junio C Hamano6a1ad322006-12-25 17:46:38 -0800160"The following paths are ignored by one of your .gitignore files:\n";
161
Linus Torvaldsa633fca2006-07-28 22:44:25 -0700162int cmd_add(int argc, const char **argv, const char *prefix)
Linus Torvalds0d781532006-05-17 09:33:32 -0700163{
164 int i, newfd;
Alexandre Julliardd6168132007-08-11 23:59:01 +0200165 int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
Linus Torvalds0d781532006-05-17 09:33:32 -0700166 const char **pathspec;
167 struct dir_struct dir;
Junio C Hamano5cde71d2006-12-10 20:55:50 -0800168 int add_interactive = 0;
169
170 for (i = 1; i < argc; i++) {
Junio C Hamanodf59afe2007-01-17 10:52:36 -0800171 if (!strcmp("--interactive", argv[i]) ||
172 !strcmp("-i", argv[i]))
Junio C Hamano5cde71d2006-12-10 20:55:50 -0800173 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 }
Linus Torvalds0d781532006-05-17 09:33:32 -0700183
James Bowes896bdfa2007-02-27 22:31:10 -0500184 git_config(git_add_config);
Linus Torvalds0d781532006-05-17 09:33:32 -0700185
Junio C Hamano30ca07a2007-03-31 23:09:02 -0700186 newfd = hold_locked_index(&lock_file, 1);
Linus Torvalds0d781532006-05-17 09:33:32 -0700187
Linus Torvalds0d781532006-05-17 09:33:32 -0700188 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 }
Junio C Hamano6a1ad322006-12-25 17:46:38 -0800201 if (!strcmp(arg, "-f")) {
202 ignored_too = 1;
203 continue;
204 }
Linus Torvalds0d781532006-05-17 09:33:32 -0700205 if (!strcmp(arg, "-v")) {
206 verbose = 1;
207 continue;
208 }
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700209 if (!strcmp(arg, "-u")) {
Jeff King93c44d42007-05-12 02:42:00 -0400210 take_worktree_changes = 1;
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700211 continue;
212 }
Alexandre Julliardd6168132007-08-11 23:59:01 +0200213 if (!strcmp(arg, "--refresh")) {
214 refresh_only = 1;
215 continue;
216 }
Ramsay Allan Jones8cdf3362006-08-03 16:48:41 +0100217 usage(builtin_add_usage);
Linus Torvalds0d781532006-05-17 09:33:32 -0700218 }
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700219
Jeff King93c44d42007-05-12 02:42:00 -0400220 if (take_worktree_changes) {
Salikh Zakirov2ed2c222007-08-16 02:01:43 +0900221 update(verbose, prefix, argv + i);
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700222 goto finish;
223 }
224
Junio C Hamano93b0d862006-12-20 13:06:46 -0800225 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 }
Linus Torvalds0d781532006-05-17 09:33:32 -0700230 pathspec = get_pathspec(prefix, argv + i);
231
Alexandre Julliardd6168132007-08-11 23:59:01 +0200232 if (refresh_only) {
233 refresh(verbose, pathspec);
234 goto finish;
235 }
236
Jeff Kinge96980e2007-06-12 23:42:14 +0200237 fill_directory(&dir, pathspec, ignored_too);
Linus Torvalds0d781532006-05-17 09:33:32 -0700238
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
Nicolas Pitre366bfcb2006-12-04 11:13:39 -0500250 if (read_cache() < 0)
251 die("index file corrupt");
252
Jeff Kinge96980e2007-06-12 23:42:14 +0200253 if (dir.ignored_nr) {
Petr Baudisb39c53e2007-08-29 00:41:23 +0200254 fprintf(stderr, ignore_error);
Jeff Kinge96980e2007-06-12 23:42:14 +0200255 for (i = 0; i < dir.ignored_nr; i++) {
256 fprintf(stderr, "%s\n", dir.ignored[i]->name);
Junio C Hamano6a1ad322006-12-25 17:46:38 -0800257 }
Jeff Kinge96980e2007-06-12 23:42:14 +0200258 fprintf(stderr, "Use -f if you really want to add them.\n");
Petr Baudisb39c53e2007-08-29 00:41:23 +0200259 die("no files added");
Junio C Hamano6a1ad322006-12-25 17:46:38 -0800260 }
261
Linus Torvalds0d781532006-05-17 09:33:32 -0700262 for (i = 0; i < dir.nr; i++)
Junio C Hamanofd1c3bf2007-04-01 22:14:40 -0700263 add_file_to_cache(dir.entries[i]->name, verbose);
Linus Torvalds0d781532006-05-17 09:33:32 -0700264
Junio C Hamanodfdac5d2007-04-20 01:39:39 -0700265 finish:
Linus Torvalds0d781532006-05-17 09:33:32 -0700266 if (active_cache_changed) {
267 if (write_cache(newfd, active_cache, active_nr) ||
Junio C Hamano30ca07a2007-03-31 23:09:02 -0700268 close(newfd) || commit_locked_index(&lock_file))
Linus Torvalds0d781532006-05-17 09:33:32 -0700269 die("Unable to write new index file");
270 }
271
272 return 0;
273}