Andrew's git - gitweb.git/blob

   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 "run-command.h"
  12#include "parse-options.h"
  13#include "diff.h"
  14#include "revision.h"
  15
  16static const char * const builtin_add_usage[] = {
  17        "git add [options] [--] <filepattern>...",
  18        NULL
  19};
  20static int patch_interactive, add_interactive, edit_interactive;
  21static int take_worktree_changes;
  22
  23static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
  24{
  25        int num_unmatched = 0, i;
  26
  27        /*
  28         * Since we are walking the index as if we were walking the directory,
  29         * we have to mark the matched pathspec as seen; otherwise we will
  30         * mistakenly think that the user gave a pathspec that did not match
  31         * anything.
  32         */
  33        for (i = 0; i < specs; i++)
  34                if (!seen[i])
  35                        num_unmatched++;
  36        if (!num_unmatched)
  37                return;
  38        for (i = 0; i < active_nr; i++) {
  39                struct cache_entry *ce = active_cache[i];
  40                match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
  41        }
  42}
  43
  44static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
  45{
  46        char *seen;
  47        int i, specs;
  48        struct dir_entry **src, **dst;
  49
  50        for (specs = 0; pathspec[specs];  specs++)
  51                /* nothing */;
  52        seen = xcalloc(specs, 1);
  53
  54        src = dst = dir->entries;
  55        i = dir->nr;
  56        while (--i >= 0) {
  57                struct dir_entry *entry = *src++;
  58                if (match_pathspec(pathspec, entry->name, entry->len,
  59                                   prefix, seen))
  60                        *dst++ = entry;
  61        }
  62        dir->nr = dst - dir->entries;
  63        fill_pathspec_matches(pathspec, seen, specs);
  64
  65        for (i = 0; i < specs; i++) {
  66                if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
  67                        die("pathspec '%s' did not match any files",
  68                                        pathspec[i]);
  69        }
  70        free(seen);
  71}
  72
  73static void treat_gitlinks(const char **pathspec)
  74{
  75        int i;
  76
  77        if (!pathspec || !*pathspec)
  78                return;
  79
  80        for (i = 0; i < active_nr; i++) {
  81                struct cache_entry *ce = active_cache[i];
  82                if (S_ISGITLINK(ce->ce_mode)) {
  83                        int len = ce_namelen(ce), j;
  84                        for (j = 0; pathspec[j]; j++) {
  85                                int len2 = strlen(pathspec[j]);
  86                                if (len2 <= len || pathspec[j][len] != '/' ||
  87                                    memcmp(ce->name, pathspec[j], len))
  88                                        continue;
  89                                if (len2 == len + 1)
  90                                        /* strip trailing slash */
  91                                        pathspec[j] = xstrndup(ce->name, len);
  92                                else
  93                                        die ("Path '%s' is in submodule '%.*s'",
  94                                                pathspec[j], len, ce->name);
  95                        }
  96                }
  97        }
  98}
  99
 100static void refresh(int verbose, const char **pathspec)
 101{
 102        char *seen;
 103        int i, specs;
 104
 105        for (specs = 0; pathspec[specs];  specs++)
 106                /* nothing */;
 107        seen = xcalloc(specs, 1);
 108        refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
 109                      pathspec, seen);
 110        for (i = 0; i < specs; i++) {
 111                if (!seen[i])
 112                        die("pathspec '%s' did not match any files", pathspec[i]);
 113        }
 114        free(seen);
 115}
 116
 117static const char **validate_pathspec(int argc, const char **argv, const char *prefix)
 118{
 119        const char **pathspec = get_pathspec(prefix, argv);
 120
 121        if (pathspec) {
 122                const char **p;
 123                for (p = pathspec; *p; p++) {
 124                        if (has_symlink_leading_path(*p, strlen(*p))) {
 125                                int len = prefix ? strlen(prefix) : 0;
 126                                die("'%s' is beyond a symbolic link", *p + len);
 127                        }
 128                }
 129        }
 130
 131        return pathspec;
 132}
 133
 134int interactive_add(int argc, const char **argv, const char *prefix)
 135{
 136        int status, ac;
 137        const char **args;
 138        const char **pathspec = NULL;
 139
 140        if (argc) {
 141                pathspec = validate_pathspec(argc, argv, prefix);
 142                if (!pathspec)
 143                        return -1;
 144        }
 145
 146        args = xcalloc(sizeof(const char *), (argc + 4));
 147        ac = 0;
 148        args[ac++] = "add--interactive";
 149        if (patch_interactive)
 150                args[ac++] = "--patch";
 151        args[ac++] = "--";
 152        if (argc) {
 153                memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
 154                ac += argc;
 155        }
 156        args[ac] = NULL;
 157
 158        status = run_command_v_opt(args, RUN_GIT_CMD);
 159        free(args);
 160        return status;
 161}
 162
 163static int edit_patch(int argc, const char **argv, const char *prefix)
 164{
 165        char *file = xstrdup(git_path("ADD_EDIT.patch"));
 166        const char *apply_argv[] = { "apply", "--recount", "--cached",
 167                file, NULL };
 168        struct child_process child;
 169        struct rev_info rev;
 170        int out;
 171        struct stat st;
 172
 173        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 174
 175        if (read_cache() < 0)
 176                die ("Could not read the index");
 177
 178        init_revisions(&rev, prefix);
 179        rev.diffopt.context = 7;
 180
 181        argc = setup_revisions(argc, argv, &rev, NULL);
 182        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 183        out = open(file, O_CREAT | O_WRONLY, 0644);
 184        if (out < 0)
 185                die ("Could not open '%s' for writing.", file);
 186        rev.diffopt.file = fdopen(out, "w");
 187        rev.diffopt.close_file = 1;
 188        if (run_diff_files(&rev, 0))
 189                die ("Could not write patch");
 190
 191        launch_editor(file, NULL, NULL);
 192
 193        if (stat(file, &st))
 194                die_errno("Could not stat '%s'", file);
 195        if (!st.st_size)
 196                die("Empty patch. Aborted.");
 197
 198        memset(&child, 0, sizeof(child));
 199        child.git_cmd = 1;
 200        child.argv = apply_argv;
 201        if (run_command(&child))
 202                die ("Could not apply '%s'", file);
 203
 204        unlink(file);
 205        return 0;
 206}
 207
 208static struct lock_file lock_file;
 209
 210static const char ignore_error[] =
 211"The following paths are ignored by one of your .gitignore files:\n";
 212
 213static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 214static int ignore_add_errors, addremove, intent_to_add;
 215
 216static struct option builtin_add_options[] = {
 217        OPT__DRY_RUN(&show_only),
 218        OPT__VERBOSE(&verbose),
 219        OPT_GROUP(""),
 220        OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
 221        OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
 222        OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
 223        OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"),
 224        OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
 225        OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"),
 226        OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
 227        OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 228        OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
 229        OPT_END(),
 230};
 231
 232static int add_config(const char *var, const char *value, void *cb)
 233{
 234        if (!strcasecmp(var, "add.ignore-errors")) {
 235                ignore_add_errors = git_config_bool(var, value);
 236                return 0;
 237        }
 238        return git_default_config(var, value, cb);
 239}
 240
 241static int add_files(struct dir_struct *dir, int flags)
 242{
 243        int i, exit_status = 0;
 244
 245        if (dir->ignored_nr) {
 246                fprintf(stderr, ignore_error);
 247                for (i = 0; i < dir->ignored_nr; i++)
 248                        fprintf(stderr, "%s\n", dir->ignored[i]->name);
 249                fprintf(stderr, "Use -f if you really want to add them.\n");
 250                die("no files added");
 251        }
 252
 253        for (i = 0; i < dir->nr; i++)
 254                if (add_file_to_cache(dir->entries[i]->name, flags)) {
 255                        if (!ignore_add_errors)
 256                                die("adding files failed");
 257                        exit_status = 1;
 258                }
 259        return exit_status;
 260}
 261
 262int cmd_add(int argc, const char **argv, const char *prefix)
 263{
 264        int exit_status = 0;
 265        int newfd;
 266        const char **pathspec;
 267        struct dir_struct dir;
 268        int flags;
 269        int add_new_files;
 270        int require_pathspec;
 271
 272        git_config(add_config, NULL);
 273
 274        argc = parse_options(argc, argv, prefix, builtin_add_options,
 275                          builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
 276        if (patch_interactive)
 277                add_interactive = 1;
 278        if (add_interactive)
 279                exit(interactive_add(argc - 1, argv + 1, prefix));
 280
 281        if (edit_interactive)
 282                return(edit_patch(argc, argv, prefix));
 283        argc--;
 284        argv++;
 285
 286        if (addremove && take_worktree_changes)
 287                die("-A and -u are mutually incompatible");
 288        if ((addremove || take_worktree_changes) && !argc) {
 289                static const char *here[2] = { ".", NULL };
 290                argc = 1;
 291                argv = here;
 292        }
 293
 294        add_new_files = !take_worktree_changes && !refresh_only;
 295        require_pathspec = !take_worktree_changes;
 296
 297        newfd = hold_locked_index(&lock_file, 1);
 298
 299        flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
 300                 (show_only ? ADD_CACHE_PRETEND : 0) |
 301                 (intent_to_add ? ADD_CACHE_INTENT : 0) |
 302                 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
 303                 (!(addremove || take_worktree_changes)
 304                  ? ADD_CACHE_IGNORE_REMOVAL : 0));
 305
 306        if (require_pathspec && argc == 0) {
 307                fprintf(stderr, "Nothing specified, nothing added.\n");
 308                fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 309                return 0;
 310        }
 311        pathspec = validate_pathspec(argc, argv, prefix);
 312
 313        if (read_cache() < 0)
 314                die("index file corrupt");
 315        treat_gitlinks(pathspec);
 316
 317        if (add_new_files) {
 318                int baselen;
 319
 320                /* Set up the default git porcelain excludes */
 321                memset(&dir, 0, sizeof(dir));
 322                if (!ignored_too) {
 323                        dir.flags |= DIR_COLLECT_IGNORED;
 324                        setup_standard_excludes(&dir);
 325                }
 326
 327                /* This picks up the paths that are not tracked */
 328                baselen = fill_directory(&dir, pathspec);
 329                if (pathspec)
 330                        prune_directory(&dir, pathspec, baselen);
 331        }
 332
 333        if (refresh_only) {
 334                refresh(verbose, pathspec);
 335                goto finish;
 336        }
 337
 338        exit_status |= add_files_to_cache(prefix, pathspec, flags);
 339
 340        if (add_new_files)
 341                exit_status |= add_files(&dir, flags);
 342
 343 finish:
 344        if (active_cache_changed) {
 345                if (write_cache(newfd, active_cache, active_nr) ||
 346                    commit_locked_index(&lock_file))
 347                        die("Unable to write new index file");
 348        }
 349
 350        return exit_status;
 351}