struct rev_info: convert prune_data to struct pathspec

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/add.c b/builtin/add.c
index 12b964e642b91863776f161a7b2aab2ec216efcb..5f817ad77f1b3ba247c3b76d1d9a50f7fcc5edee 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -86,7 +86,7 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
        struct rev_info rev;
        init_revisions(&rev, prefix);
        setup_revisions(0, NULL, &rev, NULL);
        struct rev_info rev;
        init_revisions(&rev, prefix);
        setup_revisions(0, NULL, &rev, NULL);

-       rev.prune_data = pathspec;
+       init_pathspec(&rev.prune_data, pathspec);

        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = update_callback;
        data.flags = flags;
        rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = update_callback;
        data.flags = flags;

diff --git a/builtin/diff.c b/builtin/diff.c
index a08c3240d5825bd4cded9a9e9e481008a381e0c9..d12de8f392fc660c5048062f2a754a9f63e897fb 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -371,14 +371,10 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                }
                die("unhandled object '%s' given.", name);
        }
                }
                die("unhandled object '%s' given.", name);
        }

-       if (rev.prune_data) {
-               const char **pathspec = rev.prune_data;
-               while (*pathspec) {
-                       if (!path)
-                               path = *pathspec;
-                       paths++;
-                       pathspec++;
-               }
+       if (rev.prune_data.nr) {
+               if (!path)
+                       path = rev.prune_data.items[0].match;
+               paths += rev.prune_data.nr;

        }
 
        /*
        }
 
        /*

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index c8fd46b872780b27b09ad70316fa164d855f3220..ba57457cc54812ba935c5259277e12d72463f63f 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -651,7 +651,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
        if (import_filename)
                import_marks(import_filename);
 
        if (import_filename)
                import_marks(import_filename);
 

-       if (import_filename && revs.prune_data)
+       if (import_filename && revs.prune_data.nr)

                full_tree = 1;
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
                full_tree = 1;
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);

diff --git a/diff-lib.c b/diff-lib.c
index 3b809f2e0d1a937df99d3c3018848930ee13a25b..2251f3df687514acb91a9b4382eb0aac88a7897b 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -106,7 +106,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                        DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
                        break;
 
                        DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
                        break;
 

-               if (!ce_path_match(ce, revs->prune_data))
+               if (!ce_path_match(ce, revs->prune_data.raw))

                        continue;
 
                if (ce_stage(ce)) {
                        continue;
 
                if (ce_stage(ce)) {


@@ -427,7 +427,7 @@ static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
        if (tree == o->df_conflict_entry)
                tree = NULL;
 
        if (tree == o->df_conflict_entry)
                tree = NULL;
 

-       if (ce_path_match(idx ? idx : tree, revs->prune_data))
+       if (ce_path_match(idx ? idx : tree, revs->prune_data.raw))

                do_oneway_diff(o, idx, tree);
 
        return 0;
                do_oneway_diff(o, idx, tree);
 
        return 0;


@@ -501,7 +501,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
        active_nr = dst - active_cache;
 
        init_revisions(&revs, NULL);
        active_nr = dst - active_cache;
 
        init_revisions(&revs, NULL);

-       revs.prune_data = opt->pathspec.raw;
+       init_pathspec(&revs.prune_data, opt->pathspec.raw);

        tree = parse_tree_indirect(tree_sha1);
        if (!tree)
                die("bad tree object %s", sha1_to_hex(tree_sha1));
        tree = parse_tree_indirect(tree_sha1);
        if (!tree)
                die("bad tree object %s", sha1_to_hex(tree_sha1));

diff --git a/revision.c b/revision.c
index 0c511aa44b100fd0c8f28dd814bd46795162f7a3..bf87e01e45f703b2bda8edd2fb08563d7c362329 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -323,7 +323,7 @@ static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct
                 * tagged commit by specifying both --simplify-by-decoration
                 * and pathspec.
                 */
                 * tagged commit by specifying both --simplify-by-decoration
                 * and pathspec.
                 */

-               if (!revs->prune_data)
+               if (!revs->prune_data.nr)

                        return REV_TREE_SAME;
        }
 
                        return REV_TREE_SAME;
        }
 


@@ -969,7 +969,7 @@ static void prepare_show_merge(struct rev_info *revs)
                struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;
                struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;

-               if (ce_path_match(ce, revs->prune_data)) {
+               if (ce_path_match(ce, revs->prune_data.raw)) {

                        prune_num++;
                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
                        prune[prune_num-2] = ce->name;
                        prune_num++;
                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
                        prune[prune_num-2] = ce->name;


@@ -979,7 +979,8 @@ static void prepare_show_merge(struct rev_info *revs)
                       ce_same_name(ce, active_cache[i+1]))
                        i++;
        }
                       ce_same_name(ce, active_cache[i+1]))
                        i++;
        }

-       revs->prune_data = prune;
+       free_pathspec(&revs->prune_data);
+       init_pathspec(&revs->prune_data, prune);

        revs->limited = 1;
 }
 
        revs->limited = 1;
 }
 


@@ -1616,7 +1617,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
        }
 
        if (prune_data)
        }
 
        if (prune_data)

-               revs->prune_data = get_pathspec(revs->prefix, prune_data);
+               init_pathspec(&revs->prune_data, get_pathspec(revs->prefix, prune_data));

 
        if (revs->def == NULL)
                revs->def = opt ? opt->def : NULL;
 
        if (revs->def == NULL)
                revs->def = opt ? opt->def : NULL;


@@ -1647,13 +1648,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
        if (revs->topo_order)
                revs->limited = 1;
 
        if (revs->topo_order)
                revs->limited = 1;
 

-       if (revs->prune_data) {
-               diff_tree_setup_paths(revs->prune_data, &revs->pruning);
+       if (revs->prune_data.nr) {
+               diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);

                /* Can't prune commits with rename following: the paths change.. */
                if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
                        revs->prune = 1;
                if (!revs->full_diff)
                /* Can't prune commits with rename following: the paths change.. */
                if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
                        revs->prune = 1;
                if (!revs->full_diff)

-                       diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
+                       diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);

        }
        if (revs->combine_merges)
                revs->ignore_merges = 0;
        }
        if (revs->combine_merges)
                revs->ignore_merges = 0;

diff --git a/revision.h b/revision.h
index 05659c64acd7fe8eb7be011cee6174e397e57baf..82509dd1d9ad7b1824971be4884409060f10aee3 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -34,7 +34,7 @@ struct rev_info {
        /* Basic information */
        const char *prefix;
        const char *def;
        /* Basic information */
        const char *prefix;
        const char *def;

-       void *prune_data;
+       struct pathspec prune_data;

        unsigned int early_output;
 
        /* Traversal flags */
        unsigned int early_output;
 
        /* Traversal flags */

diff --git a/wt-status.c b/wt-status.c
index 123582b6cbdff90f4665fbf8db2c92d701680e4d..1ea330ed17c921c521543534917c7ec863e42319 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -323,7 +323,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
     }
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;
     }
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;

-       rev.prune_data = s->pathspec;
+       init_pathspec(&rev.prune_data, s->pathspec);

        run_diff_files(&rev, 0);
 }
 
        run_diff_files(&rev, 0);
 }
 


@@ -348,7 +348,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = 200;
        rev.diffopt.break_opt = 0;
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = 200;
        rev.diffopt.break_opt = 0;

-       rev.prune_data = s->pathspec;
+       init_pathspec(&rev.prune_data, s->pathspec);

        run_diff_index(&rev, 1);
 }
 
        run_diff_index(&rev, 1);
 }