notes-cache.c: remove the_repository references

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/combine-diff.c b/combine-diff.c
index 10155e0ec8b18fa80ea96f90a508250bdc5bb9f0..3d796af3ca201cbcbbb1407fb5827481202f406c 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -991,7 +991,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
        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)

-               textconv = userdiff_get_textconv(userdiff);
+               textconv = userdiff_get_textconv(opt->repo, userdiff);

 
        /* Read the result of merge first */
        if (!working_tree_file)
 
        /* Read the result of merge first */
        if (!working_tree_file)

diff --git a/diff.c b/diff.c
index 8647db3d307c297448c91b328b1dabf19635fb94..1135377a7f09c7462bf6cf0c4a8906055c90426d 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3312,14 +3312,14 @@ 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 index_state *istate,
+struct userdiff_driver *get_textconv(struct repository *r,

                                     struct diff_filespec *one)
 {
        if (!DIFF_FILE_VALID(one))
                return NULL;
 
                                     struct diff_filespec *one)
 {
        if (!DIFF_FILE_VALID(one))
                return NULL;
 

-       diff_filespec_load_driver(one, istate);
-       return userdiff_get_textconv(one->driver);
+       diff_filespec_load_driver(one, r->index);
+       return userdiff_get_textconv(r, one->driver);

 }
 
 static void builtin_diff(const char *name_a,
 }
 
 static void builtin_diff(const char *name_a,


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

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

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


@@ -6436,7 +6436,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(r->index, df);
+       textconv = get_textconv(r, df);

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

diff --git a/diff.h b/diff.h
index 3197a976a4d9290ca8c98e94951c62b3abad84ef..412138ba085ccc3b998b704b2e6103db4313ed0d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -461,7 +461,7 @@ 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 index_state *istate,
+struct userdiff_driver *get_textconv(struct repository *r,

                                     struct diff_filespec *one);
 
 /*
                                     struct diff_filespec *one);
 
 /*

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d2361e06a1e45a1bdb94d6f5d6d2c003ac587e30..b815f1c4490ea969194376e976b1f91ca983a71e 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(o->repo->index, p->one);
-               textconv_two = get_textconv(o->repo->index, p->two);
+               textconv_one = get_textconv(o->repo, p->one);
+               textconv_two = get_textconv(o->repo, p->two);

        }
 
        /*
        }
 
        /*

diff --git a/grep.c b/grep.c
index f6bd89e40b7f7a8442a6e0a302a1e6080df5afbd..b05b2e61bbac357eae855695b97a0a1a5ef0c41a 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1811,7 +1811,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
                 * is not thread-safe.
                 */
                grep_attr_lock();
                 * is not thread-safe.
                 */
                grep_attr_lock();

-               textconv = userdiff_get_textconv(gs->driver);
+               textconv = userdiff_get_textconv(opt->repo, gs->driver);

                grep_attr_unlock();
        }
 
                grep_attr_unlock();
        }
 

diff --git a/notes-cache.c b/notes-cache.c
index d87e7ca91cdecb158ca93659fb58968e92b18b31..2473314d686858493c6730e895e7106e44a462f9 100644 (file)
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -5,7 +5,9 @@
 #include "commit.h"
 #include "refs.h"
 
 #include "commit.h"
 #include "refs.h"
 

-static int notes_cache_match_validity(const char *ref, const char *validity)
+static int notes_cache_match_validity(struct repository *r,
+                                     const char *ref,
+                                     const char *validity)

 {
        struct object_id oid;
        struct commit *commit;
 {
        struct object_id oid;
        struct commit *commit;


@@ -16,7 +18,7 @@ static int notes_cache_match_validity(const char *ref, const char *validity)
        if (read_ref(ref, &oid) < 0)
                return 0;
 
        if (read_ref(ref, &oid) < 0)
                return 0;
 

-       commit = lookup_commit_reference_gently(the_repository, &oid, 1);
+       commit = lookup_commit_reference_gently(r, &oid, 1);

        if (!commit)
                return 0;
 
        if (!commit)
                return 0;
 


@@ -30,8 +32,8 @@ static int notes_cache_match_validity(const char *ref, const char *validity)
        return ret;
 }
 
        return ret;
 }
 

