userdiff.c: remove implicit dependency on the_index

[jc: squashed in missing forward decl in userdiff.h found by Ramsay]

Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
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/archive-zip.c b/archive-zip.c
index 5a62351ab1a46f6a0827a7d41e794c00a4839edc..155ee4a779a1c2cd0cb2a7a8eea8c7ba8ba8502a 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -264,9 +264,10 @@ static int has_only_ascii(const char *s)
        }
 }
 
        }
 }
 

-static int entry_is_binary(const char *path, const void *buffer, size_t size)
+static int entry_is_binary(struct index_state *istate, const char *path,
+                          const void *buffer, size_t size)

 {
 {

-       struct userdiff_driver *driver = userdiff_find_by_path(path);
+       struct userdiff_driver *driver = userdiff_find_by_path(istate, path);

        if (!driver)
                driver = userdiff_find_by_name("default");
        if (driver->binary != -1)
        if (!driver)
                driver = userdiff_find_by_name("default");
        if (driver->binary != -1)


@@ -352,7 +353,8 @@ static int write_zip_entry(struct archiver_args *args,
                                return error(_("cannot read %s"),
                                             oid_to_hex(oid));
                        crc = crc32(crc, buffer, size);
                                return error(_("cannot read %s"),
                                             oid_to_hex(oid));
                        crc = crc32(crc, buffer, size);

-                       is_binary = entry_is_binary(path_without_prefix,
+                       is_binary = entry_is_binary(args->repo->index,
+                                                   path_without_prefix,

                                                    buffer, size);
                        out = buffer;
                }
                                                    buffer, size);
                        out = buffer;
                }


@@ -428,7 +430,8 @@ static int write_zip_entry(struct archiver_args *args,
                                break;
                        crc = crc32(crc, buf, readlen);
                        if (is_binary == -1)
                                break;
                        crc = crc32(crc, buf, readlen);
                        if (is_binary == -1)

-                               is_binary = entry_is_binary(path_without_prefix,
+                               is_binary = entry_is_binary(args->repo->index,
+                                                           path_without_prefix,

                                                            buf, readlen);
                        write_or_die(1, buf, readlen);
                }
                                                            buf, readlen);
                        write_or_die(1, buf, readlen);
                }


@@ -460,7 +463,8 @@ static int write_zip_entry(struct archiver_args *args,
                                break;
                        crc = crc32(crc, buf, readlen);
                        if (is_binary == -1)
                                break;
                        crc = crc32(crc, buf, readlen);
                        if (is_binary == -1)

-                               is_binary = entry_is_binary(path_without_prefix,
+                               is_binary = entry_is_binary(args->repo->index,
+                                                           path_without_prefix,

                                                            buf, readlen);
 
                        zstream.next_in = buf;
                                                            buf, readlen);
 
                        zstream.next_in = buf;

diff --git a/builtin/grep.c b/builtin/grep.c
index 0667ffde84ad552ca1aa271cd49b46e59a91326b..0c3527242eb052810b4d6487954d241f16d4860d 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -103,7 +103,8 @@ static void add_work(struct grep_opt *opt, const struct grep_source *gs)
 
        todo[todo_end].source = *gs;
        if (opt->binary != GREP_BINARY_TEXT)
 
        todo[todo_end].source = *gs;
        if (opt->binary != GREP_BINARY_TEXT)

-               grep_source_load_driver(&todo[todo_end].source);
+               grep_source_load_driver(&todo[todo_end].source,
+                                       opt->repo->index);

        todo[todo_end].done = 0;
        strbuf_reset(&todo[todo_end].out);
        todo_end = (todo_end + 1) % ARRAY_SIZE(todo);
        todo[todo_end].done = 0;
        strbuf_reset(&todo[todo_end].out);
        todo_end = (todo_end + 1) % ARRAY_SIZE(todo);

diff --git a/combine-diff.c b/combine-diff.c
index 9b43e557a1608145568f70b570038f6c202b5f1f..41ab5b01deafc44b1c526c883cd4438839c0e9d5 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -987,7 +987,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
        const char *line_prefix = diff_line_prefix(opt);
 
        context = opt->context;
        const char *line_prefix = diff_line_prefix(opt);
 
        context = opt->context;

-       userdiff = userdiff_find_by_path(elem->path);
+       userdiff = userdiff_find_by_path(opt->repo->index, elem->path);

        if (!userdiff)
                userdiff = userdiff_find_by_name("default");
        if (opt->flags.allow_textconv)
        if (!userdiff)
                userdiff = userdiff_find_by_name("default");
        if (opt->flags.allow_textconv)

diff --git a/diff.c b/diff.c
index 140d0e86df04438e6b19972cc1d46996672550db..5256b9eabc903db2a1290ac786032285cd9cda1c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2093,23 +2093,25 @@ static void diff_words_flush(struct emit_callback *ecbdata)
        }
 }
 
        }
 }
 

