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 "diff.h"
  12#include "diffcore.h"
  13#include "commit.h"
  14#include "revision.h"
  15
  16static const char builtin_add_usage[] =
  17"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>...";
  18
  19static int take_worktree_changes;
  20static const char *excludes_file;
  21
  22static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
  23{
  24        char *seen;
  25        int i, specs;
  26        struct dir_entry **src, **dst;
  27
  28        for (specs = 0; pathspec[specs];  specs++)
  29                /* nothing */;
  30        seen = xcalloc(specs, 1);
  31
  32        src = dst = dir->entries;
  33        i = dir->nr;
  34        while (--i >= 0) {
  35                struct dir_entry *entry = *src++;
  36                if (match_pathspec(pathspec, entry->name, entry->len,
  37                                   prefix, seen))
  38                        *dst++ = entry;
  39        }
  40        dir->nr = dst - dir->entries;
  41
  42        for (i = 0; i < specs; i++) {
  43                if (!seen[i] && !file_exists(pathspec[i]))
  44                        die("pathspec '%s' did not match any files",
  45                                        pathspec[i]);
  46        }
  47}
  48
  49static void fill_directory(struct dir_struct *dir, const char **pathspec,
  50                int ignored_too)
  51{
  52        const char *path, *base;
  53        int baselen;
  54
  55        /* Set up the default git porcelain excludes */
  56        memset(dir, 0, sizeof(*dir));
  57        if (!ignored_too) {
  58                dir->collect_ignored = 1;
  59                dir->exclude_per_dir = ".gitignore";
  60                path = git_path("info/exclude");
  61                if (!access(path, R_OK))
  62                        add_excludes_from_file(dir, path);
  63                if (excludes_file != NULL && !access(excludes_file, R_OK))
  64                        add_excludes_from_file(dir, excludes_file);
  65        }
  66
  67        /*
  68         * Calculate common prefix for the pathspec, and
  69         * use that to optimize the directory walk
  70         */
  71        baselen = common_prefix(pathspec);
  72        path = ".";
  73        base = "";
  74        if (baselen) {
  75                char *common = xmalloc(baselen + 1);
  76                memcpy(common, *pathspec, baselen);
  77                common[baselen] = 0;
  78                path = base = common;
  79        }
  80
  81        /* Read the directory and prune it */
  82        read_directory(dir, path, base, baselen, pathspec);
  83        if (pathspec)
  84                prune_directory(dir, pathspec, baselen);
  85}
  86
  87static void update_callback(struct diff_queue_struct *q,
  88                            struct diff_options *opt, void *cbdata)
  89{
  90        int i, verbose;
  91
  92        verbose = *((int *)cbdata);
  93        for (i = 0; i < q->nr; i++) {
  94                struct diff_filepair *p = q->queue[i];
  95                const char *path = p->one->path;
  96                switch (p->status) {
  97                default:
  98                        die("unexpacted diff status %c", p->status);
  99                case DIFF_STATUS_UNMERGED:
 100                case DIFF_STATUS_MODIFIED:
 101                        add_file_to_cache(path, verbose);
 102                        break;
 103                case DIFF_STATUS_DELETED:
 104                        remove_file_from_cache(path);
 105                        cache_tree_invalidate_path(active_cache_tree, path);
 106                        if (verbose)
 107                                printf("remove '%s'\n", path);
 108                        break;
 109                }
 110        }
 111}
 112
 113static void update(int verbose, const char *prefix, const char **files)
 114{
 115        struct rev_info rev;
 116        init_revisions(&rev, prefix);
 117        setup_revisions(0, NULL, &rev, NULL);
 118        rev.prune_data = get_pathspec(prefix, files);
 119        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 120        rev.diffopt.format_callback = update_callback;
 121        rev.diffopt.format_callback_data = &verbose;
 122        if (read_cache() < 0)
 123                die("index file corrupt");
 124        run_diff_files(&rev, 0);
 125}
 126
 127static void refresh(int verbose, const char **pathspec)
 128{
 129        char *seen;
 130        int i, specs;
 131
 132        for (specs = 0; pathspec[specs];  specs++)
 133                /* nothing */;
 134        seen = xcalloc(specs, 1);
 135        if (read_cache() < 0)
 136                die("index file corrupt");
 137        refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
 138        for (i = 0; i < specs; i++) {
 139                if (!seen[i])
 140                        die("pathspec '%s' did not match any files", pathspec[i]);
 141        }
 142}
 143
 144static int git_add_config(const char *var, const char *value)
 145{
 146        if (!strcmp(var, "core.excludesfile")) {
 147                if (!value)
 148                        die("core.excludesfile without value");
 149                excludes_file = xstrdup(value);
 150                return 0;
 151        }
 152
 153        return git_default_config(var, value);
 154}
 155
 156static struct lock_file lock_file;
 157
 158static const char ignore_error[] =
 159"The following paths are ignored by one of your .gitignore files:\n";
 160
 161int cmd_add(int argc, const char **argv, const char *prefix)
 162{
 163        int i, newfd;
 164        int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
 165        const char **pathspec;
 166        struct dir_struct dir;
 167        int add_interactive = 0;
 168
 169        for (i = 1; i < argc; i++) {
 170                if (!strcmp("--interactive", argv[i]) ||
 171                    !strcmp("-i", argv[i]))
 172                        add_interactive++;
 173        }
 174        if (add_interactive) {
 175                const char *args[] = { "add--interactive", NULL };
 176
 177                if (add_interactive != 1 || argc != 2)
 178                        die("add --interactive does not take any parameters");
 179                execv_git_cmd(args);
 180                exit(1);
 181        }
 182
 183        git_config(git_add_config);
 184
 185        newfd = hold_locked_index(&lock_file, 1);
 186
 187        for (i = 1; i < argc; i++) {
 188                const char *arg = argv[i];
 189
 190                if (arg[0] != '-')
 191                        break;
 192                if (!strcmp(arg, "--")) {
 193                        i++;
 194                        break;
 195                }
 196                if (!strcmp(arg, "-n")) {
 197                        show_only = 1;
 198                        continue;
 199                }
 200                if (!strcmp(arg, "-f")) {
 201                        ignored_too = 1;
 202                        continue;
 203                }
 204                if (!strcmp(arg, "-v")) {
 205                        verbose = 1;
 206                        continue;
 207                }
 208                if (!strcmp(arg, "-u")) {
 209                        take_worktree_changes = 1;
 210                        continue;
 211                }
 212                if (!strcmp(arg, "--refresh")) {
 213                        refresh_only = 1;
 214                        continue;
 215                }
 216                usage(builtin_add_usage);
 217        }
 218
 219        if (take_worktree_changes) {
 220                update(verbose, prefix, argv + i);
 221                goto finish;
 222        }
 223
 224        if (argc <= i) {
 225                fprintf(stderr, "Nothing specified, nothing added.\n");
 226                fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 227                return 0;
 228        }
 229        pathspec = get_pathspec(prefix, argv + i);
 230
 231        if (refresh_only) {
 232                refresh(verbose, pathspec);
 233                goto finish;
 234        }
 235
 236        fill_directory(&dir, pathspec, ignored_too);
 237
 238        if (show_only) {
 239                const char *sep = "", *eof = "";
 240                for (i = 0; i < dir.nr; i++) {
 241                        printf("%s%s", sep, dir.entries[i]->name);
 242                        sep = " ";
 243                        eof = "\n";
 244                }
 245                fputs(eof, stdout);
 246                return 0;
 247        }
 248
 249        if (read_cache() < 0)
 250                die("index file corrupt");
 251
 252        if (dir.ignored_nr) {
 253                fprintf(stderr, ignore_error);
 254                for (i = 0; i < dir.ignored_nr; i++) {
 255                        fprintf(stderr, "%s\n", dir.ignored[i]->name);
 256                }
 257                fprintf(stderr, "Use -f if you really want to add them.\n");
 258                die("no files added");
 259        }
 260
 261        for (i = 0; i < dir.nr; i++)
 262                add_file_to_cache(dir.entries[i]->name, verbose);
 263
 264 finish:
 265        if (active_cache_changed) {
 266                if (write_cache(newfd, active_cache, active_nr) ||
 267                    close(newfd) || commit_locked_index(&lock_file))
 268                        die("Unable to write new index file");
 269        }
 270
 271        return 0;
 272}