author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
commit | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (patch) (unidiff) | |
tree | 6da9ffb66ed0a68205e6644cb7e2b4652d6684be /ui-ssdiff.c | |
parent | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (diff) | |
parent | 0141b9f889bbaa1fe474f9a98dd377138ac73054 (diff) | |
download | cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.zip cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.gz cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.bz2 |
Merge branch 'br/misc'
* br/misc:
Use transparent background for the cgit logo
ssdiff: anchors for ssdiff
implement repo.logo and repo.logo-link
-rw-r--r-- | ui-ssdiff.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 408e620..2481585 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c | |||
@@ -1,27 +1,28 @@ | |||
1 | #include "cgit.h" | 1 | #include "cgit.h" |
2 | #include "html.h" | 2 | #include "html.h" |
3 | #include "ui-shared.h" | 3 | #include "ui-shared.h" |
4 | #include "ui-diff.h" | ||
4 | 5 | ||
5 | extern int use_ssdiff; | 6 | extern int use_ssdiff; |
6 | 7 | ||
7 | static int current_old_line, current_new_line; | 8 | static int current_old_line, current_new_line; |
8 | 9 | ||
9 | struct deferred_lines { | 10 | struct deferred_lines { |
10 | int line_no; | 11 | int line_no; |
11 | char *line; | 12 | char *line; |
12 | struct deferred_lines *next; | 13 | struct deferred_lines *next; |
13 | }; | 14 | }; |
14 | 15 | ||
15 | static struct deferred_lines *deferred_old, *deferred_old_last; | 16 | static struct deferred_lines *deferred_old, *deferred_old_last; |
16 | static struct deferred_lines *deferred_new, *deferred_new_last; | 17 | static struct deferred_lines *deferred_new, *deferred_new_last; |
17 | 18 | ||
18 | static char *longest_common_subsequence(char *A, char *B) | 19 | static char *longest_common_subsequence(char *A, char *B) |
19 | { | 20 | { |
20 | int i, j, ri; | 21 | int i, j, ri; |
21 | int m = strlen(A); | 22 | int m = strlen(A); |
22 | int n = strlen(B); | 23 | int n = strlen(B); |
23 | int L[m + 1][n + 1]; | 24 | int L[m + 1][n + 1]; |
24 | int tmp1, tmp2; | 25 | int tmp1, tmp2; |
25 | int lcs_length; | 26 | int lcs_length; |
26 | char *result; | 27 | char *result; |
27 | 28 | ||
@@ -170,74 +171,87 @@ static void print_part_with_lcs(char *class, char *line, char *lcs) | |||
170 | c[0] = line[i]; | 171 | c[0] = line[i]; |
171 | if (same) { | 172 | if (same) { |
172 | if (line[i] == lcs[j]) | 173 | if (line[i] == lcs[j]) |
173 | j += 1; | 174 | j += 1; |
174 | else { | 175 | else { |
175 | same = 0; | 176 | same = 0; |
176 | htmlf("<span class='%s'>", class); | 177 | htmlf("<span class='%s'>", class); |
177 | } | 178 | } |
178 | } else if (line[i] == lcs[j]) { | 179 | } else if (line[i] == lcs[j]) { |
179 | same = 1; | 180 | same = 1; |
180 | htmlf("</span>"); | 181 | htmlf("</span>"); |
181 | j += 1; | 182 | j += 1; |
182 | } | 183 | } |
183 | html_txt(c); | 184 | html_txt(c); |
184 | } | 185 | } |
185 | } | 186 | } |
186 | 187 | ||
187 | static void print_ssdiff_line(char *class, | 188 | static void print_ssdiff_line(char *class, |
188 | int old_line_no, | 189 | int old_line_no, |
189 | char *old_line, | 190 | char *old_line, |
190 | int new_line_no, | 191 | int new_line_no, |
191 | char *new_line, int individual_chars) | 192 | char *new_line, int individual_chars) |
192 | { | 193 | { |
193 | char *lcs = NULL; | 194 | char *lcs = NULL; |
195 | |||
194 | if (old_line) | 196 | if (old_line) |
195 | old_line = replace_tabs(old_line + 1); | 197 | old_line = replace_tabs(old_line + 1); |
196 | if (new_line) | 198 | if (new_line) |
197 | new_line = replace_tabs(new_line + 1); | 199 | new_line = replace_tabs(new_line + 1); |
198 | if (individual_chars && old_line && new_line) | 200 | if (individual_chars && old_line && new_line) |
199 | lcs = longest_common_subsequence(old_line, new_line); | 201 | lcs = longest_common_subsequence(old_line, new_line); |
200 | html("<tr>"); | 202 | html("<tr>\n"); |
201 | if (old_line_no > 0) | 203 | if (old_line_no > 0) { |
202 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 204 | struct diff_filespec *old_file = cgit_get_current_old_file(); |
203 | old_line_no, class); | 205 | char *lineno_str = fmt("n%d", old_line_no); |
204 | else if (old_line) | 206 | char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); |
207 | html("<td class='lineno'><a class='no' href='"); | ||
208 | html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str)); | ||
209 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
210 | html("</td>"); | ||
211 | htmlf("<td class='%s'>", class); | ||
212 | } else if (old_line) | ||
205 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 213 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
206 | else | 214 | else |
207 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | 215 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); |
208 | if (old_line) { | 216 | if (old_line) { |
209 | if (lcs) | 217 | if (lcs) |
210 | print_part_with_lcs("del", old_line, lcs); | 218 | print_part_with_lcs("del", old_line, lcs); |
211 | else | 219 | else |
212 | html_txt(old_line); | 220 | html_txt(old_line); |
213 | } | 221 | } |
214 | 222 | ||
215 | html("</td>"); | 223 | html("</td>\n"); |
216 | if (new_line_no > 0) | 224 | if (new_line_no > 0) { |
217 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 225 | struct diff_filespec *new_file = cgit_get_current_new_file(); |
218 | new_line_no, class); | 226 | char *lineno_str = fmt("n%d", new_line_no); |
219 | else if (new_line) | 227 | char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); |
228 | html("<td class='lineno'><a class='no' href='"); | ||
229 | html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str)); | ||
230 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
231 | html("</td>"); | ||
232 | htmlf("<td class='%s'>", class); | ||
233 | } else if (new_line) | ||
220 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 234 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
221 | else | 235 | else |
222 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); | 236 | htmlf("<td class='lineno'></td><td class='%s_dark'>", class); |
223 | if (new_line) { | 237 | if (new_line) { |
224 | if (lcs) | 238 | if (lcs) |
225 | print_part_with_lcs("add", new_line, lcs); | 239 | print_part_with_lcs("add", new_line, lcs); |
226 | else | 240 | else |
227 | html_txt(new_line); | 241 | html_txt(new_line); |
228 | } | 242 | } |
229 | 243 | ||
230 | html("</td></tr>"); | 244 | html("</td></tr>"); |
231 | if (lcs) | 245 | if (lcs) |
232 | free(lcs); | 246 | free(lcs); |
233 | if (new_line) | 247 | if (new_line) |
234 | free(new_line); | 248 | free(new_line); |
235 | if (old_line) | 249 | if (old_line) |
236 | free(old_line); | 250 | free(old_line); |
237 | } | 251 | } |
238 | 252 | ||
239 | static void print_deferred_old_lines() | 253 | static void print_deferred_old_lines() |
240 | { | 254 | { |
241 | struct deferred_lines *iter_old, *tmp; | 255 | struct deferred_lines *iter_old, *tmp; |
242 | iter_old = deferred_old; | 256 | iter_old = deferred_old; |
243 | while (iter_old) { | 257 | while (iter_old) { |