|
diff --git a/ui-diff.c b/ui-diff.c index 0dcabe9..7ff7e46 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -63,65 +63,65 @@ static void print_fileinfo(struct fileinfo *info) |
63 | break; |
63 | break; |
64 | case DIFF_STATUS_UNMERGED: |
64 | case DIFF_STATUS_UNMERGED: |
65 | class = "stg"; |
65 | class = "stg"; |
66 | break; |
66 | break; |
67 | default: |
67 | default: |
68 | die("bug: unhandled diff status %c", info->status); |
68 | die("bug: unhandled diff status %c", info->status); |
69 | } |
69 | } |
70 | |
70 | |
71 | html("<tr>"); |
71 | html("<tr>"); |
72 | htmlf("<td class='mode'>"); |
72 | htmlf("<td class='mode'>"); |
73 | if (is_null_sha1(info->new_sha1)) { |
73 | if (is_null_sha1(info->new_sha1)) { |
74 | cgit_print_filemode(info->old_mode); |
74 | cgit_print_filemode(info->old_mode); |
75 | } else { |
75 | } else { |
76 | cgit_print_filemode(info->new_mode); |
76 | cgit_print_filemode(info->new_mode); |
77 | } |
77 | } |
78 | |
78 | |
79 | if (info->old_mode != info->new_mode && |
79 | if (info->old_mode != info->new_mode && |
80 | !is_null_sha1(info->old_sha1) && |
80 | !is_null_sha1(info->old_sha1) && |
81 | !is_null_sha1(info->new_sha1)) { |
81 | !is_null_sha1(info->new_sha1)) { |
82 | html("<span class='modechange'>["); |
82 | html("<span class='modechange'>["); |
83 | cgit_print_filemode(info->old_mode); |
83 | cgit_print_filemode(info->old_mode); |
84 | html("]</span>"); |
84 | html("]</span>"); |
85 | } |
85 | } |
86 | htmlf("</td><td class='%s'>", class); |
86 | htmlf("</td><td class='%s'>", class); |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
88 | ctx.qry.sha2, info->new_path, 0); |
88 | ctx.qry.sha2, info->new_path, 0); |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
90 | htmlf(" (%s from %s)", |
90 | htmlf(" (%s from %s)", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
92 | info->old_path); |
92 | info->old_path); |
93 | html("</td><td class='right'>"); |
93 | html("</td><td class='right'>"); |
94 | if (info->binary) { |
94 | if (info->binary) { |
95 | htmlf("bin</td><td class='graph'>%d -> %d bytes", |
95 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", |
96 | info->old_size, info->new_size); |
96 | info->old_size, info->new_size); |
97 | return; |
97 | return; |
98 | } |
98 | } |
99 | htmlf("%d", info->added + info->removed); |
99 | htmlf("%d", info->added + info->removed); |
100 | html("</td><td class='graph'>"); |
100 | html("</td><td class='graph'>"); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
103 | info->added * 100.0 / max_changes); |
103 | info->added * 100.0 / max_changes); |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
105 | info->removed * 100.0 / max_changes); |
105 | info->removed * 100.0 / max_changes); |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
108 | html("</tr></table></td></tr>\n"); |
108 | html("</tr></table></td></tr>\n"); |
109 | } |
109 | } |
110 | |
110 | |
111 | static void count_diff_lines(char *line, int len) |
111 | static void count_diff_lines(char *line, int len) |
112 | { |
112 | { |
113 | if (line && (len > 0)) { |
113 | if (line && (len > 0)) { |
114 | if (line[0] == '+') |
114 | if (line[0] == '+') |
115 | lines_added++; |
115 | lines_added++; |
116 | else if (line[0] == '-') |
116 | else if (line[0] == '-') |
117 | lines_removed++; |
117 | lines_removed++; |
118 | } |
118 | } |
119 | } |
119 | } |
120 | |
120 | |
121 | static void inspect_filepair(struct diff_filepair *pair) |
121 | static void inspect_filepair(struct diff_filepair *pair) |
122 | { |
122 | { |
123 | int binary = 0; |
123 | int binary = 0; |
124 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
126 | files++; |
126 | files++; |
127 | lines_added = 0; |
127 | lines_added = 0; |
|