summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 3ed0a46..e6b957c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -25,33 +25,32 @@ static void print_line(char *line, int len)
25 class = "hunk"; 25 class = "hunk";
26 26
27 htmlf("<div class='%s'>", class); 27 htmlf("<div class='%s'>", class);
28 line[len-1] = '\0'; 28 line[len-1] = '\0';
29 html_txt(line); 29 html_txt(line);
30 html("</div>"); 30 html("</div>");
31 line[len-1] = c; 31 line[len-1] = c;
32} 32}
33 33
34static void header(unsigned char *sha1, char *path1, int mode1, 34static void header(unsigned char *sha1, char *path1, int mode1,
35 unsigned char *sha2, char *path2, int mode2) 35 unsigned char *sha2, char *path2, int mode2)
36{ 36{
37 char *abbrev1, *abbrev2; 37 char *abbrev1, *abbrev2;
38 int subproject; 38 int subproject;
39 39
40 subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); 40 subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
41 html("<tr><td>");
42 html("<div class='head'>"); 41 html("<div class='head'>");
43 html("diff --git a/"); 42 html("diff --git a/");
44 html_txt(path1); 43 html_txt(path1);
45 html(" b/"); 44 html(" b/");
46 html_txt(path2); 45 html_txt(path2);
47 46
48 if (is_null_sha1(sha1)) 47 if (is_null_sha1(sha1))
49 path1 = "dev/null"; 48 path1 = "dev/null";
50 if (is_null_sha1(sha2)) 49 if (is_null_sha1(sha2))
51 path2 = "dev/null"; 50 path2 = "dev/null";
52 51
53 if (mode1 == 0) 52 if (mode1 == 0)
54 htmlf("<br/>new file mode %.6o", mode2); 53 htmlf("<br/>new file mode %.6o", mode2);
55 54
56 if (mode2 == 0) 55 if (mode2 == 0)
57 htmlf("<br/>deleted file mode %.6o", mode1); 56 htmlf("<br/>deleted file mode %.6o", mode1);
@@ -89,53 +88,55 @@ static void filepair_cb(struct diff_filepair *pair)
89 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
90 cgit_print_error("Error running diff"); 89 cgit_print_error("Error running diff");
91} 90}
92 91
93void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) 92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
94{ 93{
95 unsigned char sha1[20], sha2[20]; 94 unsigned char sha1[20], sha2[20];
96 enum object_type type; 95 enum object_type type;
97 unsigned long size; 96 unsigned long size;
98 struct commit *commit; 97 struct commit *commit;
99 98
100 if (head && !old_hex && !new_hex) { 99 if (head && !old_hex && !new_hex) {
101 get_sha1(head, sha1); 100 get_sha1(head, sha1);
102 commit = lookup_commit_reference(sha1); 101 commit = lookup_commit_reference(sha1);
103 if (commit && !parse_commit(commit)) { 102 if (commit && !parse_commit(commit)) {
104 html("<table class='diff'>"); 103 html("<table class='diff'>");
104 html("<tr><td>");
105 cgit_diff_commit(commit, filepair_cb); 105 cgit_diff_commit(commit, filepair_cb);
106 html("</td></tr></table>"); 106 html("</td></tr>");
107 html("</table>");
107 } 108 }
108 return; 109 return;
109 } 110 }
110 111
111 get_sha1(old_hex, sha1); 112 get_sha1(old_hex, sha1);
112 get_sha1(new_hex, sha2); 113 get_sha1(new_hex, sha2);
113 114
114 type = sha1_object_info(sha1, &size); 115 type = sha1_object_info(sha1, &size);
115 if (type == OBJ_BAD) { 116 if (type == OBJ_BAD) {
116 type = sha1_object_info(sha2, &size); 117 type = sha1_object_info(sha2, &size);
117 if (type == OBJ_BAD) { 118 if (type == OBJ_BAD) {
118 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); 119 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
119 return; 120 return;
120 } 121 }
121 } 122 }
122 123
123 html("<table class='diff'>"); 124 html("<table class='diff'>");
124 switch(type) { 125 switch(type) {
125 case OBJ_BLOB: 126 case OBJ_BLOB:
126 html("<tr><td>"); 127 html("<tr><td>");
127 header(sha1, path, 0644, sha2, path, 0644); 128 header(sha1, path, 0644, sha2, path, 0644);
128 if (cgit_diff_files(sha1, sha2, print_line)) 129 if (cgit_diff_files(sha1, sha2, print_line))
129 cgit_print_error("Error running diff"); 130 cgit_print_error("Error running diff");
130 html("</tr></td>"); 131 html("</td></tr>");
131 break; 132 break;
132 case OBJ_TREE: 133 case OBJ_TREE:
133 cgit_diff_tree(sha1, sha2, filepair_cb); 134 cgit_diff_tree(sha1, sha2, filepair_cb);
134 break; 135 break;
135 default: 136 default:
136 cgit_print_error(fmt("Unhandled object type: %s", 137 cgit_print_error(fmt("Unhandled object type: %s",
137 typename(type))); 138 typename(type)));
138 break; 139 break;
139 } 140 }
140 html("</td></tr></table>"); 141 html("</table>");
141} 142}