summaryrefslogtreecommitdiffabout
path: root/shared.c
Unidiff
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shared.c b/shared.c
index 89d1bab..a764c4d 100644
--- a/shared.c
+++ b/shared.c
@@ -222,100 +222,102 @@ char *diffbuf = NULL;
222int buflen = 0; 222int buflen = 0;
223 223
224int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 224int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
225{ 225{
226 int i; 226 int i;
227 227
228 for (i = 0; i < nbuf; i++) { 228 for (i = 0; i < nbuf; i++) {
229 if (mb[i].ptr[mb[i].size-1] != '\n') { 229 if (mb[i].ptr[mb[i].size-1] != '\n') {
230 /* Incomplete line */ 230 /* Incomplete line */
231 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 231 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
232 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 232 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
233 buflen += mb[i].size; 233 buflen += mb[i].size;
234 continue; 234 continue;
235 } 235 }
236 236
237 /* we have a complete line */ 237 /* we have a complete line */
238 if (!diffbuf) { 238 if (!diffbuf) {
239 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 239 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
240 continue; 240 continue;
241 } 241 }
242 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 242 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
243 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 243 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
244 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 244 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
245 free(diffbuf); 245 free(diffbuf);
246 diffbuf = NULL; 246 diffbuf = NULL;
247 buflen = 0; 247 buflen = 0;
248 } 248 }
249 if (diffbuf) { 249 if (diffbuf) {
250 ((linediff_fn)priv)(diffbuf, buflen); 250 ((linediff_fn)priv)(diffbuf, buflen);
251 free(diffbuf); 251 free(diffbuf);
252 diffbuf = NULL; 252 diffbuf = NULL;
253 buflen = 0; 253 buflen = 0;
254 } 254 }
255 return 0; 255 return 0;
256} 256}
257 257
258int cgit_diff_files(const unsigned char *old_sha1, 258int cgit_diff_files(const unsigned char *old_sha1,
259 const unsigned char *new_sha1, 259 const unsigned char *new_sha1,
260 linediff_fn fn) 260 linediff_fn fn)
261{ 261{
262 mmfile_t file1, file2; 262 mmfile_t file1, file2;
263 xpparam_t diff_params; 263 xpparam_t diff_params;
264 xdemitconf_t emit_params; 264 xdemitconf_t emit_params;
265 xdemitcb_t emit_cb; 265 xdemitcb_t emit_cb;
266 266
267 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 267 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
268 return 1; 268 return 1;
269 269
270 memset(&diff_params, 0, sizeof(diff_params));
271 memset(&emit_params, 0, sizeof(emit_params));
272 memset(&emit_cb, 0, sizeof(emit_cb));
270 diff_params.flags = XDF_NEED_MINIMAL; 273 diff_params.flags = XDF_NEED_MINIMAL;
271 emit_params.ctxlen = 3; 274 emit_params.ctxlen = 3;
272 emit_params.flags = XDL_EMIT_FUNCNAMES; 275 emit_params.flags = XDL_EMIT_FUNCNAMES;
273 emit_params.find_func = NULL;
274 emit_cb.outf = filediff_cb; 276 emit_cb.outf = filediff_cb;
275 emit_cb.priv = fn; 277 emit_cb.priv = fn;
276 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 278 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
277 return 0; 279 return 0;
278} 280}
279 281
280void cgit_diff_tree(const unsigned char *old_sha1, 282void cgit_diff_tree(const unsigned char *old_sha1,
281 const unsigned char *new_sha1, 283 const unsigned char *new_sha1,
282 filepair_fn fn, const char *prefix) 284 filepair_fn fn, const char *prefix)
283{ 285{
284 struct diff_options opt; 286 struct diff_options opt;
285 int ret; 287 int ret;
286 int prefixlen; 288 int prefixlen;
287 289
288 diff_setup(&opt); 290 diff_setup(&opt);
289 opt.output_format = DIFF_FORMAT_CALLBACK; 291 opt.output_format = DIFF_FORMAT_CALLBACK;
290 opt.detect_rename = 1; 292 opt.detect_rename = 1;
291 opt.rename_limit = ctx.cfg.renamelimit; 293 opt.rename_limit = ctx.cfg.renamelimit;
292 DIFF_OPT_SET(&opt, RECURSIVE); 294 DIFF_OPT_SET(&opt, RECURSIVE);
293 opt.format_callback = cgit_diff_tree_cb; 295 opt.format_callback = cgit_diff_tree_cb;
294 opt.format_callback_data = fn; 296 opt.format_callback_data = fn;
295 if (prefix) { 297 if (prefix) {
296 opt.nr_paths = 1; 298 opt.nr_paths = 1;
297 opt.paths = &prefix; 299 opt.paths = &prefix;
298 prefixlen = strlen(prefix); 300 prefixlen = strlen(prefix);
299 opt.pathlens = &prefixlen; 301 opt.pathlens = &prefixlen;
300 } 302 }
301 diff_setup_done(&opt); 303 diff_setup_done(&opt);
302 304
303 if (old_sha1 && !is_null_sha1(old_sha1)) 305 if (old_sha1 && !is_null_sha1(old_sha1))
304 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 306 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
305 else 307 else
306 ret = diff_root_tree_sha1(new_sha1, "", &opt); 308 ret = diff_root_tree_sha1(new_sha1, "", &opt);
307 diffcore_std(&opt); 309 diffcore_std(&opt);
308 diff_flush(&opt); 310 diff_flush(&opt);
309} 311}
310 312
311void cgit_diff_commit(struct commit *commit, filepair_fn fn) 313void cgit_diff_commit(struct commit *commit, filepair_fn fn)
312{ 314{
313 unsigned char *old_sha1 = NULL; 315 unsigned char *old_sha1 = NULL;
314 316
315 if (commit->parents) 317 if (commit->parents)
316 old_sha1 = commit->parents->item->object.sha1; 318 old_sha1 = commit->parents->item->object.sha1;
317 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 319 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
318} 320}
319 321
320int cgit_parse_snapshots_mask(const char *str) 322int cgit_parse_snapshots_mask(const char *str)
321{ 323{