Andrew's git - gitweb.git/blob

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