202 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			202 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * "git add" builtin command
 | 
						|
 *
 | 
						|
 * Copyright (C) 2006 Linus Torvalds
 | 
						|
 */
 | 
						|
#include "cache.h"
 | 
						|
#include "builtin.h"
 | 
						|
#include "dir.h"
 | 
						|
#include "exec_cmd.h"
 | 
						|
#include "cache-tree.h"
 | 
						|
 | 
						|
static const char builtin_add_usage[] =
 | 
						|
"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
 | 
						|
 | 
						|
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 | 
						|
{
 | 
						|
	char *seen;
 | 
						|
	int i, specs;
 | 
						|
	struct dir_entry **src, **dst;
 | 
						|
 | 
						|
	for (specs = 0; pathspec[specs];  specs++)
 | 
						|
		/* nothing */;
 | 
						|
	seen = xcalloc(specs, 1);
 | 
						|
 | 
						|
	src = dst = dir->entries;
 | 
						|
	i = dir->nr;
 | 
						|
	while (--i >= 0) {
 | 
						|
		struct dir_entry *entry = *src++;
 | 
						|
		if (match_pathspec(pathspec, entry->name, entry->len,
 | 
						|
				   prefix, seen))
 | 
						|
			*dst++ = entry;
 | 
						|
	}
 | 
						|
	dir->nr = dst - dir->entries;
 | 
						|
 | 
						|
	for (i = 0; i < specs; i++) {
 | 
						|
		struct stat st;
 | 
						|
		const char *match;
 | 
						|
		if (seen[i])
 | 
						|
			continue;
 | 
						|
 | 
						|
		match = pathspec[i];
 | 
						|
		if (!match[0])
 | 
						|
			continue;
 | 
						|
 | 
						|
		/* Existing file? We must have ignored it */
 | 
						|
		if (!lstat(match, &st)) {
 | 
						|
			struct dir_entry *ent;
 | 
						|
 | 
						|
			ent = dir_add_name(dir, match, strlen(match));
 | 
						|
			ent->ignored = 1;
 | 
						|
			if (S_ISDIR(st.st_mode))
 | 
						|
				ent->ignored_dir = 1;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		die("pathspec '%s' did not match any files", match);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void fill_directory(struct dir_struct *dir, const char **pathspec)
 | 
						|
{
 | 
						|
	const char *path, *base;
 | 
						|
	int baselen;
 | 
						|
 | 
						|
	/* Set up the default git porcelain excludes */
 | 
						|
	memset(dir, 0, sizeof(*dir));
 | 
						|
	dir->exclude_per_dir = ".gitignore";
 | 
						|
	path = git_path("info/exclude");
 | 
						|
	if (!access(path, R_OK))
 | 
						|
		add_excludes_from_file(dir, path);
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Calculate common prefix for the pathspec, and
 | 
						|
	 * use that to optimize the directory walk
 | 
						|
	 */
 | 
						|
	baselen = common_prefix(pathspec);
 | 
						|
	path = ".";
 | 
						|
	base = "";
 | 
						|
	if (baselen) {
 | 
						|
		char *common = xmalloc(baselen + 1);
 | 
						|
		memcpy(common, *pathspec, baselen);
 | 
						|
		common[baselen] = 0;
 | 
						|
		path = base = common;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Read the directory and prune it */
 | 
						|
	read_directory(dir, path, base, baselen);
 | 
						|
	if (pathspec)
 | 
						|
		prune_directory(dir, pathspec, baselen);
 | 
						|
}
 | 
						|
 | 
						|
static struct lock_file lock_file;
 | 
						|
 | 
						|
static const char ignore_warning[] =
 | 
						|
"The following paths are ignored by one of your .gitignore files:\n";
 | 
						|
 | 
						|
int cmd_add(int argc, const char **argv, const char *prefix)
 | 
						|
{
 | 
						|
	int i, newfd;
 | 
						|
	int verbose = 0, show_only = 0, ignored_too = 0;
 | 
						|
	const char **pathspec;
 | 
						|
	struct dir_struct dir;
 | 
						|
	int add_interactive = 0;
 | 
						|
 | 
						|
	for (i = 1; i < argc; i++) {
 | 
						|
		if (!strcmp("--interactive", argv[i]) ||
 | 
						|
		    !strcmp("-i", argv[i]))
 | 
						|
			add_interactive++;
 | 
						|
	}
 | 
						|
	if (add_interactive) {
 | 
						|
		const char *args[] = { "add--interactive", NULL };
 | 
						|
 | 
						|
		if (add_interactive != 1 || argc != 2)
 | 
						|
			die("add --interactive does not take any parameters");
 | 
						|
		execv_git_cmd(args);
 | 
						|
		exit(1);
 | 
						|
	}
 | 
						|
 | 
						|
	git_config(git_default_config);
 | 
						|
 | 
						|
	newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
 | 
						|
 | 
						|
	for (i = 1; i < argc; i++) {
 | 
						|
		const char *arg = argv[i];
 | 
						|
 | 
						|
		if (arg[0] != '-')
 | 
						|
			break;
 | 
						|
		if (!strcmp(arg, "--")) {
 | 
						|
			i++;
 | 
						|
			break;
 | 
						|
		}
 | 
						|
		if (!strcmp(arg, "-n")) {
 | 
						|
			show_only = 1;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		if (!strcmp(arg, "-f")) {
 | 
						|
			ignored_too = 1;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		if (!strcmp(arg, "-v")) {
 | 
						|
			verbose = 1;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		usage(builtin_add_usage);
 | 
						|
	}
 | 
						|
	if (argc <= i) {
 | 
						|
		fprintf(stderr, "Nothing specified, nothing added.\n");
 | 
						|
		fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
	pathspec = get_pathspec(prefix, argv + i);
 | 
						|
 | 
						|
	fill_directory(&dir, pathspec);
 | 
						|
 | 
						|
	if (show_only) {
 | 
						|
		const char *sep = "", *eof = "";
 | 
						|
		for (i = 0; i < dir.nr; i++) {
 | 
						|
			if (!ignored_too && dir.entries[i]->ignored)
 | 
						|
				continue;
 | 
						|
			printf("%s%s", sep, dir.entries[i]->name);
 | 
						|
			sep = " ";
 | 
						|
			eof = "\n";
 | 
						|
		}
 | 
						|
		fputs(eof, stdout);
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
 | 
						|
	if (read_cache() < 0)
 | 
						|
		die("index file corrupt");
 | 
						|
 | 
						|
	if (!ignored_too) {
 | 
						|
		int has_ignored = 0;
 | 
						|
		for (i = 0; i < dir.nr; i++)
 | 
						|
			if (dir.entries[i]->ignored)
 | 
						|
				has_ignored = 1;
 | 
						|
		if (has_ignored) {
 | 
						|
			fprintf(stderr, ignore_warning);
 | 
						|
			for (i = 0; i < dir.nr; i++) {
 | 
						|
				if (!dir.entries[i]->ignored)
 | 
						|
					continue;
 | 
						|
				fprintf(stderr, "%s", dir.entries[i]->name);
 | 
						|
				if (dir.entries[i]->ignored_dir)
 | 
						|
					fprintf(stderr, " (directory)");
 | 
						|
				fputc('\n', stderr);
 | 
						|
			}
 | 
						|
			fprintf(stderr,
 | 
						|
				"Use -f if you really want to add them.\n");
 | 
						|
			exit(1);
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	for (i = 0; i < dir.nr; i++)
 | 
						|
		add_file_to_index(dir.entries[i]->name, verbose);
 | 
						|
 | 
						|
	if (active_cache_changed) {
 | 
						|
		if (write_cache(newfd, active_cache, active_nr) ||
 | 
						|
		    close(newfd) || commit_lock_file(&lock_file))
 | 
						|
			die("Unable to write new index file");
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 |