author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 12:21:46 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 12:21:46 (UTC) |
commit | 38a0f9cd89c4c5a97bd5b38e7b56da809a00fccb (patch) (unidiff) | |
tree | 3cacd4964b158316f1d7ceff2be88e79deaf79df /ui-diff.c | |
parent | c4ef667961ef4668c9449124f97d55b9ac46c059 (diff) | |
download | cgit-38a0f9cd89c4c5a97bd5b38e7b56da809a00fccb.zip cgit-38a0f9cd89c4c5a97bd5b38e7b56da809a00fccb.tar.gz cgit-38a0f9cd89c4c5a97bd5b38e7b56da809a00fccb.tar.bz2 |
Simplify ui-diff.c using the new file-level diff interface
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 88 |
1 files changed, 2 insertions, 86 deletions
@@ -8,9 +8,6 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | char *diff_buffer; | ||
12 | int diff_buffer_size; | ||
13 | |||
14 | 11 | ||
15 | /* | 12 | /* |
16 | * print a single line returned from xdiff | 13 | * print a single line returned from xdiff |
@@ -34,88 +31,6 @@ static void print_line(char *line, int len) | |||
34 | line[len-1] = c; | 31 | line[len-1] = c; |
35 | } | 32 | } |
36 | 33 | ||
37 | /* | ||
38 | * Receive diff-buffers from xdiff and concatenate them as | ||
39 | * needed across multiple callbacks. | ||
40 | * | ||
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. | ||
44 | */ | ||
45 | int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf) | ||
46 | { | ||
47 | int i; | ||
48 | |||
49 | for (i = 0; i < nbuf; i++) { | ||
50 | if (mb[i].ptr[mb[i].size-1] != '\n') { | ||
51 | /* Incomplete line */ | ||
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; | ||
57 | continue; | ||
58 | } | ||
59 | |||
60 | /* we have a complete line */ | ||
61 | if (!diff_buffer) { | ||
62 | print_line(mb[i].ptr, mb[i].size); | ||
63 | continue; | ||
64 | } | ||
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); | ||
69 | free(diff_buffer); | ||
70 | diff_buffer = NULL; | ||
71 | diff_buffer_size = 0; | ||
72 | } | ||
73 | if (diff_buffer) { | ||
74 | print_line(diff_buffer, diff_buffer_size); | ||
75 | free(diff_buffer); | ||
76 | diff_buffer = NULL; | ||
77 | diff_buffer_size = 0; | ||
78 | } | ||
79 | return 0; | ||
80 | } | ||
81 | |||
82 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | ||
83 | { | ||
84 | enum object_type type; | ||
85 | |||
86 | if (is_null_sha1(sha1)) { | ||
87 | file->ptr = (char *)""; | ||
88 | file->size = 0; | ||
89 | } else { | ||
90 | file->ptr = read_sha1_file(sha1, &type, &file->size); | ||
91 | } | ||
92 | return 1; | ||
93 | } | ||
94 | |||
95 | static void run_diff(const unsigned char *sha1, const unsigned char *sha2) | ||
96 | { | ||
97 | mmfile_t file1, file2; | ||
98 | xpparam_t diff_params; | ||
99 | xdemitconf_t emit_params; | ||
100 | xdemitcb_t emit_cb; | ||
101 | |||
102 | if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) { | ||
103 | cgit_print_error("Unable to load files for diff"); | ||
104 | return; | ||
105 | } | ||
106 | |||
107 | diff_params.flags = XDF_NEED_MINIMAL; | ||
108 | |||
109 | emit_params.ctxlen = 3; | ||
110 | emit_params.flags = XDL_EMIT_FUNCNAMES; | ||
111 | |||
112 | emit_cb.outf = diff_cb; | ||
113 | |||
114 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | ||
115 | } | ||
116 | |||
117 | |||
118 | |||
119 | void cgit_print_diff(const char *old_hex, const char *new_hex) | 34 | void cgit_print_diff(const char *old_hex, const char *new_hex) |
120 | { | 35 | { |
121 | unsigned char sha1[20], sha2[20]; | 36 | unsigned char sha1[20], sha2[20]; |
@@ -124,6 +39,7 @@ void cgit_print_diff(const char *old_hex, const char *new_hex) | |||
124 | get_sha1(new_hex, sha2); | 39 | get_sha1(new_hex, sha2); |
125 | 40 | ||
126 | html("<table class='diff'><tr><td>"); | 41 | html("<table class='diff'><tr><td>"); |
127 | run_diff(sha1, sha2); | 42 | if (cgit_diff_files(sha1, sha2, print_line)) |
43 | cgit_print_error("Error running diff"); | ||
128 | html("</td></tr></table>"); | 44 | html("</td></tr></table>"); |
129 | } | 45 | } |