Andrew's git / gitweb.git / builtin-add.c
?
builtin-add.con commit git apply --directory broken for new files (969c877)
   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
  18static const char * const builtin_add_usage[] = {
  19        "git add [options] [--] <filepattern>...",
  20        NULL
  21};
  22static int patch_interactive = 0, add_interactive = 0;
  23static int take_worktree_changes;
  24
  25static 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
  53static 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
  82struct update_callback_data
  83{
  84        int flags;
  85        int add_errors;
  86};
  87
  88static 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
 119int 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
 135static 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 ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
 144                      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
 152static 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
 159int 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
 188static struct lock_file lock_file;
 189
 190static const char ignore_error[] =
 191"The following paths are ignored by one of your .gitignore files:\n";
 192
 193static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 194static int ignore_add_errors, addremove;
 195
 196static 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', "force", &ignored_too, "allow adding otherwise ignored files"),
 203        OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
 204        OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"),
 205        OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
 206        OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"),
 207        OPT_END(),
 208};
 209
 210static int add_config(const char *var, const char *value, void *cb)
 211{
 212        if (!strcasecmp(var, "add.ignore-errors")) {
 213                ignore_add_errors = git_config_bool(var, value);
 214                return 0;
 215        }
 216        return git_default_config(var, value, cb);
 217}
 218
 219static int add_files(struct dir_struct *dir, int flags)
 220{
 221        int i, exit_status = 0;
 222
 223        if (dir->ignored_nr) {
 224                fprintf(stderr, ignore_error);
 225                for (i = 0; i < dir->ignored_nr; i++)
 226                        fprintf(stderr, "%s\n", dir->ignored[i]->name);
 227                fprintf(stderr, "Use -f if you really want to add them.\n");
 228                die("no files added");
 229        }
 230
 231        for (i = 0; i < dir->nr; i++)
 232                if (add_file_to_cache(dir->entries[i]->name, flags)) {
 233                        if (!ignore_add_errors)
 234                                die("adding files failed");
 235                        exit_status = 1;
 236                }
 237        return exit_status;
 238}
 239
 240int cmd_add(int argc, const char **argv, const char *prefix)
 241{
 242        int exit_status = 0;
 243        int newfd;
 244        const char **pathspec;
 245        struct dir_struct dir;
 246        int flags;
 247        int add_new_files;
 248        int require_pathspec;
 249
 250        argc = parse_options(argc, argv, builtin_add_options,
 251                          builtin_add_usage, 0);
 252        if (patch_interactive)
 253                add_interactive = 1;
 254        if (add_interactive)
 255                exit(interactive_add(argc, argv, prefix));
 256
 257        git_config(add_config, NULL);
 258
 259        if (addremove && take_worktree_changes)
 260                die("-A and -u are mutually incompatible");
 261        if (addremove && !argc) {
 262                static const char *here[2] = { ".", NULL };
 263                argc = 1;
 264                argv = here;
 265        }
 266
 267        add_new_files = !take_worktree_changes && !refresh_only;
 268        require_pathspec = !take_worktree_changes;
 269
 270        newfd = hold_locked_index(&lock_file, 1);
 271
 272        flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
 273                 (show_only ? ADD_CACHE_PRETEND : 0) |
 274                 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0));
 275
 276        if (require_pathspec && argc == 0) {
 277                fprintf(stderr, "Nothing specified, nothing added.\n");
 278                fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 279                return 0;
 280        }
 281        pathspec = get_pathspec(prefix, argv);
 282
 283        /*
 284         * If we are adding new files, we need to scan the working
 285         * tree to find the ones that match pathspecs; this needs
 286         * to be done before we read the index.
 287         */
 288        if (add_new_files)
 289                fill_directory(&dir, pathspec, ignored_too);
 290
 291        if (read_cache() < 0)
 292                die("index file corrupt");
 293
 294        if (refresh_only) {
 295                refresh(verbose, pathspec);
 296                goto finish;
 297        }
 298
 299        if (take_worktree_changes || addremove)
 300                exit_status |= add_files_to_cache(prefix, pathspec, flags);
 301
 302        if (add_new_files)
 303                exit_status |= add_files(&dir, flags);
 304
 305 finish:
 306        if (active_cache_changed) {
 307                if (write_cache(newfd, active_cache, active_nr) ||
 308                    commit_locked_index(&lock_file))
 309                        die("Unable to write new index file");
 310        }
 311
 312        return exit_status;
 313}