xdiff: add xdl_merge()
[git/dscho.git] / builtin-add.c
blobfebb75ed994b5edc51afc60e2d46483fa9e273f2
1 /*
2 * "git add" builtin command
4 * Copyright (C) 2006 Linus Torvalds
5 */
6 #include <fnmatch.h>
8 #include "cache.h"
9 #include "builtin.h"
10 #include "dir.h"
11 #include "cache-tree.h"
13 static const char builtin_add_usage[] =
14 "git-add [-n] [-v] <filepattern>...";
16 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
18 char *seen;
19 int i, specs;
20 struct dir_entry **src, **dst;
22 for (specs = 0; pathspec[specs]; specs++)
23 /* nothing */;
24 seen = xcalloc(specs, 1);
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;
34 *dst++ = entry;
36 dir->nr = dst - dir->entries;
38 for (i = 0; i < specs; i++) {
39 struct stat st;
40 const char *match;
41 if (seen[i])
42 continue;
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);
52 static void fill_directory(struct dir_struct *dir, const char **pathspec)
54 const char *path, *base;
55 int baselen;
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);
65 * Calculate common prefix for the pathspec, and
66 * use that to optimize the directory walk
68 baselen = common_prefix(pathspec);
69 path = ".";
70 base = "";
71 if (baselen) {
72 char *common = xmalloc(baselen + 1);
73 memcpy(common, *pathspec, baselen);
74 common[baselen] = 0;
75 path = base = common;
78 /* Read the directory and prune it */
79 read_directory(dir, path, base, baselen);
80 if (pathspec)
81 prune_directory(dir, pathspec, baselen);
84 static struct lock_file lock_file;
86 int cmd_add(int argc, const char **argv, const char *prefix)
88 int i, newfd;
89 int verbose = 0, show_only = 0;
90 const char **pathspec;
91 struct dir_struct dir;
93 git_config(git_default_config);
95 newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
97 if (read_cache() < 0)
98 die("index file corrupt");
100 for (i = 1; i < argc; i++) {
101 const char *arg = argv[i];
103 if (arg[0] != '-')
104 break;
105 if (!strcmp(arg, "--")) {
106 i++;
107 break;
109 if (!strcmp(arg, "-n")) {
110 show_only = 1;
111 continue;
113 if (!strcmp(arg, "-v")) {
114 verbose = 1;
115 continue;
117 usage(builtin_add_usage);
119 pathspec = get_pathspec(prefix, argv + i);
121 fill_directory(&dir, pathspec);
123 if (show_only) {
124 const char *sep = "", *eof = "";
125 for (i = 0; i < dir.nr; i++) {
126 printf("%s%s", sep, dir.entries[i]->name);
127 sep = " ";
128 eof = "\n";
130 fputs(eof, stdout);
131 return 0;
134 for (i = 0; i < dir.nr; i++)
135 add_file_to_index(dir.entries[i]->name, verbose);
137 if (active_cache_changed) {
138 if (write_cache(newfd, active_cache, active_nr) ||
139 close(newfd) || commit_lock_file(&lock_file))
140 die("Unable to write new index file");
143 return 0;