Extend interface of add_files_to_cache to allow ignore indexing errors

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-add.c b/builtin-add.c
index 4d72ab678dd29f71851fb8b80ff7b056e2a38e4b..786280818aaad12afbd7ce45bf955db9a6a7edc5 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -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,
                            struct diff_options *opt, void *cbdata)
 {
 static void update_callback(struct diff_queue_struct *q,
                            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++) {
                struct diff_filepair *p = q->queue[i];
                const char *path = p->one->path;
        for (i = 0; i < q->nr; i++) {
                struct diff_filepair *p = q->queue[i];
                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_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:
                case DIFF_STATUS_UNMERGED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:

-                       if (add_file_to_cache(path, verbose))
-                               die("updating files failed");
+                       if (add_file_to_cache(path, data->flags & ADD_FILES_VERBOSE)) {
+                               if (!(data->flags & ADD_FILES_IGNORE_ERRORS))
+                                       die("updating files failed");
+                               data->add_errors++;
+                       }

                        break;
                case DIFF_STATUS_DELETED:
                        remove_file_from_cache(path);
                        break;
                case DIFF_STATUS_DELETED:
                        remove_file_from_cache(path);

-                       if (verbose)
+                       if (data->flags & ADD_FILES_VERBOSE)

                                printf("remove '%s'\n", path);
                        break;
                }
        }
 }
 
                                printf("remove '%s'\n", path);
                        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;
        init_revisions(&rev, prefix);
        setup_revisions(0, NULL, &rev, NULL);
        rev.prune_data = pathspec;
        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = update_callback;
        struct rev_info rev;
        init_revisions(&rev, prefix);
        setup_revisions(0, NULL, &rev, NULL);
        rev.prune_data = pathspec;
        rev.diffopt.output_format = DIFF_FORMAT_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;
        const char **pathspec;
        struct dir_struct dir;
        int i, newfd;
        const char **pathspec;
        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);
 
        if (take_worktree_changes) {
        newfd = hold_locked_index(&lock_file, 1);
 
        if (take_worktree_changes) {

+               int flags = 0;

                const char **pathspec;
                if (read_cache() < 0)
                        die("index file corrupt");
                pathspec = get_pathspec(prefix, argv);
                const char **pathspec;
                if (read_cache() < 0)
                        die("index file corrupt");
                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;

 }
 }

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 10ec137ccec7d7f281562817d81a1035c4aa6124..05c06421b6c3a6d75b598e3c58a40c8461febd75 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -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();
 
                        ret = reset_to_new(new->commit->tree, opts->quiet);
                        work = write_tree_from_memory();
 
                        ret = reset_to_new(new->commit->tree, opts->quiet);

diff --git a/builtin-commit.c b/builtin-commit.c
index ae29d35d76a602d520752801c6a1b6ebfcb9ae7a..6a2f5c3d96be44591e170222b42e48241182f8ed 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -246,7 +246,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
         */
        if (all || (also && pathspec && *pathspec)) {
                int fd = hold_locked_index(&index_lock, 1);
         */
        if (all || (also && pathspec && *pathspec)) {
                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);
                if (write_cache(fd, active_cache, active_nr) ||
                    close_lock_file(&index_lock))
                refresh_cache(REFRESH_QUIET);
                if (write_cache(fd, active_cache, active_nr) ||
                    close_lock_file(&index_lock))

diff --git a/cache.h b/cache.h
index 9cee9a5f3fb2e51f617dcf9f92defcd596b97c10..4fb629000e9d11b22c54ade075acf59d272df291 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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);
 
 /* add */
 extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
 
 /* 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 */
 extern int diff_auto_refresh_index;
 
 /* diff.c */
 extern int diff_auto_refresh_index;