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 #include "run-command.h"
  16 #include "parse-options.h"
  17
  18 static const char * const builtin_add_usage[] = {
  19         "git-add [options] [--] <filepattern>...",
  20         NULL
  21 };
  22 static int patch_interactive = 0, add_interactive = 0;
  23 static int take_worktree_changes;
  24
  25 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
  26 {
  27         char *seen;
  28         int i, specs;
  29         struct dir_entry **src, **dst;
  30
  31         for (specs = 0; pathspec[specs];  specs++)
  32                 /* nothing */;
  33         seen = xcalloc(specs, 1);
  34
  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;
  44
  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);
  51 }
  52
  53 static void fill_directory(struct dir_struct *dir, const char **pathspec,
  54                 int ignored_too)
  55 {
  56         const char *path, *base;
  57         int baselen;
  58
  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         }
  65
  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);
  75
  76         /* Read the directory and prune it */
  77         read_directory(dir, path, base, baselen, pathspec);
  78         if (pathspec)
  79                 prune_directory(dir, pathspec, baselen);
  80 }
  81
  82 struct update_callback_data
  83 {
  84         int flags;
  85         int add_errors;
  86 };
  87
  88 static void update_callback(struct diff_queue_struct *q,
  89                             struct diff_options *opt, void *cbdata)
  90 {
  91         int i;
  92         struct update_callback_data *data = cbdata;
  93
  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 & ADD_FILES_VERBOSE)) {
 104                                 if (!(data->flags & ADD_FILES_IGNORE_ERRORS))
 105                                         die("updating files failed");
 106                                 data->add_errors++;
 107                         }
 108                         break;
 109                 case DIFF_STATUS_DELETED:
 110                         remove_file_from_cache(path);
 111                         if (data->flags & ADD_FILES_VERBOSE)
 112                                 printf("remove '%s'\n", path);
 113                         break;
 114                 }
 115         }
 116 }
 117
 118 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
 119 {
 120         struct update_callback_data data;
 121         struct rev_info rev;
 122         init_revisions(&rev, prefix);
 123         setup_revisions(0, NULL, &rev, NULL);
 124         rev.prune_data = pathspec;
 125         rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 126         rev.diffopt.format_callback = update_callback;
 127         data.flags = flags;
 128         data.add_errors = 0;
 129         rev.diffopt.format_callback_data = &data;
 130         run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
 131         return !!data.add_errors;
 132 }
 133
 134 static void refresh(int verbose, const char **pathspec)
 135 {
 136         char *seen;
 137         int i, specs;
 138
 139         for (specs = 0; pathspec[specs];  specs++)
 140                 /* nothing */;
 141         seen = xcalloc(specs, 1);
 142         if (read_cache() < 0)
 143                 die("index file corrupt");
 144         refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
 145         for (i = 0; i < specs; i++) {
 146                 if (!seen[i])
 147                         die("pathspec '%s' did not match any files", pathspec[i]);
 148         }
 149         free(seen);
 150 }
 151
 152 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 153 {
 154         const char **pathspec = get_pathspec(prefix, argv);
 155
 156         return pathspec;
 157 }
 158
 159 int interactive_add(int argc, const char **argv, const char *prefix)
 160 {
 161         int status, ac;
 162         const char **args;
 163         const char **pathspec = NULL;
 164
 165         if (argc) {
 166                 pathspec = validate_pathspec(argc, argv, prefix);
 167                 if (!pathspec)
 168                         return -1;
 169         }
 170
 171         args = xcalloc(sizeof(const char *), (argc + 4));
 172         ac = 0;
 173         args[ac++] = "add--interactive";
 174         if (patch_interactive)
 175                 args[ac++] = "--patch";
 176         args[ac++] = "--";
 177         if (argc) {
 178                 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
 179                 ac += argc;
 180         }
 181         args[ac] = NULL;
 182
 183         status = run_command_v_opt(args, RUN_GIT_CMD);
 184         free(args);
 185         return status;
 186 }
 187
 188 static struct lock_file lock_file;
 189
 190 static const char ignore_error[] =
 191 "The following paths are ignored by one of your .gitignore files:\n";
 192
 193 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 194 static int ignore_add_errors;
 195
 196 static struct option builtin_add_options[] = {
 197         OPT__DRY_RUN(&show_only),
 198         OPT__VERBOSE(&verbose),
 199         OPT_GROUP(""),
 200         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 201         OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
 202         OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
 203         OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
 204         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 205         OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
 206         OPT_END(),
 207 };
 208
 209 int cmd_add(int argc, const char **argv, const char *prefix)
 210 {
 211         int exit_status = 0;
 212         int i, newfd;
 213         const char **pathspec;
 214         struct dir_struct dir;
 215
 216         argc = parse_options(argc, argv, builtin_add_options,
 217                           builtin_add_usage, 0);
 218         if (patch_interactive)
 219                 add_interactive = 1;
 220         if (add_interactive)
 221                 exit(interactive_add(argc, argv, prefix));
 222
 223         git_config(git_default_config);
 224
 225         newfd = hold_locked_index(&lock_file, 1);
 226
 227         if (take_worktree_changes) {
 228                 int flags = 0;
 229                 const char **pathspec;
 230                 if (read_cache() < 0)
 231                         die("index file corrupt");
 232                 pathspec = get_pathspec(prefix, argv);
 233
 234                 if (verbose)
 235                         flags |= ADD_FILES_VERBOSE;
 236                 if (ignore_add_errors)
 237                         flags |= ADD_FILES_IGNORE_ERRORS;
 238
 239                 exit_status = add_files_to_cache(prefix, pathspec, flags);
 240                 goto finish;
 241         }
 242
 243         if (argc == 0) {
 244                 fprintf(stderr, "Nothing specified, nothing added.\n");
 245                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 246                 return 0;
 247         }
 248         pathspec = get_pathspec(prefix, argv);
 249
 250         if (refresh_only) {
 251                 refresh(verbose, pathspec);
 252                 goto finish;
 253         }
 254
 255         fill_directory(&dir, pathspec, ignored_too);
 256
 257         if (show_only) {
 258                 const char *sep = "", *eof = "";
 259                 for (i = 0; i < dir.nr; i++) {
 260                         printf("%s%s", sep, dir.entries[i]->name);
 261                         sep = " ";
 262                         eof = "\n";
 263                 }
 264                 fputs(eof, stdout);
 265                 return 0;
 266         }
 267
 268         if (read_cache() < 0)
 269                 die("index file corrupt");
 270
 271         if (dir.ignored_nr) {
 272                 fprintf(stderr, ignore_error);
 273                 for (i = 0; i < dir.ignored_nr; i++) {
 274                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
 275                 }
 276                 fprintf(stderr, "Use -f if you really want to add them.\n");
 277                 die("no files added");
 278         }
 279
 280         for (i = 0; i < dir.nr; i++)
 281                 if (add_file_to_cache(dir.entries[i]->name, verbose)) {
 282                         if (!ignore_add_errors)
 283                                 die("adding files failed");
 284                         exit_status = 1;
 285                 }
 286
 287  finish:
 288         if (active_cache_changed) {
 289                 if (write_cache(newfd, active_cache, active_nr) ||
 290                     commit_locked_index(&lock_file))
 291                         die("Unable to write new index file");
 292         }
 293
 294         return exit_status;
 295 }