git/diffcore-pickaxe.c at master · apang/git · GitHub

History

272 lines (234 loc) · 6.41 KB

Raw

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

168

169

170

171

172

173

174

175

176

177

178

179

180

181

182

183

184

185

186

187

188

189

190

191

192

193

194

195

196

197

198

199

200

201

202

203

204

205

206

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

#include "cache.h"

#include "diff.h"

#include "diffcore.h"

#include "xdiff-interface.h"

#include "kwset.h"

typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two,

struct diff_options *o,

regex_t *regexp, kwset_t kws);

static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,

regex_t *regexp, kwset_t kws, pickaxe_fn fn);

static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,

regex_t *regexp, kwset_t kws, pickaxe_fn fn)

{

int i;

struct diff_queue_struct outq;

DIFF_QUEUE_CLEAR(&outq);

if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {

/* Showing the whole changeset if needle exists */

for (i = 0; i < q->nr; i++) {

struct diff_filepair *p = q->queue[i];

if (pickaxe_match(p, o, regexp, kws, fn))

return; /* do not munge the queue */

}

* Otherwise we will clear the whole queue by copying

* the empty outq at the end of this function, but

* first clear the current entries in the queue.

for (i = 0; i < q->nr; i++)

diff_free_filepair(q->queue[i]);

} else {

/* Showing only the filepairs that has the needle */

for (i = 0; i < q->nr; i++) {

struct diff_filepair *p = q->queue[i];

if (pickaxe_match(p, o, regexp, kws, fn))

diff_q(&outq, p);

else

diff_free_filepair(p);

}

free(q->queue);

*q = outq;

}

struct diffgrep_cb {

regex_t *regexp;

int hit;

};

static void diffgrep_consume(void *priv, char *line, unsigned long len)

{

struct diffgrep_cb *data = priv;

regmatch_t regmatch;

int hold;

if (line[0] != '+' && line[0] != '-')

return;

if (data->hit)

* NEEDSWORK: we should have a way to terminate the

* caller early.

return;

/* Yuck -- line ought to be "const char *"! */

hold = line[len];

line[len] = '\0';

data->hit = !regexec(data->regexp, line + 1, 1, &regmatch, 0);

line[len] = hold;

}

static int diff_grep(mmfile_t *one, mmfile_t *two,

struct diff_options *o,

regex_t *regexp, kwset_t kws)

{

regmatch_t regmatch;

struct diffgrep_cb ecbdata;

xpparam_t xpp;

xdemitconf_t xecfg;

if (!one)

return !regexec(regexp, two->ptr, 1, &regmatch, 0);

if (!two)

return !regexec(regexp, one->ptr, 1, &regmatch, 0);

* We have both sides; need to run textual diff and see if

* the pattern appears on added/deleted lines.

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

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

ecbdata.regexp = regexp;

ecbdata.hit = 0;

xecfg.ctxlen = o->context;

xecfg.interhunkctxlen = o->interhunkcontext;

xdi_diff_outf(one, two, diffgrep_consume, &ecbdata,

&xpp, &xecfg);

return ecbdata.hit;

}

static void diffcore_pickaxe_grep(struct diff_options *o)

{

int err;

regex_t regex;

int cflags = REG_EXTENDED | REG_NEWLINE;

if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))

cflags |= REG_ICASE;

err = regcomp(&regex, o->pickaxe, cflags);

if (err) {

char errbuf[1024];

regerror(err, &regex, errbuf, 1024);

regfree(&regex);

die("invalid regex: %s", errbuf);

}

pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);

regfree(&regex);

return;

}

static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)

{

unsigned int cnt;

unsigned long sz;

const char *data;

sz = mf->size;

data = mf->ptr;

cnt = 0;

if (regexp) {

regmatch_t regmatch;

int flags = 0;

assert(data[sz] == '\0');

while (*data && !regexec(regexp, data, 1, &regmatch, flags)) {

flags |= REG_NOTBOL;

data += regmatch.rm_eo;

if (*data && regmatch.rm_so == regmatch.rm_eo)

data++;

cnt++;

}

} else { /* Classic exact string match */

while (sz) {

struct kwsmatch kwsm;

size_t offset = kwsexec(kws, data, sz, &kwsm);

const char *found;

if (offset == -1)

break;

else

found = data + offset;

sz -= found - data + kwsm.size[0];

data = found + kwsm.size[0];

cnt++;

}

return cnt;

}

static int has_changes(mmfile_t *one, mmfile_t *two,

struct diff_options *o,

regex_t *regexp, kwset_t kws)

{

unsigned int one_contains = one ? contains(one, regexp, kws) : 0;

unsigned int two_contains = two ? contains(two, regexp, kws) : 0;

return one_contains != two_contains;

}

static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,

regex_t *regexp, kwset_t kws, pickaxe_fn fn)

{

struct userdiff_driver *textconv_one = NULL;

struct userdiff_driver *textconv_two = NULL;

mmfile_t mf1, mf2;

int ret;

if (!o->pickaxe[0])

return 0;

/* ignore unmerged */

if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two))

return 0;

if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {

textconv_one = get_textconv(p->one);

textconv_two = get_textconv(p->two);

}

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

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

* play, _and_ we are using two different textconv filters (e.g.,

* because a pair is an exact rename with different textconv attributes

* for each side, which might generate different content).

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

return 0;

mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);

mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);

ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL,

DIFF_FILE_VALID(p->two) ? &mf2 : NULL,

o, regexp, kws);

if (textconv_one)

free(mf1.ptr);

if (textconv_two)

free(mf2.ptr);

diff_free_filespec_data(p->one);

diff_free_filespec_data(p->two);

return ret;

}

static void diffcore_pickaxe_count(struct diff_options *o)

{

const char *needle = o->pickaxe;

int opts = o->pickaxe_opts;

unsigned long len = strlen(needle);

regex_t regex, *regexp = NULL;

kwset_t kws = NULL;

if (opts & DIFF_PICKAXE_REGEX) {

int err;

err = regcomp(&regex, needle, REG_EXTENDED | REG_NEWLINE);

if (err) {

/* The POSIX.2 people are surely sick */

char errbuf[1024];

regerror(err, &regex, errbuf, 1024);

regfree(&regex);

die("invalid regex: %s", errbuf);

}

regexp = &regex;

} else {

kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE)

? tolower_trans_tbl : NULL);

kwsincr(kws, needle, len);

kwsprep(kws);

}

pickaxe(&diff_queued_diff, o, regexp, kws, has_changes);

if (opts & DIFF_PICKAXE_REGEX)

regfree(&regex);

else

kwsfree(kws);

return;

}

void diffcore_pickaxe(struct diff_options *o)

{

/* Might want to warn when both S and G are on; I don't care... */

if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)

diffcore_pickaxe_grep(o);

else

diffcore_pickaxe_count(o);

}

git/diffcore-pickaxe.c at master · apang/git · GitHub

Expand file tree

Breadcrumbs

diffcore-pickaxe.c

Latest commit

History

Breadcrumbs

diffcore-pickaxe.c

File metadata and controls