git.oblomov.eu Git - git/blob - 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
  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 **files)
 109 {
 110         struct rev_info rev;
 111         init_revisions(&rev, prefix);
 112         setup_revisions(0, NULL, &rev, NULL);
 113         rev.prune_data = get_pathspec(prefix, files);
 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 int interactive_add(void)
 139 {
 140         const char *argv[2] = { "add--interactive", NULL };
 141
 142         return run_command_v_opt(argv, RUN_GIT_CMD);
 143 }
 144
 145 static struct lock_file lock_file;
 146
 147 static const char ignore_error[] =
 148 "The following paths are ignored by one of your .gitignore files:\n";
 149
 150 static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 151 static int add_interactive = 0;
 152
 153 static struct option builtin_add_options[] = {
 154         OPT__DRY_RUN(&show_only),
 155         OPT__VERBOSE(&verbose),
 156         OPT_GROUP(""),
 157         OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 158         OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
 159         OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
 160         OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 161         OPT_END(),
 162 };
 163
 164 int cmd_add(int argc, const char **argv, const char *prefix)
 165 {
 166         int i, newfd, orig_argc = argc;
 167         const char **pathspec;
 168         struct dir_struct dir;
 169
 170         argc = parse_options(argc, argv, builtin_add_options,
 171                           builtin_add_usage, 0);
 172         if (add_interactive) {
 173                 if (add_interactive != 1 || orig_argc != 2)
 174                         die("add --interactive does not take any parameters");
 175                 exit(interactive_add());
 176         }
 177
 178         git_config(git_default_config);
 179
 180         newfd = hold_locked_index(&lock_file, 1);
 181
 182         if (take_worktree_changes) {
 183                 if (read_cache() < 0)
 184                         die("index file corrupt");
 185                 add_files_to_cache(verbose, prefix, argv);
 186                 goto finish;
 187         }
 188
 189         if (argc == 0) {
 190                 fprintf(stderr, "Nothing specified, nothing added.\n");
 191                 fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 192                 return 0;
 193         }
 194         pathspec = get_pathspec(prefix, argv);
 195
 196         if (refresh_only) {
 197                 refresh(verbose, pathspec);
 198                 goto finish;
 199         }
 200
 201         fill_directory(&dir, pathspec, ignored_too);
 202
 203         if (show_only) {
 204                 const char *sep = "", *eof = "";
 205                 for (i = 0; i < dir.nr; i++) {
 206                         printf("%s%s", sep, dir.entries[i]->name);
 207                         sep = " ";
 208                         eof = "\n";
 209                 }
 210                 fputs(eof, stdout);
 211                 return 0;
 212         }
 213
 214         if (read_cache() < 0)
 215                 die("index file corrupt");
 216
 217         if (dir.ignored_nr) {
 218                 fprintf(stderr, ignore_error);
 219                 for (i = 0; i < dir.ignored_nr; i++) {
 220                         fprintf(stderr, "%s\n", dir.ignored[i]->name);
 221                 }
 222                 fprintf(stderr, "Use -f if you really want to add them.\n");
 223                 die("no files added");
 224         }
 225
 226         for (i = 0; i < dir.nr; i++)
 227                 add_file_to_cache(dir.entries[i]->name, verbose);
 228
 229  finish:
 230         if (active_cache_changed) {
 231                 if (write_cache(newfd, active_cache, active_nr) ||
 232                     close(newfd) || commit_locked_index(&lock_file))
 233                         die("Unable to write new index file");
 234         }
 235
 236         return 0;
 237 }