Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 1 | /* |
| 2 | * "git add" builtin command |
| 3 | * |
| 4 | * Copyright (C) 2006 Linus Torvalds |
| 5 | */ |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 6 | #include "cache.h" |
| 7 | #include "builtin.h" |
| 8 | #include "dir.h" |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 9 | #include "exec_cmd.h" |
Junio C Hamano | 93872e0 | 2006-05-20 01:28:49 -0700 | [diff] [blame] | 10 | #include "cache-tree.h" |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 11 | #include "diff.h" |
| 12 | #include "diffcore.h" |
| 13 | #include "commit.h" |
| 14 | #include "revision.h" |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 15 | |
| 16 | static const char builtin_add_usage[] = |
Brian Hetro | 480611d | 2007-08-25 23:20:06 -0400 | [diff] [blame] | 17 | "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>..."; |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 18 | |
Jeff King | 93c44d4 | 2007-05-12 02:42:00 -0400 | [diff] [blame] | 19 | static int take_worktree_changes; |
James Bowes | 896bdfa | 2007-02-27 22:31:10 -0500 | [diff] [blame] | 20 | static const char *excludes_file; |
| 21 | |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 22 | static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) |
| 23 | { |
Linus Torvalds | f259339 | 2006-05-17 13:23:19 -0700 | [diff] [blame] | 24 | char *seen; |
| 25 | int i, specs; |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 26 | struct dir_entry **src, **dst; |
| 27 | |
Linus Torvalds | f259339 | 2006-05-17 13:23:19 -0700 | [diff] [blame] | 28 | for (specs = 0; pathspec[specs]; specs++) |
| 29 | /* nothing */; |
Peter Eriksen | 28f7581 | 2006-07-25 09:30:18 +0200 | [diff] [blame] | 30 | seen = xcalloc(specs, 1); |
Linus Torvalds | f259339 | 2006-05-17 13:23:19 -0700 | [diff] [blame] | 31 | |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 32 | src = dst = dir->entries; |
| 33 | i = dir->nr; |
| 34 | while (--i >= 0) { |
| 35 | struct dir_entry *entry = *src++; |
Junio C Hamano | 4d06f8a | 2006-12-29 11:01:31 -0800 | [diff] [blame] | 36 | if (match_pathspec(pathspec, entry->name, entry->len, |
| 37 | prefix, seen)) |
| 38 | *dst++ = entry; |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 39 | } |
| 40 | dir->nr = dst - dir->entries; |
Linus Torvalds | f259339 | 2006-05-17 13:23:19 -0700 | [diff] [blame] | 41 | |
| 42 | for (i = 0; i < specs; i++) { |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 43 | if (!seen[i] && !file_exists(pathspec[i])) |
| 44 | die("pathspec '%s' did not match any files", |
| 45 | pathspec[i]); |
Linus Torvalds | f259339 | 2006-05-17 13:23:19 -0700 | [diff] [blame] | 46 | } |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 47 | } |
| 48 | |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 49 | static void fill_directory(struct dir_struct *dir, const char **pathspec, |
| 50 | int ignored_too) |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 51 | { |
| 52 | const char *path, *base; |
| 53 | int baselen; |
| 54 | |
| 55 | /* Set up the default git porcelain excludes */ |
| 56 | memset(dir, 0, sizeof(*dir)); |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 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); |
Thomas Schwinge | 8b4aee0 | 2007-07-28 20:26:35 +0200 | [diff] [blame] | 63 | if (excludes_file != NULL && !access(excludes_file, R_OK)) |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 64 | add_excludes_from_file(dir, excludes_file); |
| 65 | } |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 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); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 76 | memcpy(common, *pathspec, baselen); |
| 77 | common[baselen] = 0; |
| 78 | path = base = common; |
| 79 | } |
| 80 | |
| 81 | /* Read the directory and prune it */ |
Linus Torvalds | 9fc42d6 | 2007-03-30 20:39:30 -0700 | [diff] [blame] | 82 | read_directory(dir, path, base, baselen, pathspec); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 83 | if (pathspec) |
| 84 | prune_directory(dir, pathspec, baselen); |
| 85 | } |
| 86 | |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 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("unexpacted diff status %c", p->status); |
| 99 | case DIFF_STATUS_UNMERGED: |
| 100 | case DIFF_STATUS_MODIFIED: |
Junio C Hamano | 767c98a | 2007-09-14 00:45:29 -0700 | [diff] [blame^] | 101 | case DIFF_STATUS_TYPE_CHANGED: |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 102 | add_file_to_cache(path, verbose); |
| 103 | break; |
| 104 | case DIFF_STATUS_DELETED: |
| 105 | remove_file_from_cache(path); |
Junio C Hamano | a4882c2 | 2007-08-15 14:12:14 -0700 | [diff] [blame] | 106 | cache_tree_invalidate_path(active_cache_tree, path); |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 107 | if (verbose) |
| 108 | printf("remove '%s'\n", path); |
| 109 | break; |
| 110 | } |
| 111 | } |
| 112 | } |
| 113 | |
Salikh Zakirov | 2ed2c22 | 2007-08-16 02:01:43 +0900 | [diff] [blame] | 114 | static void update(int verbose, const char *prefix, const char **files) |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 115 | { |
| 116 | struct rev_info rev; |
Salikh Zakirov | 2ed2c22 | 2007-08-16 02:01:43 +0900 | [diff] [blame] | 117 | init_revisions(&rev, prefix); |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 118 | setup_revisions(0, NULL, &rev, NULL); |
Salikh Zakirov | 2ed2c22 | 2007-08-16 02:01:43 +0900 | [diff] [blame] | 119 | rev.prune_data = get_pathspec(prefix, files); |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 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 | |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 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 | |
James Bowes | 896bdfa | 2007-02-27 22:31:10 -0500 | [diff] [blame] | 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 | |
Junio C Hamano | 021b6e4 | 2006-06-06 12:51:49 -0700 | [diff] [blame] | 157 | static struct lock_file lock_file; |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 158 | |
Petr Baudis | b39c53e | 2007-08-29 00:41:23 +0200 | [diff] [blame] | 159 | static const char ignore_error[] = |
Junio C Hamano | 6a1ad32 | 2006-12-25 17:46:38 -0800 | [diff] [blame] | 160 | "The following paths are ignored by one of your .gitignore files:\n"; |
| 161 | |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 162 | int cmd_add(int argc, const char **argv, const char *prefix) |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 163 | { |
| 164 | int i, newfd; |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 165 | int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 166 | const char **pathspec; |
| 167 | struct dir_struct dir; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 168 | int add_interactive = 0; |
| 169 | |
| 170 | for (i = 1; i < argc; i++) { |
Junio C Hamano | df59afe | 2007-01-17 10:52:36 -0800 | [diff] [blame] | 171 | if (!strcmp("--interactive", argv[i]) || |
| 172 | !strcmp("-i", argv[i])) |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 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 | } |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 183 | |
James Bowes | 896bdfa | 2007-02-27 22:31:10 -0500 | [diff] [blame] | 184 | git_config(git_add_config); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 185 | |
Junio C Hamano | 30ca07a | 2007-03-31 23:09:02 -0700 | [diff] [blame] | 186 | newfd = hold_locked_index(&lock_file, 1); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 187 | |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 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 | } |
Junio C Hamano | 6a1ad32 | 2006-12-25 17:46:38 -0800 | [diff] [blame] | 201 | if (!strcmp(arg, "-f")) { |
| 202 | ignored_too = 1; |
| 203 | continue; |
| 204 | } |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 205 | if (!strcmp(arg, "-v")) { |
| 206 | verbose = 1; |
| 207 | continue; |
| 208 | } |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 209 | if (!strcmp(arg, "-u")) { |
Jeff King | 93c44d4 | 2007-05-12 02:42:00 -0400 | [diff] [blame] | 210 | take_worktree_changes = 1; |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 211 | continue; |
| 212 | } |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 213 | if (!strcmp(arg, "--refresh")) { |
| 214 | refresh_only = 1; |
| 215 | continue; |
| 216 | } |
Ramsay Allan Jones | 8cdf336 | 2006-08-03 16:48:41 +0100 | [diff] [blame] | 217 | usage(builtin_add_usage); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 218 | } |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 219 | |
Jeff King | 93c44d4 | 2007-05-12 02:42:00 -0400 | [diff] [blame] | 220 | if (take_worktree_changes) { |
Salikh Zakirov | 2ed2c22 | 2007-08-16 02:01:43 +0900 | [diff] [blame] | 221 | update(verbose, prefix, argv + i); |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 222 | goto finish; |
| 223 | } |
| 224 | |
Junio C Hamano | 93b0d86 | 2006-12-20 13:06:46 -0800 | [diff] [blame] | 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 | } |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 230 | pathspec = get_pathspec(prefix, argv + i); |
| 231 | |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 232 | if (refresh_only) { |
| 233 | refresh(verbose, pathspec); |
| 234 | goto finish; |
| 235 | } |
| 236 | |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 237 | fill_directory(&dir, pathspec, ignored_too); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 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 | |
Nicolas Pitre | 366bfcb | 2006-12-04 11:13:39 -0500 | [diff] [blame] | 250 | if (read_cache() < 0) |
| 251 | die("index file corrupt"); |
| 252 | |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 253 | if (dir.ignored_nr) { |
Petr Baudis | b39c53e | 2007-08-29 00:41:23 +0200 | [diff] [blame] | 254 | fprintf(stderr, ignore_error); |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 255 | for (i = 0; i < dir.ignored_nr; i++) { |
| 256 | fprintf(stderr, "%s\n", dir.ignored[i]->name); |
Junio C Hamano | 6a1ad32 | 2006-12-25 17:46:38 -0800 | [diff] [blame] | 257 | } |
Jeff King | e96980e | 2007-06-12 23:42:14 +0200 | [diff] [blame] | 258 | fprintf(stderr, "Use -f if you really want to add them.\n"); |
Petr Baudis | b39c53e | 2007-08-29 00:41:23 +0200 | [diff] [blame] | 259 | die("no files added"); |
Junio C Hamano | 6a1ad32 | 2006-12-25 17:46:38 -0800 | [diff] [blame] | 260 | } |
| 261 | |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 262 | for (i = 0; i < dir.nr; i++) |
Junio C Hamano | fd1c3bf | 2007-04-01 22:14:40 -0700 | [diff] [blame] | 263 | add_file_to_cache(dir.entries[i]->name, verbose); |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 264 | |
Junio C Hamano | dfdac5d | 2007-04-20 01:39:39 -0700 | [diff] [blame] | 265 | finish: |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 266 | if (active_cache_changed) { |
| 267 | if (write_cache(newfd, active_cache, active_nr) || |
Junio C Hamano | 30ca07a | 2007-03-31 23:09:02 -0700 | [diff] [blame] | 268 | close(newfd) || commit_locked_index(&lock_file)) |
Linus Torvalds | 0d78153 | 2006-05-17 09:33:32 -0700 | [diff] [blame] | 269 | die("Unable to write new index file"); |
| 270 | } |
| 271 | |
| 272 | return 0; |
| 273 | } |