@matheusbsbs / matheus-bagliano / commits / bc6158981b

diffcore-pickaxe: remove unnecessary call to get_textconv()

The fill_one() function is responsible for finding and filling the textconv filter as necessary, and is called by diff_grep() function that implements "git log -G<pattern>". The has_changes() function that implements "git log -S<block>" calls get_textconv() for two sides being compared, before it checks to see if it was asked to perform the pickaxe limiting. Move the code around to avoid this wastage. After has_changes() calls get_textconv() to obtain textconv for both sides, fill_one() is called to use them. By adding get_textconv() to diff_grep() and relieving fill_one() of responsibility to find the textconv filter, we can avoid calling get_textconv() twice in has_changes(). With this change it's also no longer necessary for fill_one() to modify the textconv argument, therefore pass a pointer instead of a pointer to a pointer. Signed-off-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Simon Ruderich committed Apr 4, 2013 at 22:20 UTC bc6158981b547db3d3eb754213467fed97109d57

1 file changed +14 -9

diffcore-pickaxe.c

+14 -9

@@ -75,11 +75,10 @@ static void diffgrep_consume(void *priv, char *line, unsigned long len)

75 }

77 static void fill_one(struct diff_filespec *one,

78 - mmfile_t *mf, struct userdiff_driver **textconv)

78 + mmfile_t *mf, struct userdiff_driver *textconv)

79 {

80 if (DIFF_FILE_VALID(one)) {

81 - *textconv = get_textconv(one);

82 - mf->size = fill_textconv(*textconv, one, &mf->ptr);

81 + mf->size = fill_textconv(textconv, one, &mf->ptr);

82 } else {

83 memset(mf, 0, sizeof(*mf));

84 }

@@ -97,8 +96,11 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,

96 if (diff_unmodified_pair(p))

97 return 0;

100 - fill_one(p->one, &mf1, &textconv_one);

101 - fill_one(p->two, &mf2, &textconv_two);

99 + textconv_one = get_textconv(p->one);

100 + textconv_two = get_textconv(p->two);

101 +

102 + fill_one(p->one, &mf1, textconv_one);

103 + fill_one(p->two, &mf2, textconv_two);

104

105 if (!mf1.ptr) {

106 if (!mf2.ptr)

@@ -201,14 +203,17 @@ static unsigned int contains(mmfile_t *mf, struct diff_options *o,

203 static int has_changes(struct diff_filepair *p, struct diff_options *o,

204 regex_t *regexp, kwset_t kws)

205 {

204 - struct userdiff_driver *textconv_one = get_textconv(p->one);

205 - struct userdiff_driver *textconv_two = get_textconv(p->two);

206 + struct userdiff_driver *textconv_one = NULL;

207 + struct userdiff_driver *textconv_two = NULL;

208 mmfile_t mf1, mf2;

209 int ret;

210

211 if (!o->pickaxe[0])

212 return 0;

213

214 + textconv_one = get_textconv(p->one);

215 + textconv_two = get_textconv(p->two);

216 +

217 /*

218 * If we have an unmodified pair, we know that the count will be the

219 * same and don't even have to load the blobs. Unless textconv is in

@@ -219,8 +224,8 @@ static int has_changes(struct diff_filepair *p, struct diff_options *o,

224 if (textconv_one == textconv_two && diff_unmodified_pair(p))

225 return 0;

226

222 - fill_one(p->one, &mf1, &textconv_one);

223 - fill_one(p->two, &mf2, &textconv_two);

227 + fill_one(p->one, &mf1, textconv_one);

228 + fill_one(p->two, &mf2, textconv_two);

229

230 if (!mf1.ptr) {

231 if (!mf2.ptr)