pathspec: rename match_pathspec_depth() to match_pathspec()

A long time ago, for some reason I was not happy with
match_pathspec(). I created a better version, match_pathspec_depth()
that was suppose to replace match_pathspec()
eventually. match_pathspec() has finally been gone since 6 months
ago. Use the shorter name for match_pathspec_depth().

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/clean.c b/builtin/clean.c
index 2f26297142fde89ec842d4e01665b3ebb24a9b59..f59c753a4644c314395f26d1c8fac81be29e111b 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -961,8 +961,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                        die_errno("Cannot lstat '%s'", ent->name);
 
                if (pathspec.nr)
                        die_errno("Cannot lstat '%s'", ent->name);
 
                if (pathspec.nr)

-                       matches = match_pathspec_depth(&pathspec, ent->name,
-                                                      len, 0, NULL);
+                       matches = match_pathspec(&pathspec, ent->name,
+                                                len, 0, NULL);

 
                if (S_ISDIR(st.st_mode)) {
                        if (remove_directories || (matches == MATCHED_EXACTLY)) {
 
                if (S_ISDIR(st.st_mode)) {
                        if (remove_directories || (matches == MATCHED_EXACTLY)) {

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index e238608bda95646e4581e1e81df4c07939d49057..02db0e1ae82fb4fb675d940df3cd68c19c817b50 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -139,7 +139,8 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)
        if (len >= ce_namelen(ce))
                die("git ls-files: internal error - cache entry not superset of prefix");
 
        if (len >= ce_namelen(ce))
                die("git ls-files: internal error - cache entry not superset of prefix");
 

-       if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), len, ps_matched))
+       if (!match_pathspec(&pathspec, ce->name, ce_namelen(ce),
+                           len, ps_matched))

                return;
 
        if (tag && *tag && show_valid_bit &&
                return;
 
        if (tag && *tag && show_valid_bit &&


@@ -195,7 +196,8 @@ static void show_ru_info(void)
                len = strlen(path);
                if (len < max_prefix_len)
                        continue; /* outside of the prefix */
                len = strlen(path);
                if (len < max_prefix_len)
                        continue; /* outside of the prefix */

-               if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_matched))
+               if (!match_pathspec(&pathspec, path, len,
+                                   max_prefix_len, ps_matched))

                        continue; /* uninterested */
                for (i = 0; i < 3; i++) {
                        if (!ui->mode[i])
                        continue; /* uninterested */
                for (i = 0; i < 3; i++) {
                        if (!ui->mode[i])

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 65ec93184614619cac925c17ef3ebc90cd30a82c..51184dfa2efa46323e79c4504121bf5fe948a6d2 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -171,7 +171,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
         * show_recursive() rolls its own matching code and is
         * generally ignorant of 'struct pathspec'. The magic mask
         * cannot be lifted until it is converted to use
         * show_recursive() rolls its own matching code and is
         * generally ignorant of 'struct pathspec'. The magic mask
         * cannot be lifted until it is converted to use

-        * match_pathspec_depth() or tree_entry_interesting()
+        * match_pathspec() or tree_entry_interesting()

         */
        parse_pathspec(&pathspec, PATHSPEC_GLOB | PATHSPEC_ICASE,
                       PATHSPEC_PREFER_CWD,
         */
        parse_pathspec(&pathspec, PATHSPEC_GLOB | PATHSPEC_ICASE,
                       PATHSPEC_PREFER_CWD,

diff --git a/dir.c b/dir.c
index b35b6330f850f610b582b189d7e4d6a9ba4495db..442a548f25d8c582438e8f1df3e9b98e0d1db27c 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -218,7 +218,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
         * The normal call pattern is:
         * 1. prefix = common_prefix_len(ps);
         * 2. prune something, or fill_directory
         * The normal call pattern is:
         * 1. prefix = common_prefix_len(ps);
         * 2. prune something, or fill_directory

-        * 3. match_pathspec_depth()
+        * 3. match_pathspec()

         *
         * 'prefix' at #1 may be shorter than the command's prefix and
         * it's ok for #2 to match extra files. Those extras will be
         *
         * 'prefix' at #1 may be shorter than the command's prefix and
         * it's ok for #2 to match extra files. Those extras will be


@@ -282,10 +282,10 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
  * pathspec did not match any names, which could indicate that the
  * user mistyped the nth pathspec.
  */
  * pathspec did not match any names, which could indicate that the
  * user mistyped the nth pathspec.
  */

-static int match_pathspec_depth_1(const struct pathspec *ps,
-                                 const char *name, int namelen,
-                                 int prefix, char *seen,
-                                 int exclude)
+static int do_match_pathspec(const struct pathspec *ps,
+                            const char *name, int namelen,
+                            int prefix, char *seen,
+                            int exclude)

 {
        int i, retval = 0;
 
 {
        int i, retval = 0;
 


@@ -350,15 +350,15 @@ static int match_pathspec_depth_1(const struct pathspec *ps,
        return retval;
 }
 
        return retval;
 }
 

-int match_pathspec_depth(const struct pathspec *ps,
-                        const char *name, int namelen,
-                        int prefix, char *seen)
+int match_pathspec(const struct pathspec *ps,
+                  const char *name, int namelen,
+                  int prefix, char *seen)

 {
        int positive, negative;
 {
        int positive, negative;

-       positive = match_pathspec_depth_1(ps, name, namelen, prefix, seen, 0);
+       positive = do_match_pathspec(ps, name, namelen, prefix, seen, 0);

        if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
                return positive;
        if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
                return positive;

-       negative = match_pathspec_depth_1(ps, name, namelen, prefix, seen, 1);
+       negative = do_match_pathspec(ps, name, namelen, prefix, seen, 1);

        return negative ? 0 : positive;
 }
 
        return negative ? 0 : positive;
 }
 

diff --git a/dir.h b/dir.h
index 65f54b606f853a1959f8bb5a5f6475d3a1ffa9c2..c31ed9af785abbb6af6b2959b43fdc0fe0de051c 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -132,9 +132,9 @@ struct dir_struct {
 extern int simple_length(const char *match);
 extern int no_wildcard(const char *string);
 extern char *common_prefix(const struct pathspec *pathspec);
 extern int simple_length(const char *match);
 extern int no_wildcard(const char *string);
 extern char *common_prefix(const struct pathspec *pathspec);

-extern int match_pathspec_depth(const struct pathspec *pathspec,
-                               const char *name, int namelen,
-                               int prefix, char *seen);
+extern int match_pathspec(const struct pathspec *pathspec,
+                         const char *name, int namelen,
+                         int prefix, char *seen);

 extern int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);
 extern int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);


@@ -209,14 +209,14 @@ static inline int ce_path_match(const struct cache_entry *ce,
                                const struct pathspec *pathspec,
                                char *seen)
 {
                                const struct pathspec *pathspec,
                                char *seen)
 {

-       return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, seen);
+       return match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);

 }
 
 static inline int dir_path_match(const struct dir_entry *ent,
                                 const struct pathspec *pathspec,
                                 int prefix, char *seen)
 {
 }
 
 static inline int dir_path_match(const struct dir_entry *ent,
                                 const struct pathspec *pathspec,
                                 int prefix, char *seen)
 {

-       return match_pathspec_depth(pathspec, ent->name, ent->len, prefix, seen);
+       return match_pathspec(pathspec, ent->name, ent->len, prefix, seen);

 }
 
 #endif
 }
 
 #endif

diff --git a/rerere.c b/rerere.c
index 1f2d21a72f56a68a7f9307bfd9092087687cffae..34a21c431bef5c5915be77a2a0a2b8fc238bd6ac 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -672,8 +672,8 @@ int rerere_forget(struct pathspec *pathspec)
        find_conflict(&conflict);
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];
        find_conflict(&conflict);
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];

