-rw-r--r-- | ui-commit.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/ui-commit.c b/ui-commit.c index b6a106f..8011dfc 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -8,49 +8,48 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | static int files, slots; | 11 | static int files, slots; |
12 | static int total_adds, total_rems, max_changes; | 12 | static int total_adds, total_rems, max_changes; |
13 | static int lines_added, lines_removed; | 13 | static int lines_added, lines_removed; |
14 | 14 | ||
15 | static struct fileinfo { | 15 | static struct fileinfo { |
16 | char status; | 16 | char status; |
17 | unsigned char old_sha1[20]; | 17 | unsigned char old_sha1[20]; |
18 | unsigned char new_sha1[20]; | 18 | unsigned char new_sha1[20]; |
19 | unsigned short old_mode; | 19 | unsigned short old_mode; |
20 | unsigned short new_mode; | 20 | unsigned short new_mode; |
21 | char *old_path; | 21 | char *old_path; |
22 | char *new_path; | 22 | char *new_path; |
23 | unsigned int added; | 23 | unsigned int added; |
24 | unsigned int removed; | 24 | unsigned int removed; |
25 | } *items; | 25 | } *items; |
26 | 26 | ||
27 | 27 | ||
28 | void print_fileinfo(struct fileinfo *info) | 28 | void print_fileinfo(struct fileinfo *info) |
29 | { | 29 | { |
30 | char *query, *query2; | 30 | char *query, *query2; |
31 | char *class; | 31 | char *class; |
32 | double width; | ||
33 | 32 | ||
34 | switch (info->status) { | 33 | switch (info->status) { |
35 | case DIFF_STATUS_ADDED: | 34 | case DIFF_STATUS_ADDED: |
36 | class = "add"; | 35 | class = "add"; |
37 | break; | 36 | break; |
38 | case DIFF_STATUS_COPIED: | 37 | case DIFF_STATUS_COPIED: |
39 | class = "cpy"; | 38 | class = "cpy"; |
40 | break; | 39 | break; |
41 | case DIFF_STATUS_DELETED: | 40 | case DIFF_STATUS_DELETED: |
42 | class = "del"; | 41 | class = "del"; |
43 | break; | 42 | break; |
44 | case DIFF_STATUS_MODIFIED: | 43 | case DIFF_STATUS_MODIFIED: |
45 | class = "upd"; | 44 | class = "upd"; |
46 | break; | 45 | break; |
47 | case DIFF_STATUS_RENAMED: | 46 | case DIFF_STATUS_RENAMED: |
48 | class = "mov"; | 47 | class = "mov"; |
49 | break; | 48 | break; |
50 | case DIFF_STATUS_TYPE_CHANGED: | 49 | case DIFF_STATUS_TYPE_CHANGED: |
51 | class = "typ"; | 50 | class = "typ"; |
52 | break; | 51 | break; |
53 | case DIFF_STATUS_UNKNOWN: | 52 | case DIFF_STATUS_UNKNOWN: |
54 | class = "unk"; | 53 | class = "unk"; |
55 | break; | 54 | break; |
56 | case DIFF_STATUS_UNMERGED: | 55 | case DIFF_STATUS_UNMERGED: |
@@ -75,60 +74,57 @@ void print_fileinfo(struct fileinfo *info) | |||
75 | html_filemode(info->old_mode); | 74 | html_filemode(info->old_mode); |
76 | html("]</span>"); | 75 | html("]</span>"); |
77 | } | 76 | } |
78 | htmlf("</td><td class='%s'>", class); | 77 | htmlf("</td><td class='%s'>", class); |
79 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), | 78 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), |
80 | sha1_to_hex(info->new_sha1), info->new_path); | 79 | sha1_to_hex(info->new_sha1), info->new_path); |
81 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 80 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), |
82 | NULL, NULL); | 81 | NULL, NULL); |
83 | if (info->status == DIFF_STATUS_COPIED || | 82 | if (info->status == DIFF_STATUS_COPIED || |
84 | info->status == DIFF_STATUS_RENAMED) { | 83 | info->status == DIFF_STATUS_RENAMED) { |
85 | html_txt(info->new_path); | 84 | html_txt(info->new_path); |
86 | htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? | 85 | htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? |
87 | "copied" : "renamed"); | 86 | "copied" : "renamed"); |
88 | query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); | 87 | query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); |
89 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), | 88 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), |
90 | NULL, NULL); | 89 | NULL, NULL); |
91 | html_txt(info->old_path); | 90 | html_txt(info->old_path); |
92 | html("</a>)"); | 91 | html("</a>)"); |
93 | } else { | 92 | } else { |
94 | html_txt(info->new_path); | 93 | html_txt(info->new_path); |
95 | html("</a>"); | 94 | html("</a>"); |
96 | } | 95 | } |
97 | html("</td><td class='right'>"); | 96 | html("</td><td class='right'>"); |
98 | htmlf("%d", info->added + info->removed); | 97 | htmlf("%d", info->added + info->removed); |
99 | |||
100 | html("</td><td class='graph'>"); | 98 | html("</td><td class='graph'>"); |
101 | width = (info->added + info->removed) * 100.0 / max_changes; | 99 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
102 | if (width < 0.1) | 100 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
103 | width = 0.1; | 101 | info->added * 100.0 / max_changes); |
104 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
105 | NULL, NULL); | 103 | info->removed * 100.0 / max_changes); |
106 | htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>", | 104 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
107 | info->added * width / (info->added + info->removed)); | 105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
108 | htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>", | 106 | html("</tr></table></a></td></tr>\n"); |
109 | info->removed * width / (info->added + info->removed)); | ||
110 | html("</a></td></tr>\n"); | ||
111 | } | 107 | } |
112 | 108 | ||
113 | void cgit_count_diff_lines(char *line, int len) | 109 | void cgit_count_diff_lines(char *line, int len) |
114 | { | 110 | { |
115 | if (line && (len > 0)) { | 111 | if (line && (len > 0)) { |
116 | if (line[0] == '+') | 112 | if (line[0] == '+') |
117 | lines_added++; | 113 | lines_added++; |
118 | else if (line[0] == '-') | 114 | else if (line[0] == '-') |
119 | lines_removed++; | 115 | lines_removed++; |
120 | } | 116 | } |
121 | } | 117 | } |
122 | 118 | ||
123 | void inspect_filepair(struct diff_filepair *pair) | 119 | void inspect_filepair(struct diff_filepair *pair) |
124 | { | 120 | { |
125 | files++; | 121 | files++; |
126 | lines_added = 0; | 122 | lines_added = 0; |
127 | lines_removed = 0; | 123 | lines_removed = 0; |
128 | cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); | 124 | cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); |
129 | if (files >= slots) { | 125 | if (files >= slots) { |
130 | if (slots == 0) | 126 | if (slots == 0) |
131 | slots = 4; | 127 | slots = 4; |
132 | else | 128 | else |
133 | slots = slots * 2; | 129 | slots = slots * 2; |
134 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 130 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |