| -rw-r--r-- | ui-diff.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -79,53 +79,52 @@ int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf) } return 0; } static int load_mmfile(mmfile_t *file, const unsigned char *sha1) { char type[20]; if (is_null_sha1(sha1)) { file->ptr = (char *)""; file->size = 0; } else { file->ptr = read_sha1_file(sha1, type, &file->size); } return 1; } static void run_diff(const unsigned char *sha1, const unsigned char *sha2) { mmfile_t file1, file2; xpparam_t diff_params; xdemitconf_t emit_params; xdemitcb_t emit_cb; if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) { cgit_print_error("Unable to load files for diff"); return; } diff_params.flags = XDF_NEED_MINIMAL; emit_params.ctxlen = 3; emit_params.flags = XDL_EMIT_FUNCNAMES; emit_cb.outf = diff_cb; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); } void cgit_print_diff(const char *old_hex, const char *new_hex) { unsigned char sha1[20], sha2[20]; get_sha1(old_hex, sha1); get_sha1(new_hex, sha2); - html("<h2>diff</h2>\n"); html("<table class='diff'><tr><td>"); run_diff(sha1, sha2); html("</td></tr></table>"); } |