Andrew's git - gitweb.git/blob

   1/*
   2 * "git add" builtin command
   3 *
   4 * Copyright (C) 2006 Linus Torvalds
   5 */
   6#include <fnmatch.h>
   7
   8#include "cache.h"
   9#include "builtin.h"
  10#include "dir.h"
  11#include "cache-tree.h"
  12
  13static const char builtin_add_usage[] =
  14"git-add [-n] [-v] <filepattern>...";
  15
  16static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
  17{
  18        char *seen;
  19        int i, specs;
  20        struct dir_entry **src, **dst;
  21
  22        for (specs = 0; pathspec[specs];  specs++)
  23                /* nothing */;
  24        seen = xcalloc(specs, 1);
  25
  26        src = dst = dir->entries;
  27        i = dir->nr;
  28        while (--i >= 0) {
  29                struct dir_entry *entry = *src++;
  30                if (!match_pathspec(pathspec, entry->name, entry->len, prefix, seen)) {
  31                        free(entry);
  32                        continue;
  33                }
  34                *dst++ = entry;
  35        }
  36        dir->nr = dst - dir->entries;
  37
  38        for (i = 0; i < specs; i++) {
  39                struct stat st;
  40                const char *match;
  41                if (seen[i])
  42                        continue;
  43
  44                /* Existing file? We must have ignored it */
  45                match = pathspec[i];
  46                if (!match[0] || !lstat(match, &st))
  47                        continue;
  48                die("pathspec '%s' did not match any files", match);
  49        }
  50}
  51
  52static void fill_directory(struct dir_struct *dir, const char **pathspec)
  53{
  54        const char *path, *base;
  55        int baselen;
  56
  57        /* Set up the default git porcelain excludes */
  58        memset(dir, 0, sizeof(*dir));
  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
  64        /*
  65         * Calculate common prefix for the pathspec, and
  66         * use that to optimize the directory walk
  67         */
  68        baselen = common_prefix(pathspec);
  69        path = ".";
  70        base = "";
  71        if (baselen) {
  72                char *common = xmalloc(baselen + 1);
  73                common = xmalloc(baselen + 1);
  74                memcpy(common, *pathspec, baselen);
  75                common[baselen] = 0;
  76                path = base = common;
  77        }
  78
  79        /* Read the directory and prune it */
  80        read_directory(dir, path, base, baselen);
  81        if (pathspec)
  82                prune_directory(dir, pathspec, baselen);
  83}
  84
  85static struct lock_file lock_file;
  86
  87int cmd_add(int argc, const char **argv, const char *prefix)
  88{
  89        int i, newfd;
  90        int verbose = 0, show_only = 0;
  91        const char **pathspec;
  92        struct dir_struct dir;
  93
  94        git_config(git_default_config);
  95
  96        newfd = hold_lock_file_for_update(&lock_file, get_index_file());
  97        if (newfd < 0)
  98                die("unable to create new index file");
  99
 100        if (read_cache() < 0)
 101                die("index file corrupt");
 102
 103        for (i = 1; i < argc; i++) {
 104                const char *arg = argv[i];
 105
 106                if (arg[0] != '-')
 107                        break;
 108                if (!strcmp(arg, "--")) {
 109                        i++;
 110                        break;
 111                }
 112                if (!strcmp(arg, "-n")) {
 113                        show_only = 1;
 114                        continue;
 115                }
 116                if (!strcmp(arg, "-v")) {
 117                        verbose = 1;
 118                        continue;
 119                }
 120                usage(builtin_add_usage);
 121        }
 122        pathspec = get_pathspec(prefix, argv + i);
 123
 124        fill_directory(&dir, pathspec);
 125
 126        if (show_only) {
 127                const char *sep = "", *eof = "";
 128                for (i = 0; i < dir.nr; i++) {
 129                        printf("%s%s", sep, dir.entries[i]->name);
 130                        sep = " ";
 131                        eof = "\n";
 132                }
 133                fputs(eof, stdout);
 134                return 0;
 135        }
 136
 137        for (i = 0; i < dir.nr; i++)
 138                add_file_to_index(dir.entries[i]->name, verbose);
 139
 140        if (active_cache_changed) {
 141                if (write_cache(newfd, active_cache, active_nr) ||
 142                    close(newfd) || commit_lock_file(&lock_file))
 143                        die("Unable to write new index file");
 144        }
 145
 146        return 0;
 147}