-void notes_cache_init(struct notes_cache *c, const char *name,
-                    const char *validity)
+void notes_cache_init(struct repository *r, struct notes_cache *c,
+                     const char *name, const char *validity)

 {
        struct strbuf ref = STRBUF_INIT;
        int flags = NOTES_INIT_WRITABLE;
 {
        struct strbuf ref = STRBUF_INIT;
        int flags = NOTES_INIT_WRITABLE;


@@ -40,7 +42,7 @@ void notes_cache_init(struct notes_cache *c, const char *name,
        c->validity = xstrdup(validity);
 
        strbuf_addf(&ref, "refs/notes/%s", name);
        c->validity = xstrdup(validity);
 
        strbuf_addf(&ref, "refs/notes/%s", name);

-       if (!notes_cache_match_validity(ref.buf, validity))
+       if (!notes_cache_match_validity(r, ref.buf, validity))

                flags |= NOTES_INIT_EMPTY;
        init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
        strbuf_release(&ref);
                flags |= NOTES_INIT_EMPTY;
        init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
        strbuf_release(&ref);

diff --git a/notes-cache.h b/notes-cache.h
index aeeee8409d4320644a1f618f5cd25b815be52f1c..56f8c98e2445f036b1c3897dce976f419372cb61 100644 (file)
--- a/notes-cache.h
+++ b/notes-cache.h
@@ -3,13 +3,15 @@
 
 #include "notes.h"
 
 
 #include "notes.h"
 

+struct repository;
+

 struct notes_cache {
        struct notes_tree tree;
        char *validity;
 };
 
 struct notes_cache {
        struct notes_tree tree;
        char *validity;
 };
 

-void notes_cache_init(struct notes_cache *c, const char *name,
-                    const char *validity);
+void notes_cache_init(struct repository *r, struct notes_cache *c,
+                     const char *name, const char *validity);

 int notes_cache_write(struct notes_cache *c);
 
 char *notes_cache_get(struct notes_cache *c, struct object_id *oid, size_t
 int notes_cache_write(struct notes_cache *c);
 
 char *notes_cache_get(struct notes_cache *c, struct object_id *oid, size_t

diff --git a/userdiff.c b/userdiff.c
index 46d34cc2a436c6084531d39628d013785700e2ba..97007abe5b16f3fe0af70963ae728048f241659f 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -290,7 +290,8 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
        return userdiff_find_by_name(check->items[0].value);
 }
 
        return userdiff_find_by_name(check->items[0].value);
 }
 

-struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
+struct userdiff_driver *userdiff_get_textconv(struct repository *r,
+                                             struct userdiff_driver *driver)

 {
        if (!driver->textconv)
                return NULL;
 {
        if (!driver->textconv)
                return NULL;


@@ -300,7 +301,7 @@ struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
                struct strbuf name = STRBUF_INIT;
 
                strbuf_addf(&name, "textconv/%s", driver->name);
                struct strbuf name = STRBUF_INIT;
 
                strbuf_addf(&name, "textconv/%s", driver->name);

-               notes_cache_init(c, name.buf, driver->textconv);
+               notes_cache_init(r, c, name.buf, driver->textconv);

                driver->textconv_cache = c;
                strbuf_release(&name);
        }
                driver->textconv_cache = c;
                strbuf_release(&name);
        }

diff --git a/userdiff.h b/userdiff.h
index b072bfe89a46efb47c2808b5469bdf1bbfb4cc63..203057e13e508adaaef1394da9fb086284c79733 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -4,6 +4,7 @@
 #include "notes-cache.h"
 
 struct index_state;
 #include "notes-cache.h"
 
 struct index_state;

+struct repository;

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


@@ -30,6 +31,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
  * Initialize any textconv-related fields in the driver and return it, or NULL
  * if it does not have textconv enabled at all.
  */
  * Initialize any textconv-related fields in the driver and return it, or NULL
  * if it does not have textconv enabled at all.
  */

-struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
+struct userdiff_driver *userdiff_get_textconv(struct repository *r,
+                                             struct userdiff_driver *driver);

 
 #endif /* USERDIFF */
 
 #endif /* USERDIFF */