-               if (!match_pathspec_depth(pathspec, it->string, strlen(it->string),
-                                         0, NULL))
+               if (!match_pathspec(pathspec, it->string,
+                                   strlen(it->string), 0, NULL))

                        continue;
                rerere_forget_one_path(it->string, &merge_rr);
        }
                        continue;
                rerere_forget_one_path(it->string, &merge_rr);
        }

diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh
index a7c7ff5f4938c1fa7439e7c5a45321572bfc55fe..39fc3f6769be1c41d76c6acbfcb780b823afe7e7 100755 (executable)
--- a/t/t6131-pathspec-icase.sh
+++ b/t/t6131-pathspec-icase.sh
@@ -69,7 +69,7 @@ test_expect_success 'tree_entry_interesting matches :(icase)bar with empty prefi
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

-test_expect_success 'match_pathspec_depth matches :(icase)bar' '
+test_expect_success 'match_pathspec matches :(icase)bar' '

        cat <<-EOF >expect &&
        BAR
        bAr
        cat <<-EOF >expect &&
        BAR
        bAr


@@ -79,7 +79,7 @@ test_expect_success 'match_pathspec_depth matches :(icase)bar' '
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

-test_expect_success 'match_pathspec_depth matches :(icase)bar with prefix' '
+test_expect_success 'match_pathspec matches :(icase)bar with prefix' '

        cat <<-EOF >expect &&
        fOo/BAR
        fOo/bAr
        cat <<-EOF >expect &&
        fOo/BAR
        fOo/bAr


@@ -89,7 +89,7 @@ test_expect_success 'match_pathspec_depth matches :(icase)bar with prefix' '
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

-test_expect_success 'match_pathspec_depth matches :(icase)bar with empty prefix' '
+test_expect_success 'match_pathspec matches :(icase)bar with empty prefix' '

        cat <<-EOF >expect &&
        bar
        fOo/BAR
        cat <<-EOF >expect &&
        bar
        fOo/BAR