-static void diff_filespec_load_driver(struct diff_filespec *one)
+static void diff_filespec_load_driver(struct diff_filespec *one,
+                                     struct index_state *istate)

 {
        /* Use already-loaded driver */
        if (one->driver)
                return;
 
        if (S_ISREG(one->mode))
 {
        /* Use already-loaded driver */
        if (one->driver)
                return;
 
        if (S_ISREG(one->mode))

-               one->driver = userdiff_find_by_path(one->path);
+               one->driver = userdiff_find_by_path(istate, one->path);

 
        /* Fallback to default settings */
        if (!one->driver)
                one->driver = userdiff_find_by_name("default");
 }
 
 
        /* Fallback to default settings */
        if (!one->driver)
                one->driver = userdiff_find_by_name("default");
 }
 

-static const char *userdiff_word_regex(struct diff_filespec *one)
+static const char *userdiff_word_regex(struct diff_filespec *one,
+                                      struct index_state *istate)

 {
 {

-       diff_filespec_load_driver(one);
+       diff_filespec_load_driver(one, istate);

        return one->driver->word_regex;
 }
 
        return one->driver->word_regex;
 }
 


@@ -2132,9 +2134,9 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
                        xcalloc(1, sizeof(struct emitted_diff_symbols));
 
        if (!o->word_regex)
                        xcalloc(1, sizeof(struct emitted_diff_symbols));
 
        if (!o->word_regex)

-               o->word_regex = userdiff_word_regex(one);
+               o->word_regex = userdiff_word_regex(one, o->repo->index);

        if (!o->word_regex)
        if (!o->word_regex)

