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 static void update_callback(struct diff_queue_struct *q,
  83                             struct diff_options *opt, void *cbdata)
  84 {
  85         int i, verbose;
  86
  87         verbose = *((int *)cbdata);
  88         for (i = 0; i < q->nr; i++) {
  89                 struct diff_filepair *p = q->queue[i];
  90                 const char *path = p->one->path;
  91                 switch (p->status) {
  92                 default:
  93                         die("unexpected diff status %c", p->status);
  94                 case DIFF_STATUS_UNMERGED:
  95                 case DIFF_STATUS_MODIFIED:
  96                 case DIFF_STATUS_TYPE_CHANGED:
  97                         add_file_to_cache(path, verbose);
  98                         break;
  99                 case DIFF_STATUS_DELETED:
 100                         remove_file_from_cache(path);
 101                         if (verbose)
 102                                 printf("remove '%s'\n", path);
 103                         break;
 104                 }
 105         }
 106 }
 107
 108 void add_files_to_cache(int verbose, const char *prefix, const char **pathspec)
 109 {
 110         struct rev_info rev;
 111         init_revisions(&rev, prefix);
 112         setup_revisions(0, NULL, &rev, NULL);
 113         rev.prune_data = pathspec;
 114         rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 115         rev.diffopt.format_callback = update_callback;
 116         rev.diffopt.format_callback_data = &verbose;
 117         run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
 118 }
 119
 120 static void refresh(int verbose, const char **pathspec)
 121 {
 122         char *seen;
 123         int i, specs;
 124
 125         for (specs = 0; pathspec[specs];  specs++)
 126                 /* nothing */;
 127         seen = xcalloc(specs, 1);
 128         if (read_cache() < 0)
 129                 die("index file corrupt");
 130         refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
 131         for (i = 0; i < specs; i++) {
 132                 if (!seen[i])
 133                         die("pathspec '%s' did not match any files", pathspec[i]);
 134         }
 135         free(seen);
 136 }
 137
 138 static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 139 {
 140         const char **pathspec = get_pathspec(prefix, argv);
 141
 142         return pathspec;
 143 }
 144
 145 int interactive_add(int argc, const char **argv, const char *prefix)
 146 {
 147         int status, ac;
 148         const char **args;
 149         const char **pathspec = NULL;
 150
 151         if (argc) {
 152                 pathspec = validate_pathspec(argc, argv, prefix);
 153                 if (!pathspec)
 154                         return -1;
 155         }
 156
 157         args = xcalloc(sizeof(const char *), (argc + 4));
 158         ac = 0;
 159         args[ac++] = "add--interactive";
 160         if (patch_interactive)
 161                 args[ac++] = "--patch";
 162         args[ac++] = "--";
 163         if (argc) {
 164                 memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
 165                 ac += argc;
 166         }
 167         args[ac] = NULL;
 168
 169         status = run_command_v_opt(args, RUN_GIT_CMD);
 170         free(args);
 171         return status;
 172 }
 173
 174 static struct lock_file lock_file;
 175
 176 static const char ignore_error[] =
 177 "The following paths are ignored by one of your .gitignore files:\n";
 178
 179 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 180
 181 static struct option builtin_add_options[] = {
 182         OPT__DRY_RUN(&show_only),
 183         OPT__VERBOSE(&verbose),
 184         OPT_GROUP(""),
 185         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 186         OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
 187         OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
 188         OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
 189         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 190         OPT_END(),
 191 };
 192
 193 int cmd_add(int argc, const char **argv, const char *prefix)
 194 {
 195         int i, newfd;
 196         const char **pathspec;
 197         struct dir_struct dir;
 198
 199         argc = parse_options(argc, argv, builtin_add_options,
 200                           builtin_add_usage, 0);
 201         if (patch_interactive)
 202                 add_interactive = 1;
 203         if (add_interactive)
 204                 exit(interactive_add(argc, argv, prefix));
 205
 206         git_config(git_default_config);
 207
 208         newfd = hold_locked_index(&lock_file, 1);
 209
 210         if (take_worktree_changes) {
 211                 const char **pathspec;
 212                 if (read_cache() < 0)
 213                         die("index file corrupt");
 214                 pathspec = get_pathspec(prefix, argv);
 215                 add_files_to_cache(verbose, prefix, pathspec);
 216                 goto finish;
 217         }
 218
 219         if (argc == 0) {
 220                 fprintf(stderr, "Nothing specified, nothing added.\n");
 221                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 222                 return 0;
 223         }
 224         pathspec = get_pathspec(prefix, argv);
 225
 226         if (refresh_only) {
 227                 refresh(verbose, pathspec);
 228                 goto finish;
 229         }
 230
 231         fill_directory(&dir, pathspec, ignored_too);
 232
 233         if (show_only) {
 234                 const char *sep = "", *eof = "";
 235                 for (i = 0; i < dir.nr; i++) {
 236                         printf("%s%s", sep, dir.entries[i]->name);
 237                         sep = " ";
 238                         eof = "\n";
 239                 }
 240                 fputs(eof, stdout);
 241                 return 0;
 242         }
 243
 244         if (read_cache() < 0)
 245                 die("index file corrupt");
 246
 247         if (dir.ignored_nr) {
 248                 fprintf(stderr, ignore_error);
 249                 for (i = 0; i < dir.ignored_nr; i++) {
 250                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
 251                 }
 252                 fprintf(stderr, "Use -f if you really want to add them.\n");
 253                 die("no files added");
 254         }
 255
 256         for (i = 0; i < dir.nr; i++)
 257                 add_file_to_cache(dir.entries[i]->name, verbose);
 258
 259  finish:
 260         if (active_cache_changed) {
 261                 if (write_cache(newfd, active_cache, active_nr) ||
 262                     commit_locked_index(&lock_file))
 263                         die("Unable to write new index file");
 264         }
 265
 266         return 0;
 267 }