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)) {
 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         }
 117 }
 118
 119 int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
 120 {
 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;
 133 }
 134
 135 static void refresh(int verbose, const char **pathspec)
 136 {
 137         char *seen;
 138         int i, specs;
 139
 140         for (specs = 0; pathspec[specs];  specs++)
 141                 /* nothing */;
 142         seen = xcalloc(specs, 1);
 143         refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
 144         for (i = 0; i < specs; i++) {
 145                 if (!seen[i])
 146                         die("pathspec '%s' did not match any files", pathspec[i]);
 147         }
 148         free(seen);
 149 }
 150
 151 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 152 {
 153         const char **pathspec = get_pathspec(prefix, argv);
 154
 155         return pathspec;
 156 }
 157
 158 int interactive_add(int argc, const char **argv, const char *prefix)
 159 {
 160         int status, ac;
 161         const char **args;
 162         const char **pathspec = NULL;
 163
 164         if (argc) {
 165                 pathspec = validate_pathspec(argc, argv, prefix);
 166                 if (!pathspec)
 167                         return -1;
 168         }
 169
 170         args = xcalloc(sizeof(const char *), (argc + 4));
 171         ac = 0;
 172         args[ac++] = "add--interactive";
 173         if (patch_interactive)
 174                 args[ac++] = "--patch";
 175         args[ac++] = "--";
 176         if (argc) {
 177                 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
 178                 ac += argc;
 179         }
 180         args[ac] = NULL;
 181
 182         status = run_command_v_opt(args, RUN_GIT_CMD);
 183         free(args);
 184         return status;
 185 }
 186
 187 static struct lock_file lock_file;
 188
 189 static const char ignore_error[] =
 190 "The following paths are ignored by one of your .gitignore files:\n";
 191
 192 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 193 static int ignore_add_errors;
 194
 195 static struct option builtin_add_options[] = {
 196         OPT__DRY_RUN(&show_only),
 197         OPT__VERBOSE(&verbose),
 198         OPT_GROUP(""),
 199         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 200         OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
 201         OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
 202         OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
 203         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 204         OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
 205         OPT_END(),
 206 };
 207
 208 static int add_config(const char *var, const char *value, void *cb)
 209 {
 210         if (!strcasecmp(var, "add.ignore-errors")) {
 211                 ignore_add_errors = git_config_bool(var, value);
 212                 return 0;
 213         }
 214         return git_default_config(var, value, cb);
 215 }
 216
 217 static int add_files(struct dir_struct *dir, int flags)
 218 {
 219         int i, exit_status = 0;
 220
 221         if (dir->ignored_nr) {
 222                 fprintf(stderr, ignore_error);
 223                 for (i = 0; i < dir->ignored_nr; i++)
 224                         fprintf(stderr, "%s\n", dir->ignored[i]->name);
 225                 fprintf(stderr, "Use -f if you really want to add them.\n");
 226                 die("no files added");
 227         }
 228
 229         for (i = 0; i < dir->nr; i++)
 230                 if (add_file_to_cache(dir->entries[i]->name, flags)) {
 231                         if (!ignore_add_errors)
 232                                 die("adding files failed");
 233                         exit_status = 1;
 234                 }
 235         return exit_status;
 236 }
 237
 238 int cmd_add(int argc, const char **argv, const char *prefix)
 239 {
 240         int exit_status = 0;
 241         int newfd;
 242         const char **pathspec;
 243         struct dir_struct dir;
 244         int flags;
 245         int add_new_files;
 246         int require_pathspec;
 247
 248         argc = parse_options(argc, argv, builtin_add_options,
 249                           builtin_add_usage, 0);
 250         if (patch_interactive)
 251                 add_interactive = 1;
 252         if (add_interactive)
 253                 exit(interactive_add(argc, argv, prefix));
 254
 255         git_config(add_config, NULL);
 256
 257         add_new_files = !take_worktree_changes && !refresh_only;
 258         require_pathspec = !take_worktree_changes;
 259
 260         newfd = hold_locked_index(&lock_file, 1);
 261
 262         flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
 263                  (show_only ? ADD_CACHE_PRETEND : 0) |
 264                  (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0));
 265
 266         if (require_pathspec && argc == 0) {
 267                 fprintf(stderr, "Nothing specified, nothing added.\n");
 268                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 269                 return 0;
 270         }
 271         pathspec = get_pathspec(prefix, argv);
 272
 273         /*
 274          * If we are adding new files, we need to scan the working
 275          * tree to find the ones that match pathspecs; this needs
 276          * to be done before we read the index.
 277          */
 278         if (add_new_files)
 279                 fill_directory(&dir, pathspec, ignored_too);
 280
 281         if (read_cache() < 0)
 282                 die("index file corrupt");
 283
 284         if (refresh_only) {
 285                 refresh(verbose, pathspec);
 286                 goto finish;
 287         }
 288
 289         if (take_worktree_changes)
 290                 exit_status |= add_files_to_cache(prefix, pathspec, flags);
 291
 292         if (add_new_files)
 293                 exit_status |= add_files(&dir, flags);
 294
 295  finish:
 296         if (active_cache_changed) {
 297                 if (write_cache(newfd, active_cache, active_nr) ||
 298                     commit_locked_index(&lock_file))
 299                         die("Unable to write new index file");
 300         }
 301
 302         return exit_status;
 303 }