-               o->word_regex = userdiff_word_regex(two);
+               o->word_regex = userdiff_word_regex(two, o->repo->index);

        if (!o->word_regex)
                o->word_regex = diff_word_regex_cfg;
        if (o->word_regex) {
        if (!o->word_regex)
                o->word_regex = diff_word_regex_cfg;
        if (o->word_regex) {


@@ -3257,7 +3259,7 @@ int diff_filespec_is_binary(struct repository *r,
                            struct diff_filespec *one)
 {
        if (one->is_binary == -1) {
                            struct diff_filespec *one)
 {
        if (one->is_binary == -1) {

-               diff_filespec_load_driver(one);
+               diff_filespec_load_driver(one, r->index);

                if (one->driver->binary != -1)
                        one->is_binary = one->driver->binary;
                else {
                if (one->driver->binary != -1)
                        one->is_binary = one->driver->binary;
                else {


@@ -3273,9 +3275,10 @@ int diff_filespec_is_binary(struct repository *r,
        return one->is_binary;
 }
 
        return one->is_binary;
 }
 

-static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
+static const struct userdiff_funcname *
+diff_funcname_pattern(struct diff_options *o, struct diff_filespec *one)

 {
 {

-       diff_filespec_load_driver(one);
+       diff_filespec_load_driver(one, o->repo->index);

        return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
 }
 
        return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
 }
 


@@ -3287,12 +3290,13 @@ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const
                options->b_prefix = b;
 }
 
                options->b_prefix = b;
 }
 

-struct userdiff_driver *get_textconv(struct diff_filespec *one)
+struct userdiff_driver *get_textconv(struct index_state *istate,
+                                    struct diff_filespec *one)

 {
        if (!DIFF_FILE_VALID(one))
                return NULL;
 
 {
        if (!DIFF_FILE_VALID(one))
                return NULL;
 

-       diff_filespec_load_driver(one);
+       diff_filespec_load_driver(one, istate);

        return userdiff_get_textconv(one->driver);
 }
 
        return userdiff_get_textconv(one->driver);
 }
 


@@ -3342,8 +3346,8 @@ static void builtin_diff(const char *name_a,
        }
 
        if (o->flags.allow_textconv) {
        }
 
        if (o->flags.allow_textconv) {

-               textconv_one = get_textconv(one);
-               textconv_two = get_textconv(two);
+               textconv_one = get_textconv(o->repo->index, one);
+               textconv_two = get_textconv(o->repo->index, two);

        }
 
        /* Never use a non-valid filename anywhere if at all possible */
        }
 
        /* Never use a non-valid filename anywhere if at all possible */


@@ -3465,9 +3469,9 @@ static void builtin_diff(const char *name_a,
                mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
                mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
 
                mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
                mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
 

-               pe = diff_funcname_pattern(one);
+               pe = diff_funcname_pattern(o, one);

                if (!pe)
                if (!pe)

-                       pe = diff_funcname_pattern(two);
+                       pe = diff_funcname_pattern(o, two);

 
                memset(&xpp, 0, sizeof(xpp));
                memset(&xecfg, 0, sizeof(xecfg));
 
                memset(&xpp, 0, sizeof(xpp));
                memset(&xecfg, 0, sizeof(xecfg));


@@ -4223,7 +4227,9 @@ static void run_diff_cmd(const char *pgm,
 
 
        if (o->flags.allow_external) {
 
 
        if (o->flags.allow_external) {

-               struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
+               struct userdiff_driver *drv;
+
+               drv = userdiff_find_by_path(o->repo->index, attr_path);

                if (drv && drv->external)
                        pgm = drv->external;
        }
                if (drv && drv->external)
                        pgm = drv->external;
        }


@@ -6399,7 +6405,7 @@ int textconv_object(struct repository *r,
 
        df = alloc_filespec(path);
        fill_filespec(df, oid, oid_valid, mode);
 
        df = alloc_filespec(path);
        fill_filespec(df, oid, oid_valid, mode);

-       textconv = get_textconv(df);
+       textconv = get_textconv(r->index, df);

        if (!textconv) {
                free_filespec(df);
                return 0;
        if (!textconv) {
                free_filespec(df);
                return 0;

diff --git a/diff.h b/diff.h
index b88fccd2fb13b8bd7ae74d670b001ebb1980dc46..af261962240de8d1a1adfa62a8ff60b9d3ca0fd4 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -455,7 +455,8 @@ size_t fill_textconv(struct repository *r,
  * and only if it has textconv enabled (otherwise return NULL). The result
  * can be passed to fill_textconv().
  */
  * and only if it has textconv enabled (otherwise return NULL). The result
  * can be passed to fill_textconv().
  */

-struct userdiff_driver *get_textconv(struct diff_filespec *one);
+struct userdiff_driver *get_textconv(struct index_state *istate,
+                                    struct diff_filespec *one);

 
 /*
  * Prepare diff_filespec and convert it using diff textconv API
 
 /*
  * Prepare diff_filespec and convert it using diff textconv API

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 7a5cf446ff2d5e5313ba8c0984d439280e91abef..d2361e06a1e45a1bdb94d6f5d6d2c003ac587e30 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -139,8 +139,8 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
                return 0;
 
        if (o->flags.allow_textconv) {
                return 0;
 
        if (o->flags.allow_textconv) {

-               textconv_one = get_textconv(p->one);
-               textconv_two = get_textconv(p->two);
+               textconv_one = get_textconv(o->repo->index, p->one);
+               textconv_two = get_textconv(o->repo->index, p->two);

        }
 
        /*
        }
 
        /*

diff --git a/grep.c b/grep.c
index 6c0eede3a1f67c6b85e73a437bc8743f9d05719a..f6bd89e40b7f7a8442a6e0a302a1e6080df5afbd 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -11,7 +11,8 @@
 #include "help.h"
 
 static int grep_source_load(struct grep_source *gs);
 #include "help.h"
 
 static int grep_source_load(struct grep_source *gs);

-static int grep_source_is_binary(struct grep_source *gs);
+static int grep_source_is_binary(struct grep_source *gs,
+                                struct index_state *istate);

 
 static struct grep_opt grep_defaults;
 
 
 static struct grep_opt grep_defaults;
 


@@ -1547,7 +1548,7 @@ static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bo
 {
        xdemitconf_t *xecfg = opt->priv;
        if (xecfg && !xecfg->find_func) {
 {
        xdemitconf_t *xecfg = opt->priv;
        if (xecfg && !xecfg->find_func) {

-               grep_source_load_driver(gs);
+               grep_source_load_driver(gs, opt->repo->index);

                if (gs->driver->funcname.pattern) {
                        const struct userdiff_funcname *pe = &gs->driver->funcname;
                        xdiff_set_find_func(xecfg, pe->pattern, pe->cflags);
                if (gs->driver->funcname.pattern) {
                        const struct userdiff_funcname *pe = &gs->driver->funcname;
                        xdiff_set_find_func(xecfg, pe->pattern, pe->cflags);


@@ -1804,7 +1805,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
        opt->last_shown = 0;
 
        if (opt->allow_textconv) {
        opt->last_shown = 0;
 
        if (opt->allow_textconv) {

-               grep_source_load_driver(gs);
+               grep_source_load_driver(gs, opt->repo->index);

                /*
                 * We might set up the shared textconv cache data here, which
                 * is not thread-safe.
                /*
                 * We might set up the shared textconv cache data here, which
                 * is not thread-safe.


@@ -1821,11 +1822,11 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
        if (!textconv) {
                switch (opt->binary) {
                case GREP_BINARY_DEFAULT:
        if (!textconv) {
                switch (opt->binary) {
                case GREP_BINARY_DEFAULT:

-                       if (grep_source_is_binary(gs))
+                       if (grep_source_is_binary(gs, opt->repo->index))

                                binary_match_only = 1;
                        break;
                case GREP_BINARY_NOMATCH:
                                binary_match_only = 1;
                        break;
                case GREP_BINARY_NOMATCH:

-                       if (grep_source_is_binary(gs))
+                       if (grep_source_is_binary(gs, opt->repo->index))

                                return 0; /* Assume unmatch */
                        break;
                case GREP_BINARY_TEXT:
                                return 0; /* Assume unmatch */
                        break;
                case GREP_BINARY_TEXT:


@@ -2171,22 +2172,24 @@ static int grep_source_load(struct grep_source *gs)
        BUG("invalid grep_source type to load");
 }
 
        BUG("invalid grep_source type to load");
 }
 

-void grep_source_load_driver(struct grep_source *gs)
+void grep_source_load_driver(struct grep_source *gs,
+                            struct index_state *istate)

 {
        if (gs->driver)
                return;
 
        grep_attr_lock();
        if (gs->path)
 {
        if (gs->driver)
                return;
 
        grep_attr_lock();
        if (gs->path)

-               gs->driver = userdiff_find_by_path(gs->path);
+               gs->driver = userdiff_find_by_path(istate, gs->path);

        if (!gs->driver)
                gs->driver = userdiff_find_by_name("default");
        grep_attr_unlock();
 }
 
        if (!gs->driver)
                gs->driver = userdiff_find_by_name("default");
        grep_attr_unlock();
 }
 

-static int grep_source_is_binary(struct grep_source *gs)
+static int grep_source_is_binary(struct grep_source *gs,
+                                struct index_state *istate)

 {
 {

-       grep_source_load_driver(gs);
+       grep_source_load_driver(gs, istate);

        if (gs->driver->binary != -1)
                return gs->driver->binary;
 
        if (gs->driver->binary != -1)
                return gs->driver->binary;
 

diff --git a/grep.h b/grep.h
index 36511839718e992fc568863b9e8f967f105e2506..1a57d12b906fb07a9041f52b109dcdb4c7478bfa 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -220,7 +220,8 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
                      const void *identifier);
 void grep_source_clear_data(struct grep_source *gs);
 void grep_source_clear(struct grep_source *gs);
                      const void *identifier);
 void grep_source_clear_data(struct grep_source *gs);
 void grep_source_clear(struct grep_source *gs);

-void grep_source_load_driver(struct grep_source *gs);
+void grep_source_load_driver(struct grep_source *gs,
+                            struct index_state *istate);

 
 
 int grep_source(struct grep_opt *opt, struct grep_source *gs);
 
 
 int grep_source(struct grep_opt *opt, struct grep_source *gs);

diff --git a/line-range.c b/line-range.c
index 232c3909ec27d3079e9228d0fcf561ce6a349754..7fa0d8bba55ba7e1cc0281aa4c2e0ed57d958eec 100644 (file)
--- a/line-range.c
+++ b/line-range.c
@@ -198,7 +198,7 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
        anchor--; /* input is in human terms */
        start = nth_line_cb(cb_data, anchor);
 
        anchor--; /* input is in human terms */
        start = nth_line_cb(cb_data, anchor);
 

-       drv = userdiff_find_by_path(path);
+       drv = userdiff_find_by_path(&the_index, path);

        if (drv && drv->funcname.pattern) {
                const struct userdiff_funcname *pe = &drv->funcname;
                xecfg = xcalloc(1, sizeof(*xecfg));
        if (drv && drv->funcname.pattern) {
                const struct userdiff_funcname *pe = &drv->funcname;
                xecfg = xcalloc(1, sizeof(*xecfg));

diff --git a/userdiff.c b/userdiff.c
index f3f4be579c9810d0fcf94badd4bf21770b99c91b..c913232396d92c62e5cd8b6a8cb632d4e7b7ce80 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -270,7 +270,8 @@ struct userdiff_driver *userdiff_find_by_name(const char *name) {
        return userdiff_find_by_namelen(name, len);
 }
 
        return userdiff_find_by_namelen(name, len);
 }
 

-struct userdiff_driver *userdiff_find_by_path(const char *path)
+struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
+                                             const char *path)

 {
        static struct attr_check *check;
 
 {
        static struct attr_check *check;
 


@@ -278,7 +279,7 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)
                check = attr_check_initl("diff", NULL);
        if (!path)
                return NULL;
                check = attr_check_initl("diff", NULL);
        if (!path)
                return NULL;

-       if (git_check_attr(&the_index, path, check))
+       if (git_check_attr(istate, path, check))

                return NULL;
 
        if (ATTR_TRUE(check->items[0].value))
                return NULL;
 
        if (ATTR_TRUE(check->items[0].value))

diff --git a/userdiff.h b/userdiff.h
index 2ef0ce545278ea2f40526c42303c541736643bd5..b072bfe89a46efb47c2808b5469bdf1bbfb4cc63 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -3,6 +3,8 @@
 
 #include "notes-cache.h"
 
 
 #include "notes-cache.h"
 

+struct index_state;
+

 struct userdiff_funcname {
        const char *pattern;
        int cflags;
 struct userdiff_funcname {
        const char *pattern;
        int cflags;


@@ -21,7 +23,8 @@ struct userdiff_driver {
 
 int userdiff_config(const char *k, const char *v);
 struct userdiff_driver *userdiff_find_by_name(const char *name);
 
 int userdiff_config(const char *k, const char *v);
 struct userdiff_driver *userdiff_find_by_name(const char *name);

-struct userdiff_driver *userdiff_find_by_path(const char *path);
+struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
+                                             const char *path);

 
 /*
  * Initialize any textconv-related fields in the driver and return it, or NULL
 
 /*
  * Initialize any textconv-related fields in the driver and return it, or NULL