builtin-add.con commit Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4 (6fb73e4)
   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] [--] <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 (!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                        if (verbose)
 106                                printf("remove '%s'\n", path);
 107                        break;
 108                }
 109        }
 110}
 111
 112static void update(int verbose, const char **files)
 113{
 114        struct rev_info rev;
 115        init_revisions(&rev, "");
 116        setup_revisions(0, NULL, &rev, NULL);
 117        rev.prune_data = get_pathspec(rev.prefix, files);
 118        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 119        rev.diffopt.format_callback = update_callback;
 120        rev.diffopt.format_callback_data = &verbose;
 121        if (read_cache() < 0)
 122                die("index file corrupt");
 123        run_diff_files(&rev, 0);
 124}
 125
 126static int git_add_config(const char *var, const char *value)
 127{
 128        if (!strcmp(var, "core.excludesfile")) {
 129                if (!value)
 130                        die("core.excludesfile without value");
 131                excludes_file = xstrdup(value);
 132                return 0;
 133        }
 134
 135        return git_default_config(var, value);
 136}
 137
 138static struct lock_file lock_file;
 139
 140static const char ignore_warning[] =
 141"The following paths are ignored by one of your .gitignore files:\n";
 142
 143int cmd_add(int argc, const char **argv, const char *prefix)
 144{
 145        int i, newfd;
 146        int verbose = 0, show_only = 0, ignored_too = 0;
 147        const char **pathspec;
 148        struct dir_struct dir;
 149        int add_interactive = 0;
 150
 151        for (i = 1; i < argc; i++) {
 152                if (!strcmp("--interactive", argv[i]) ||
 153                    !strcmp("-i", argv[i]))
 154                        add_interactive++;
 155        }
 156        if (add_interactive) {
 157                const char *args[] = { "add--interactive", NULL };
 158
 159                if (add_interactive != 1 || argc != 2)
 160                        die("add --interactive does not take any parameters");
 161                execv_git_cmd(args);
 162                exit(1);
 163        }
 164
 165        git_config(git_add_config);
 166
 167        newfd = hold_locked_index(&lock_file, 1);
 168
 169        for (i = 1; i < argc; i++) {
 170                const char *arg = argv[i];
 171
 172                if (arg[0] != '-')
 173                        break;
 174                if (!strcmp(arg, "--")) {
 175                        i++;
 176                        break;
 177                }
 178                if (!strcmp(arg, "-n")) {
 179                        show_only = 1;
 180                        continue;
 181                }
 182                if (!strcmp(arg, "-f")) {
 183                        ignored_too = 1;
 184                        continue;
 185                }
 186                if (!strcmp(arg, "-v")) {
 187                        verbose = 1;
 188                        continue;
 189                }
 190                if (!strcmp(arg, "-u")) {
 191                        take_worktree_changes = 1;
 192                        continue;
 193                }
 194                usage(builtin_add_usage);
 195        }
 196
 197        if (take_worktree_changes) {
 198                update(verbose, argv + i);
 199                goto finish;
 200        }
 201
 202        if (argc <= i) {
 203                fprintf(stderr, "Nothing specified, nothing added.\n");
 204                fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 205                return 0;
 206        }
 207        pathspec = get_pathspec(prefix, argv + i);
 208
 209        fill_directory(&dir, pathspec, ignored_too);
 210
 211        if (show_only) {
 212                const char *sep = "", *eof = "";
 213                for (i = 0; i < dir.nr; i++) {
 214                        printf("%s%s", sep, dir.entries[i]->name);
 215                        sep = " ";
 216                        eof = "\n";
 217                }
 218                fputs(eof, stdout);
 219                return 0;
 220        }
 221
 222        if (read_cache() < 0)
 223                die("index file corrupt");
 224
 225        if (dir.ignored_nr) {
 226                fprintf(stderr, ignore_warning);
 227                for (i = 0; i < dir.ignored_nr; i++) {
 228                        fprintf(stderr, "%s\n", dir.ignored[i]->name);
 229                }
 230                fprintf(stderr, "Use -f if you really want to add them.\n");
 231                exit(1);
 232        }
 233
 234        for (i = 0; i < dir.nr; i++)
 235                add_file_to_cache(dir.entries[i]->name, verbose);
 236
 237 finish:
 238        if (active_cache_changed) {
 239                if (write_cache(newfd, active_cache, active_nr) ||
 240                    close(newfd) || commit_locked_index(&lock_file))
 241                        die("Unable to write new index file");
 242        }
 243
 244        return 0;
 245}