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