diff options
-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 11 | ||||
-rw-r--r-- | ui-diff.c | 14 |
3 files changed, 21 insertions, 7 deletions
@@ -120,7 +120,8 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
120 | } else if (!strcmp(cgit_query_page, "view")) { | 120 | } else if (!strcmp(cgit_query_page, "view")) { |
121 | cgit_print_view(cgit_query_sha1, cgit_query_path); | 121 | cgit_print_view(cgit_query_sha1, cgit_query_path); |
122 | } else if (!strcmp(cgit_query_page, "diff")) { | 122 | } else if (!strcmp(cgit_query_page, "diff")) { |
123 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); | 123 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, |
124 | cgit_query_path); | ||
124 | } else { | 125 | } else { |
125 | cgit_print_error("Invalid request"); | 126 | cgit_print_error("Invalid request"); |
126 | } | 127 | } |
@@ -157,7 +157,7 @@ extern int cache_exist(struct cacheitem *item); | |||
157 | extern int cache_expired(struct cacheitem *item); | 157 | extern int cache_expired(struct cacheitem *item); |
158 | 158 | ||
159 | extern char *cgit_repourl(const char *reponame); | 159 | extern char *cgit_repourl(const char *reponame); |
160 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 160 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
161 | const char *query); | 161 | const char *query); |
162 | 162 | ||
163 | extern void cgit_print_error(char *msg); | 163 | extern void cgit_print_error(char *msg); |
@@ -165,8 +165,8 @@ extern void cgit_print_date(unsigned long secs); | |||
165 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 165 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
166 | extern void cgit_print_docend(); | 166 | extern void cgit_print_docend(); |
167 | extern void cgit_print_pageheader(char *title, int show_search); | 167 | extern void cgit_print_pageheader(char *title, int show_search); |
168 | extern void cgit_print_snapshot_start(const char *mimetype, | 168 | extern void cgit_print_snapshot_start(const char *mimetype, |
169 | const char *filename, | 169 | const char *filename, |
170 | struct cacheitem *item); | 170 | struct cacheitem *item); |
171 | 171 | ||
172 | extern void cgit_print_repolist(struct cacheitem *item); | 172 | extern void cgit_print_repolist(struct cacheitem *item); |
@@ -176,8 +176,9 @@ extern void cgit_print_view(const char *hex, char *path); | |||
176 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 176 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
177 | extern void cgit_print_tree(const char *rev, const char *hex, char *path); | 177 | extern void cgit_print_tree(const char *rev, const char *hex, char *path); |
178 | extern void cgit_print_commit(const char *hex); | 178 | extern void cgit_print_commit(const char *hex); |
179 | extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path); | 179 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, |
180 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 180 | char *path); |
181 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | ||
181 | const char *format, const char *prefix, | 182 | const char *format, const char *prefix, |
182 | const char *filename); | 183 | const char *filename); |
183 | 184 | ||
@@ -66,11 +66,23 @@ static void filepair_cb(struct diff_filepair *pair) | |||
66 | html("</tr></td>"); | 66 | html("</tr></td>"); |
67 | } | 67 | } |
68 | 68 | ||
69 | void cgit_print_diff(const char *old_hex, const char *new_hex, char *path) | 69 | void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) |
70 | { | 70 | { |
71 | unsigned char sha1[20], sha2[20]; | 71 | unsigned char sha1[20], sha2[20]; |
72 | enum object_type type; | 72 | enum object_type type; |
73 | unsigned long size; | 73 | unsigned long size; |
74 | struct commit *commit; | ||
75 | |||
76 | if (head && !old_hex && !new_hex) { | ||
77 | get_sha1(head, sha1); | ||
78 | commit = lookup_commit_reference(sha1); | ||
79 | if (commit && !parse_commit(commit)) { | ||
80 | html("<table class='diff'>"); | ||
81 | cgit_diff_commit(commit, filepair_cb); | ||
82 | html("</td></tr></table>"); | ||
83 | } | ||
84 | return; | ||
85 | } | ||
74 | 86 | ||
75 | get_sha1(old_hex, sha1); | 87 | get_sha1(old_hex, sha1); |
76 | get_sha1(new_hex, sha2); | 88 | get_sha1(new_hex, sha2); |