Skip to content

Commit bd7ad45

Browse files
pcloudsgitster
pclouds
authored and
gitster
committed
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>
1 parent 363df55 commit bd7ad45

File tree

9 files changed

+28
-21
lines changed

9 files changed

+28
-21
lines changed

‎combine-diff.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
991991
if (!userdiff)
992992
userdiff = userdiff_find_by_name("default");
993993
if (opt->flags.allow_textconv)
994-
textconv = userdiff_get_textconv(userdiff);
994+
textconv = userdiff_get_textconv(opt->repo, userdiff);
995995

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

‎diff.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,14 +3312,14 @@ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const
33123312
options->b_prefix = b;
33133313
}
33143314

3315-
struct userdiff_driver *get_textconv(struct index_state *istate,
3315+
struct userdiff_driver *get_textconv(struct repository *r,
33163316
struct diff_filespec *one)
33173317
{
33183318
if (!DIFF_FILE_VALID(one))
33193319
return NULL;
33203320

3321-
diff_filespec_load_driver(one, istate);
3322-
return userdiff_get_textconv(one->driver);
3321+
diff_filespec_load_driver(one, r->index);
3322+
return userdiff_get_textconv(r, one->driver);
33233323
}
33243324

33253325
static void builtin_diff(const char *name_a,
@@ -3368,8 +3368,8 @@ static void builtin_diff(const char *name_a,
33683368
}
33693369

33703370
if (o->flags.allow_textconv) {
3371-
textconv_one = get_textconv(o->repo->index, one);
3372-
textconv_two = get_textconv(o->repo->index, two);
3371+
textconv_one = get_textconv(o->repo, one);
3372+
textconv_two = get_textconv(o->repo, two);
33733373
}
33743374

33753375
/* Never use a non-valid filename anywhere if at all possible */
@@ -6436,7 +6436,7 @@ int textconv_object(struct repository *r,
64366436

64376437
df = alloc_filespec(path);
64386438
fill_filespec(df, oid, oid_valid, mode);
6439-
textconv = get_textconv(r->index, df);
6439+
textconv = get_textconv(r, df);
64406440
if (!textconv) {
64416441
free_filespec(df);
64426442
return 0;

‎diff.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ size_t fill_textconv(struct repository *r,
461461
* and only if it has textconv enabled (otherwise return NULL). The result
462462
* can be passed to fill_textconv().
463463
*/
464-
struct userdiff_driver *get_textconv(struct index_state *istate,
464+
struct userdiff_driver *get_textconv(struct repository *r,
465465
struct diff_filespec *one);
466466

467467
/*

‎diffcore-pickaxe.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
139139
return 0;
140140

141141
if (o->flags.allow_textconv) {
142-
textconv_one = get_textconv(o->repo->index, p->one);
143-
textconv_two = get_textconv(o->repo->index, p->two);
142+
textconv_one = get_textconv(o->repo, p->one);
143+
textconv_two = get_textconv(o->repo, p->two);
144144
}
145145

146146
/*

‎grep.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
18111811
* is not thread-safe.
18121812
*/
18131813
grep_attr_lock();
1814-
textconv = userdiff_get_textconv(gs->driver);
1814+
textconv = userdiff_get_textconv(opt->repo, gs->driver);
18151815
grep_attr_unlock();
18161816
}
18171817

‎notes-cache.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#include "commit.h"
66
#include "refs.h"
77

8-
static int notes_cache_match_validity(const char *ref, const char *validity)
8+
static int notes_cache_match_validity(struct repository *r,
9+
const char *ref,
10+
const char *validity)
911
{
1012
struct object_id oid;
1113
struct commit *commit;
@@ -16,7 +18,7 @@ static int notes_cache_match_validity(const char *ref, const char *validity)
1618
if (read_ref(ref, &oid) < 0)
1719
return 0;
1820

19-
commit = lookup_commit_reference_gently(the_repository, &oid, 1);
21+
commit = lookup_commit_reference_gently(r, &oid, 1);
2022
if (!commit)
2123
return 0;
2224

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

33-
void notes_cache_init(struct notes_cache *c, const char *name,
34-
const char *validity)
35+
void notes_cache_init(struct repository *r, struct notes_cache *c,
36+
const char *name, const char *validity)
3537
{
3638
struct strbuf ref = STRBUF_INIT;
3739
int flags = NOTES_INIT_WRITABLE;
@@ -40,7 +42,7 @@ void notes_cache_init(struct notes_cache *c, const char *name,
4042
c->validity = xstrdup(validity);
4143

4244
strbuf_addf(&ref, "refs/notes/%s", name);
43-
if (!notes_cache_match_validity(ref.buf, validity))
45+
if (!notes_cache_match_validity(r, ref.buf, validity))
4446
flags |= NOTES_INIT_EMPTY;
4547
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
4648
strbuf_release(&ref);

‎notes-cache.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33

44
#include "notes.h"
55

6+
struct repository;
7+
68
struct notes_cache {
79
struct notes_tree tree;
810
char *validity;
911
};
1012

11-
void notes_cache_init(struct notes_cache *c, const char *name,
12-
const char *validity);
13+
void notes_cache_init(struct repository *r, struct notes_cache *c,
14+
const char *name, const char *validity);
1315
int notes_cache_write(struct notes_cache *c);
1416

1517
char *notes_cache_get(struct notes_cache *c, struct object_id *oid, size_t

‎userdiff.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,8 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
290290
return userdiff_find_by_name(check->items[0].value);
291291
}
292292

293-
struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
293+
struct userdiff_driver *userdiff_get_textconv(struct repository *r,
294+
struct userdiff_driver *driver)
294295
{
295296
if (!driver->textconv)
296297
return NULL;
@@ -300,7 +301,7 @@ struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
300301
struct strbuf name = STRBUF_INIT;
301302

302303
strbuf_addf(&name, "textconv/%s", driver->name);
303-
notes_cache_init(c, name.buf, driver->textconv);
304+
notes_cache_init(r, c, name.buf, driver->textconv);
304305
driver->textconv_cache = c;
305306
strbuf_release(&name);
306307
}

‎userdiff.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "notes-cache.h"
55

66
struct index_state;
7+
struct repository;
78

89
struct userdiff_funcname {
910
const char *pattern;
@@ -30,6 +31,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
3031
* Initialize any textconv-related fields in the driver and return it, or NULL
3132
* if it does not have textconv enabled at all.
3233
*/
33-
struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
34+
struct userdiff_driver *userdiff_get_textconv(struct repository *r,
35+
struct userdiff_driver *driver);
3436

3537
#endif /* USERDIFF */

0 commit comments

Comments
 (0)