author | Lars Hjemli <hjemli@gmail.com> | 2008-02-23 21:45:33 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-18 07:13:10 (UTC) |
commit | b1f9b9c1459cb9a30ebf80721aff6ef788d1f891 (patch) (unidiff) | |
tree | 05796a741faef90c12aadd3a5c92b702ec870c48 /ui-diff.c | |
parent | b88fb016d0209f7041ac7d3b4d2c077318407a4d (diff) | |
download | cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.zip cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.gz cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.bz2 |
Introduce html.h
All html-functions can be quite easily separated from the rest of cgit, so
lets do it; the only issue was html_filemode which uses some git-defined
macros so the function is moved into ui-shared.c::cgit_print_filemode().
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,74 +1,74 @@ | |||
1 | /* ui-diff.c: show diff between two blobs | 1 | /* ui-diff.c: show diff between two blobs |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | #include "html.h" | |
11 | 11 | ||
12 | unsigned char old_rev_sha1[20]; | 12 | unsigned char old_rev_sha1[20]; |
13 | unsigned char new_rev_sha1[20]; | 13 | unsigned char new_rev_sha1[20]; |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * print a single line returned from xdiff | 16 | * print a single line returned from xdiff |
17 | */ | 17 | */ |
18 | static void print_line(char *line, int len) | 18 | static void print_line(char *line, int len) |
19 | { | 19 | { |
20 | char *class = "ctx"; | 20 | char *class = "ctx"; |
21 | char c = line[len-1]; | 21 | char c = line[len-1]; |
22 | 22 | ||
23 | if (line[0] == '+') | 23 | if (line[0] == '+') |
24 | class = "add"; | 24 | class = "add"; |
25 | else if (line[0] == '-') | 25 | else if (line[0] == '-') |
26 | class = "del"; | 26 | class = "del"; |
27 | else if (line[0] == '@') | 27 | else if (line[0] == '@') |
28 | class = "hunk"; | 28 | class = "hunk"; |
29 | 29 | ||
30 | htmlf("<div class='%s'>", class); | 30 | htmlf("<div class='%s'>", class); |
31 | line[len-1] = '\0'; | 31 | line[len-1] = '\0'; |
32 | html_txt(line); | 32 | html_txt(line); |
33 | html("</div>"); | 33 | html("</div>"); |
34 | line[len-1] = c; | 34 | line[len-1] = c; |
35 | } | 35 | } |
36 | 36 | ||
37 | static void header(unsigned char *sha1, char *path1, int mode1, | 37 | static void header(unsigned char *sha1, char *path1, int mode1, |
38 | unsigned char *sha2, char *path2, int mode2) | 38 | unsigned char *sha2, char *path2, int mode2) |
39 | { | 39 | { |
40 | char *abbrev1, *abbrev2; | 40 | char *abbrev1, *abbrev2; |
41 | int subproject; | 41 | int subproject; |
42 | 42 | ||
43 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 43 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
44 | html("<div class='head'>"); | 44 | html("<div class='head'>"); |
45 | html("diff --git a/"); | 45 | html("diff --git a/"); |
46 | html_txt(path1); | 46 | html_txt(path1); |
47 | html(" b/"); | 47 | html(" b/"); |
48 | html_txt(path2); | 48 | html_txt(path2); |
49 | 49 | ||
50 | if (is_null_sha1(sha1)) | 50 | if (is_null_sha1(sha1)) |
51 | path1 = "dev/null"; | 51 | path1 = "dev/null"; |
52 | if (is_null_sha1(sha2)) | 52 | if (is_null_sha1(sha2)) |
53 | path2 = "dev/null"; | 53 | path2 = "dev/null"; |
54 | 54 | ||
55 | if (mode1 == 0) | 55 | if (mode1 == 0) |
56 | htmlf("<br/>new file mode %.6o", mode2); | 56 | htmlf("<br/>new file mode %.6o", mode2); |
57 | 57 | ||
58 | if (mode2 == 0) | 58 | if (mode2 == 0) |
59 | htmlf("<br/>deleted file mode %.6o", mode1); | 59 | htmlf("<br/>deleted file mode %.6o", mode1); |
60 | 60 | ||
61 | if (!subproject) { | 61 | if (!subproject) { |
62 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 62 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
63 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 63 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
64 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); | 64 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
65 | free(abbrev1); | 65 | free(abbrev1); |
66 | free(abbrev2); | 66 | free(abbrev2); |
67 | if (mode1 != 0 && mode2 != 0) { | 67 | if (mode1 != 0 && mode2 != 0) { |
68 | htmlf(" %.6o", mode1); | 68 | htmlf(" %.6o", mode1); |
69 | if (mode2 != mode1) | 69 | if (mode2 != mode1) |
70 | htmlf("..%.6o", mode2); | 70 | htmlf("..%.6o", mode2); |
71 | } | 71 | } |
72 | html("<br/>--- a/"); | 72 | html("<br/>--- a/"); |
73 | if (mode1 != 0) | 73 | if (mode1 != 0) |
74 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, | 74 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |