Convert ce_path_match() to use 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/update-index.c b/builtin/update-index.c
index 56baf27fb7eb18d77e8793d089f2a719d4876689..d7850c6309aec0c1a4f640999fb757d7b32ba1b8 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -546,7 +546,10 @@ static int do_reupdate(int ac, const char **av,
         */
        int pos;
        int has_head = 1;
         */
        int pos;
        int has_head = 1;

-       const char **pathspec = get_pathspec(prefix, av + 1);
+       const char **paths = get_pathspec(prefix, av + 1);
+       struct pathspec pathspec;
+
+       init_pathspec(&pathspec, paths);

 
        if (read_ref("HEAD", head_sha1))
                /* If there is no HEAD, that means it is an initial
 
        if (read_ref("HEAD", head_sha1))
                /* If there is no HEAD, that means it is an initial


@@ -559,7 +562,7 @@ static int do_reupdate(int ac, const char **av,
                struct cache_entry *old = NULL;
                int save_nr;
 
                struct cache_entry *old = NULL;
                int save_nr;
 

-               if (ce_stage(ce) || !ce_path_match(ce, pathspec))
+               if (ce_stage(ce) || !ce_path_match(ce, &pathspec))

                        continue;
                if (has_head)
                        old = read_one_ent(NULL, head_sha1,
                        continue;
                if (has_head)
                        old = read_one_ent(NULL, head_sha1,


@@ -578,6 +581,7 @@ static int do_reupdate(int ac, const char **av,
                if (save_nr != active_nr)
                        goto redo;
        }
                if (save_nr != active_nr)
                        goto redo;
        }

+       free_pathspec(&pathspec);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/cache.h b/cache.h
index 800efa2328117cf49f482856c49f62ca7b1ebcdd..4beb2dc6ff875322f970eccbf3980746527a91ab 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -515,7 +515,7 @@ struct pathspec {
 
 extern int init_pathspec(struct pathspec *, const char **);
 extern void free_pathspec(struct pathspec *);
 
 extern int init_pathspec(struct pathspec *, const char **);
 extern void free_pathspec(struct pathspec *);

-extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
+extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec);

 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
 extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
 extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
 extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
 extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);

diff --git a/diff-lib.c b/diff-lib.c
index 2251f3df687514acb91a9b4382eb0aac88a7897b..1e22992cb10420b9dd6def16f80efc5f196ffbbb 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.raw))
+               if (!ce_path_match(ce, &revs->prune_data))

                        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.raw))
+       if (ce_path_match(idx ? idx : tree, &revs->prune_data))

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

diff --git a/preload-index.c b/preload-index.c
index e3d0bda31a98372eb9b6a8c2cd0fd65917a9dbde..49cb08df96faa90101bb25d8f96acaffc066f19b 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -35,7 +35,9 @@ static void *preload_thread(void *_data)
        struct index_state *index = p->index;
        struct cache_entry **cep = index->cache + p->offset;
        struct cache_def cache;
        struct index_state *index = p->index;
        struct cache_entry **cep = index->cache + p->offset;
        struct cache_def cache;

+       struct pathspec pathspec;

 
 

+       init_pathspec(&pathspec, p->pathspec);

        memset(&cache, 0, sizeof(cache));
        nr = p->nr;
        if (nr + p->offset > index->cache_nr)
        memset(&cache, 0, sizeof(cache));
        nr = p->nr;
        if (nr + p->offset > index->cache_nr)


@@ -51,7 +53,7 @@ static void *preload_thread(void *_data)
                        continue;
                if (ce_uptodate(ce))
                        continue;
                        continue;
                if (ce_uptodate(ce))
                        continue;

-               if (!ce_path_match(ce, p->pathspec))
+               if (!ce_path_match(ce, &pathspec))

                        continue;
                if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
                        continue;
                        continue;
                if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
                        continue;


@@ -61,6 +63,7 @@ static void *preload_thread(void *_data)
                        continue;
                ce_mark_uptodate(ce);
        } while (--nr > 0);
                        continue;
                ce_mark_uptodate(ce);
        } while (--nr > 0);

+       free_pathspec(&pathspec);

        return NULL;
 }
 
        return NULL;
 }
 

diff --git a/read-cache.c b/read-cache.c
index 4f2e890b01b0c27ef2e49080e1fd34bf67e969c7..8b2d537f0253ef33b0cd7bb90ec8f6f47b5b8307 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -706,17 +706,18 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 }
 
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 }
 

-int ce_path_match(const struct cache_entry *ce, const char **pathspec)
+int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)

 {
        const char *match, *name;
 {
        const char *match, *name;

+       const char **ps = pathspec->raw;

        int len;
 
        int len;
 

-       if (!pathspec)
+       if (!pathspec->nr)

                return 1;
 
        len = ce_namelen(ce);
        name = ce->name;
                return 1;
 
        len = ce_namelen(ce);
        name = ce->name;

-       while ((match = *pathspec++) != NULL) {
+       while ((match = *ps++) != NULL) {

                int matchlen = strlen(match);
                if (matchlen > len)
                        continue;
                int matchlen = strlen(match);
                if (matchlen > len)
                        continue;

diff --git a/revision.c b/revision.c
index bf87e01e45f703b2bda8edd2fb08563d7c362329..86d24704896d71de7bb554a3925ea88e2be3417b 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -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.raw)) {
+               if (ce_path_match(ce, &revs->prune_data)) {

                        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;

diff --git a/wt-status.c b/wt-status.c
index 1ea330ed17c921c521543534917c7ec863e42319..a82b11d341c9dddb541cc72a5568769d9f538780 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -354,14 +354,16 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 
 static void wt_status_collect_changes_initial(struct wt_status *s)
 {
 
 static void wt_status_collect_changes_initial(struct wt_status *s)
 {

+       struct pathspec pathspec;

        int i;
 
        int i;
 

+       init_pathspec(&pathspec, s->pathspec);

        for (i = 0; i < active_nr; i++) {
                struct string_list_item *it;
                struct wt_status_change_data *d;
                struct cache_entry *ce = active_cache[i];
 
        for (i = 0; i < active_nr; i++) {
                struct string_list_item *it;
                struct wt_status_change_data *d;
                struct cache_entry *ce = active_cache[i];
 

-               if (!ce_path_match(ce, s->pathspec))
+               if (!ce_path_match(ce, &pathspec))

                        continue;
                it = string_list_insert(&s->change, ce->name);
                d = it->util;
                        continue;
                it = string_list_insert(&s->change, ce->name);
                d = it->util;


@@ -376,6 +378,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
                else
                        d->index_status = DIFF_STATUS_ADDED;
        }
                else
                        d->index_status = DIFF_STATUS_ADDED;
        }

+       free_pathspec(&pathspec);

 }
 
 static void wt_status_collect_untracked(struct wt_status *s)
 }
 
 static void wt_status_collect_untracked(struct wt_status *s)