-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 7 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-commit.c | 46 | ||||
-rw-r--r-- | ui-diff.c | 64 | ||||
-rw-r--r-- | ui-shared.c | 22 |
6 files changed, 75 insertions, 69 deletions
@@ -105,4 +105,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
105 | case CMD_DIFF: | 105 | case CMD_DIFF: |
106 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, | 106 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
107 | cgit_query_path); | ||
108 | break; | 107 | break; |
@@ -209,2 +209,4 @@ extern void cgit_commit_link(char *name, char *title, char *class, char *head, | |||
209 | char *rev); | 209 | char *rev); |
210 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | ||
211 | char *new_rev, char *old_rev, char *path); | ||
210 | 212 | ||
@@ -225,5 +227,4 @@ extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path) | |||
225 | extern void cgit_print_tree(const char *rev, char *path); | 227 | extern void cgit_print_tree(const char *rev, char *path); |
226 | extern void cgit_print_commit(const char *hex); | 228 | extern void cgit_print_commit(char *hex); |
227 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | 229 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); |
228 | char *path); | ||
229 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 230 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
@@ -362,3 +362,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
362 | 362 | ||
363 | if (old_sha1) | 363 | if (old_sha1 && !is_null_sha1(old_sha1)) |
364 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 364 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
diff --git a/ui-commit.c b/ui-commit.c index d489d7c..2679b59 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -13,2 +13,3 @@ static int total_adds, total_rems, max_changes; | |||
13 | static int lines_added, lines_removed; | 13 | static int lines_added, lines_removed; |
14 | static char *curr_rev; | ||
14 | 15 | ||
@@ -29,3 +30,2 @@ void print_fileinfo(struct fileinfo *info) | |||
29 | { | 30 | { |
30 | char *query, *query2; | ||
31 | char *class; | 31 | char *class; |
@@ -77,20 +77,8 @@ void print_fileinfo(struct fileinfo *info) | |||
77 | htmlf("</td><td class='%s'>", class); | 77 | htmlf("</td><td class='%s'>", class); |
78 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), | 78 | cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, |
79 | sha1_to_hex(info->new_sha1), info->new_path); | 79 | info->new_path); |
80 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 80 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
81 | NULL, NULL); | 81 | htmlf(" (%s from %s)", |
82 | if (info->status == DIFF_STATUS_COPIED || | 82 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
83 | info->status == DIFF_STATUS_RENAMED) { | 83 | info->old_path); |
84 | html_txt(info->new_path); | ||
85 | htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? | ||
86 | "copied" : "renamed"); | ||
87 | query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); | ||
88 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), | ||
89 | NULL, NULL); | ||
90 | html_txt(info->old_path); | ||
91 | html("</a>)"); | ||
92 | } else { | ||
93 | html_txt(info->new_path); | ||
94 | html("</a>"); | ||
95 | } | ||
96 | html("</td><td class='right'>"); | 84 | html("</td><td class='right'>"); |
@@ -147,3 +135,3 @@ void inspect_filepair(struct diff_filepair *pair) | |||
147 | 135 | ||
148 | void cgit_print_commit(const char *hex) | 136 | void cgit_print_commit(char *hex) |
149 | { | 137 | { |
@@ -153,3 +141,2 @@ void cgit_print_commit(const char *hex) | |||
153 | unsigned char sha1[20]; | 141 | unsigned char sha1[20]; |
154 | char *query; | ||
155 | char *filename; | 142 | char *filename; |
@@ -160,2 +147,3 @@ void cgit_print_commit(const char *hex) | |||
160 | hex = cgit_query_head; | 147 | hex = cgit_query_head; |
148 | curr_rev = hex; | ||
161 | 149 | ||
@@ -204,7 +192,6 @@ void cgit_print_commit(const char *hex) | |||
204 | cgit_query_head, sha1_to_hex(p->item->object.sha1)); | 192 | cgit_query_head, sha1_to_hex(p->item->object.sha1)); |
205 | html(" (<a href='"); | 193 | html(" ("); |
206 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), | 194 | cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, |
207 | sha1_to_hex(commit->tree->object.sha1)); | 195 | sha1_to_hex(p->item->object.sha1), NULL); |
208 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); | 196 | html(")</td></tr>"); |
209 | html("'>diff</a>)</td></tr>"); | ||
210 | } | 197 | } |
@@ -235,6 +222,5 @@ void cgit_print_commit(const char *hex) | |||
235 | files, total_adds, total_rems); | 222 | files, total_adds, total_rems); |
236 | query = fmt("h=%s", hex); | 223 | cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, |
237 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); | 224 | NULL, NULL); |
238 | html("show diff</a>)"); | 225 | html(")</div>"); |
239 | html("</div>"); | ||
240 | } | 226 | } |
@@ -91,3 +91,3 @@ static void filepair_cb(struct diff_filepair *pair) | |||
91 | 91 | ||
92 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) | 92 | void cgit_print_diff(const char *new_rev, const char *old_rev) |
93 | { | 93 | { |
@@ -96,16 +96,15 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
96 | unsigned long size; | 96 | unsigned long size; |
97 | struct commit *commit; | 97 | struct commit *commit, *commit2; |
98 | 98 | ||
99 | html("<table class='diff'>"); | 99 | if (!new_rev) |
100 | html("<tr><td>"); | 100 | new_rev = cgit_query_head; |
101 | 101 | get_sha1(new_rev, sha1); | |
102 | if (head && !old_hex && !new_hex) { | 102 | type = sha1_object_info(sha1, &size); |
103 | get_sha1(head, sha1); | 103 | if (type == OBJ_BAD) { |
104 | commit = lookup_commit_reference(sha1); | 104 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
105 | if (commit && !parse_commit(commit)) | 105 | return; |
106 | cgit_diff_commit(commit, filepair_cb); | 106 | } |
107 | else | 107 | if (type != OBJ_COMMIT) { |
108 | cgit_print_error(fmt("Bad commit: %s", head)); | 108 | cgit_print_error(fmt("Unhandled object type: %s", |
109 | html("</td></tr>"); | 109 | typename(type))); |
110 | html("</table>"); | ||
111 | return; | 110 | return; |
@@ -113,28 +112,27 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | |||
113 | 112 | ||
114 | get_sha1(old_hex, sha1); | 113 | commit = lookup_commit_reference(sha1); |
115 | get_sha1(new_hex, sha2); | 114 | if (!commit || parse_commit(commit)) |
115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); | ||
116 | 116 | ||
117 | type = sha1_object_info(sha1, &size); | 117 | if (old_rev) |
118 | if (type == OBJ_BAD) { | 118 | get_sha1(old_rev, sha2); |
119 | else if (commit->parents && commit->parents->item) | ||
120 | hashcpy(sha2, commit->parents->item->object.sha1); | ||
121 | else | ||
122 | hashclr(sha2); | ||
123 | |||
124 | if (!is_null_sha1(sha2)) { | ||
119 | type = sha1_object_info(sha2, &size); | 125 | type = sha1_object_info(sha2, &size); |
120 | if (type == OBJ_BAD) { | 126 | if (type == OBJ_BAD) { |
121 | cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); | 127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); |
122 | return; | 128 | return; |
123 | } | 129 | } |
130 | commit2 = lookup_commit_reference(sha2); | ||
131 | if (!commit2 || parse_commit(commit2)) | ||
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); | ||
124 | } | 133 | } |
125 | 134 | ||
126 | switch(type) { | 135 | html("<table class='diff'>"); |
127 | case OBJ_BLOB: | 136 | html("<tr><td>"); |
128 | header(sha1, path, 0644, sha2, path, 0644); | 137 | cgit_diff_tree(sha2, sha1, filepair_cb); |
129 | if (cgit_diff_files(sha1, sha2, print_line)) | ||
130 | cgit_print_error("Error running diff"); | ||
131 | break; | ||
132 | case OBJ_TREE: | ||
133 | cgit_diff_tree(sha1, sha2, filepair_cb); | ||
134 | break; | ||
135 | default: | ||
136 | cgit_print_error(fmt("Unhandled object type: %s", | ||
137 | typename(type))); | ||
138 | break; | ||
139 | } | ||
140 | html("</td></tr>"); | 138 | html("</td></tr>"); |
diff --git a/ui-shared.c b/ui-shared.c index 71c899a..15d8254 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -178,2 +178,24 @@ void cgit_commit_link(char *name, char *title, char *class, char *head, | |||
178 | 178 | ||
179 | void cgit_diff_link(char *name, char *title, char *class, char *head, | ||
180 | char *new_rev, char *old_rev, char *path) | ||
181 | { | ||
182 | char *delim; | ||
183 | |||
184 | delim = repolink(title, class, "diff", head, path); | ||
185 | if (new_rev && strcmp(new_rev, cgit_query_head)) { | ||
186 | html(delim); | ||
187 | html("id="); | ||
188 | html_attr(new_rev); | ||
189 | delim = "&"; | ||
190 | } | ||
191 | if (old_rev) { | ||
192 | html(delim); | ||
193 | html("id2="); | ||
194 | html_attr(old_rev); | ||
195 | } | ||
196 | html("'>"); | ||
197 | html_txt(name); | ||
198 | html("</a>"); | ||
199 | } | ||
200 | |||
179 | void cgit_print_date(time_t secs, char *format) | 201 | void cgit_print_date(time_t secs, char *format) |