]>
git.cameronkatri.com Git - cgit.git/blob - ui-diff.c
1 /* ui-diff.c: show diff between two blobs
3 * Copyright (C) 2006 Lars Hjemli
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
16 * print a single line returned from xdiff
18 static void print_line(char *line
, int len
)
25 else if (line
[0] == '-')
27 else if (line
[0] == '@')
30 htmlf("<div class='%s'>", class);
38 * Receive diff-buffers from xdiff and concatenate them as
39 * needed across multiple callbacks.
41 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
42 * ripped from git and modified to use globals instead of
43 * a special callback-struct.
45 int diff_cb(void *priv_
, mmbuffer_t
*mb
, int nbuf
)
49 for (i
= 0; i
< nbuf
; i
++) {
50 if (mb
[i
].ptr
[mb
[i
].size
-1] != '\n') {
52 diff_buffer
= xrealloc(diff_buffer
,
53 diff_buffer_size
+ mb
[i
].size
);
54 memcpy(diff_buffer
+ diff_buffer_size
,
55 mb
[i
].ptr
, mb
[i
].size
);
56 diff_buffer_size
+= mb
[i
].size
;
60 /* we have a complete line */
62 print_line(mb
[i
].ptr
, mb
[i
].size
);
65 diff_buffer
= xrealloc(diff_buffer
,
66 diff_buffer_size
+ mb
[i
].size
);
67 memcpy(diff_buffer
+ diff_buffer_size
, mb
[i
].ptr
, mb
[i
].size
);
68 print_line(diff_buffer
, diff_buffer_size
+ mb
[i
].size
);
74 print_line(diff_buffer
, diff_buffer_size
);
82 static int load_mmfile(mmfile_t
*file
, const unsigned char *sha1
)
84 enum object_type type
;
86 if (is_null_sha1(sha1
)) {
87 file
->ptr
= (char *)"
";
90 file->ptr = read_sha1_file(sha1, &type, &file->size);
95 static void run_diff(const unsigned char *sha1, const unsigned char *sha2)
97 mmfile_t file1, file2;
98 xpparam_t diff_params;
99 xdemitconf_t emit_params;
102 if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) {
103 cgit_print_error("Unable to load files
for diff
");
107 diff_params.flags = XDF_NEED_MINIMAL;
109 emit_params.ctxlen = 3;
110 emit_params.flags = XDL_EMIT_FUNCNAMES;
112 emit_cb.outf = diff_cb;
114 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
119 void cgit_print_diff(const char *old_hex, const char *new_hex)
121 unsigned char sha1[20], sha2[20];
123 get_sha1(old_hex, sha1);
124 get_sha1(new_hex, sha2);
126 html("<table
class='diff'><tr
><td
>");
127 run_diff(sha1, sha2);
128 html("</td
></tr
></table
>");