summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-04-07 22:50:20 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-04-07 22:50:20 (UTC)
commit023d933121ca7352a069f3886caf6fbe958ba27d (patch) (unidiff)
treeacd2c755148eacf0c0b542fb8c143b480514f66e
parentff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff)
parentce761fde0772236a11b41270f9254c515f724ad5 (diff)
downloadcgit-023d933121ca7352a069f3886caf6fbe958ba27d.zip
cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.gz
cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 5f46793..83b71e6 100644
--- a/shared.c
+++ b/shared.c
@@ -258,60 +258,68 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
258 diffbuf = NULL; 258 diffbuf = NULL;
259 buflen = 0; 259 buflen = 0;
260 } 260 }
261 return 0; 261 return 0;
262} 262}
263 263
264int cgit_diff_files(const unsigned char *old_sha1, 264int cgit_diff_files(const unsigned char *old_sha1,
265 const unsigned char *new_sha1, unsigned long *old_size, 265 const unsigned char *new_sha1, unsigned long *old_size,
266 unsigned long *new_size, int *binary, linediff_fn fn) 266 unsigned long *new_size, int *binary, linediff_fn fn)
267{ 267{
268 mmfile_t file1, file2; 268 mmfile_t file1, file2;
269 xpparam_t diff_params; 269 xpparam_t diff_params;
270 xdemitconf_t emit_params; 270 xdemitconf_t emit_params;
271 xdemitcb_t emit_cb; 271 xdemitcb_t emit_cb;
272 272
273 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 273 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
274 return 1; 274 return 1;
275 275
276 *old_size = file1.size; 276 *old_size = file1.size;
277 *new_size = file2.size; 277 *new_size = file2.size;
278 278
279 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || 279 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
280 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { 280 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
281 *binary = 1; 281 *binary = 1;
282 if (file1.size)
283 free(file1.ptr);
284 if (file2.size)
285 free(file2.ptr);
282 return 0; 286 return 0;
283 } 287 }
284 288
285 memset(&diff_params, 0, sizeof(diff_params)); 289 memset(&diff_params, 0, sizeof(diff_params));
286 memset(&emit_params, 0, sizeof(emit_params)); 290 memset(&emit_params, 0, sizeof(emit_params));
287 memset(&emit_cb, 0, sizeof(emit_cb)); 291 memset(&emit_cb, 0, sizeof(emit_cb));
288 diff_params.flags = XDF_NEED_MINIMAL; 292 diff_params.flags = XDF_NEED_MINIMAL;
289 emit_params.ctxlen = 3; 293 emit_params.ctxlen = 3;
290 emit_params.flags = XDL_EMIT_FUNCNAMES; 294 emit_params.flags = XDL_EMIT_FUNCNAMES;
291 emit_cb.outf = filediff_cb; 295 emit_cb.outf = filediff_cb;
292 emit_cb.priv = fn; 296 emit_cb.priv = fn;
293 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 297 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
298 if (file1.size)
299 free(file1.ptr);
300 if (file2.size)
301 free(file2.ptr);
294 return 0; 302 return 0;
295} 303}
296 304
297void cgit_diff_tree(const unsigned char *old_sha1, 305void cgit_diff_tree(const unsigned char *old_sha1,
298 const unsigned char *new_sha1, 306 const unsigned char *new_sha1,
299 filepair_fn fn, const char *prefix) 307 filepair_fn fn, const char *prefix)
300{ 308{
301 struct diff_options opt; 309 struct diff_options opt;
302 int ret; 310 int ret;
303 int prefixlen; 311 int prefixlen;
304 312
305 diff_setup(&opt); 313 diff_setup(&opt);
306 opt.output_format = DIFF_FORMAT_CALLBACK; 314 opt.output_format = DIFF_FORMAT_CALLBACK;
307 opt.detect_rename = 1; 315 opt.detect_rename = 1;
308 opt.rename_limit = ctx.cfg.renamelimit; 316 opt.rename_limit = ctx.cfg.renamelimit;
309 DIFF_OPT_SET(&opt, RECURSIVE); 317 DIFF_OPT_SET(&opt, RECURSIVE);
310 opt.format_callback = cgit_diff_tree_cb; 318 opt.format_callback = cgit_diff_tree_cb;
311 opt.format_callback_data = fn; 319 opt.format_callback_data = fn;
312 if (prefix) { 320 if (prefix) {
313 opt.nr_paths = 1; 321 opt.nr_paths = 1;
314 opt.paths = &prefix; 322 opt.paths = &prefix;
315 prefixlen = strlen(prefix); 323 prefixlen = strlen(prefix);
316 opt.pathlens = &prefixlen; 324 opt.pathlens = &prefixlen;
317 } 325 }