undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend interface of add_files_to_cache to allow ignore indexing errors

Browse Source 
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Riesen 2008-05-12 19:58:10 +02:00 committed by Junio C Hamano
parent 960b8ad1b1
commit 7ae02a30e8
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builtin-add.c
View File

@ -79,12 +79,18 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec,
prune_directory(dir, pathspec, baselen); prune_directory(dir, pathspec, baselen);
} }
struct update_callback_data
{
int flags;
int add_errors;
};
static void update_callback(struct diff_queue_struct *q, static void update_callback(struct diff_queue_struct *q,
struct diff_options *opt, void *cbdata) struct diff_options *opt, void *cbdata)
{ {
int i, verbose; int i;
struct update_callback_data *data = cbdata;
verbose = *((int *)cbdata);
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];
const char *path = p->one->path; const char *path = p->one->path;
@ -94,28 +100,35 @@ static void update_callback(struct diff_queue_struct *q,
case DIFF_STATUS_UNMERGED: case DIFF_STATUS_UNMERGED:
case DIFF_STATUS_MODIFIED: case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED: case DIFF_STATUS_TYPE_CHANGED:
if (add_file_to_cache(path, verbose)) if (add_file_to_cache(path, data->flags & ADD_FILES_VERBOSE)) {
die("updating files failed"); if (!(data->flags & ADD_FILES_IGNORE_ERRORS))
die("updating files failed");
data->add_errors++;
}
break; break;
case DIFF_STATUS_DELETED: case DIFF_STATUS_DELETED:
remove_file_from_cache(path); remove_file_from_cache(path);
if (verbose) if (data->flags & ADD_FILES_VERBOSE)
printf("remove '%s'\n", path); printf("remove '%s'\n", path);
break; break;
} }
} }
} }
void add_files_to_cache(int verbose, const char *prefix, const char **pathspec) int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
{ {
struct update_callback_data data;
struct rev_info rev; struct rev_info rev;
init_revisions(&rev, prefix); init_revisions(&rev, prefix);
setup_revisions(0, NULL, &rev, NULL); setup_revisions(0, NULL, &rev, NULL);
rev.prune_data = pathspec; rev.prune_data = pathspec;
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = update_callback; rev.diffopt.format_callback = update_callback;
rev.diffopt.format_callback_data = &verbose; data.flags = flags;
data.add_errors = 0;
rev.diffopt.format_callback_data = &data;
run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
return !!data.add_errors;
} }
static void refresh(int verbose, const char **pathspec) static void refresh(int verbose, const char **pathspec)
@ -193,6 +206,7 @@ static struct option builtin_add_options[] = {
int cmd_add(int argc, const char **argv, const char *prefix) int cmd_add(int argc, const char **argv, const char *prefix)
{ {
int exit_status = 0;
int i, newfd; int i, newfd;
const char **pathspec; const char **pathspec;
struct dir_struct dir; struct dir_struct dir;
@ -209,11 +223,16 @@ int cmd_add(int argc, const char **argv, const char *prefix)
newfd = hold_locked_index(&lock_file, 1); newfd = hold_locked_index(&lock_file, 1);
if (take_worktree_changes) { if (take_worktree_changes) {
int flags = 0;
const char **pathspec; const char **pathspec;
if (read_cache() < 0) if (read_cache() < 0)
die("index file corrupt"); die("index file corrupt");
pathspec = get_pathspec(prefix, argv); pathspec = get_pathspec(prefix, argv);
add_files_to_cache(verbose, prefix, pathspec);
if (verbose)
flags |= ADD_FILES_VERBOSE;
exit_status = add_files_to_cache(prefix, pathspec, flags);
goto finish; goto finish;
} }
@ -265,5 +284,5 @@ int cmd_add(int argc, const char **argv, const char *prefix)
die("Unable to write new index file"); die("Unable to write new index file");
} }
return 0; return exit_status;
} }

2
builtin-checkout.c
View File

@ -282,7 +282,7 @@ static int merge_working_tree(struct checkout_opts *opts,
* entries in the index. * entries in the index.
*/ */
add_files_to_cache(0, NULL, NULL); add_files_to_cache(NULL, NULL, 0);
work = write_tree_from_memory(); work = write_tree_from_memory();
ret = reset_to_new(new->commit->tree, opts->quiet); ret = reset_to_new(new->commit->tree, opts->quiet);

2
builtin-commit.c
View File

@ -246,7 +246,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
*/ */
if (all || (also && pathspec && *pathspec)) { if (all || (also && pathspec && *pathspec)) {
int fd = hold_locked_index(&index_lock, 1); int fd = hold_locked_index(&index_lock, 1);
add_files_to_cache(0, also ? prefix : NULL, pathspec); add_files_to_cache(also ? prefix : NULL, pathspec, 0);
refresh_cache(REFRESH_QUIET); refresh_cache(REFRESH_QUIET);
if (write_cache(fd, active_cache, active_nr) || if (write_cache(fd, active_cache, active_nr) ||
close_lock_file(&index_lock)) close_lock_file(&index_lock))

8
cache.h
View File

@ -781,7 +781,13 @@ extern int convert_to_git(const char *path, const char *src, size_t len,
extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst); extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
/* add */ /* add */
void add_files_to_cache(int verbose, const char *prefix, const char **pathspec); #define ADD_FILES_VERBOSE 01
#define ADD_FILES_IGNORE_ERRORS 02
/*
* return 0 if success, 1 - if addition of a file failed and
* ADD_FILES_IGNORE_ERRORS was specified in flags
*/
int add_files_to_cache(const char *prefix, const char **pathspec, int flags);
/* diff.c */ /* diff.c */
extern int diff_auto_refresh_index; extern int diff_auto_refresh_index;