neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit f9ff7df613b4ee86fe5914c4ae3400650882c03d
parent a2ddc10479ec463708e422ca5ce7ec02c22a7d02
Author: Lars Hjemli <hjemli@gmail.com>
Date:   Wed, 16 May 2007 00:58:35 +0200

Add support for commitdiff via h parameter

The commitdiff will be generated against the first parent, and the
diff page also gets the benefit of repo.defbranch.

Cleaned up some bad whitespace in cgit.h while at it.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

Diffstat:
Mcgit.c | 3++-
Mcgit.h | 11++++++-----
Mui-diff.c | 14+++++++++++++-
3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/cgit.c b/cgit.c @@ -120,7 +120,8 @@ static void cgit_print_repo_page(struct cacheitem *item) } else if (!strcmp(cgit_query_page, "view")) { cgit_print_view(cgit_query_sha1, cgit_query_path); } else if (!strcmp(cgit_query_page, "diff")) { - cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); + cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, + cgit_query_path); } else { cgit_print_error("Invalid request"); } diff --git a/cgit.h b/cgit.h @@ -157,7 +157,7 @@ extern int cache_exist(struct cacheitem *item); extern int cache_expired(struct cacheitem *item); extern char *cgit_repourl(const char *reponame); -extern char *cgit_pageurl(const char *reponame, const char *pagename, +extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); extern void cgit_print_error(char *msg); @@ -165,8 +165,8 @@ extern void cgit_print_date(unsigned long secs); extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_docend(); extern void cgit_print_pageheader(char *title, int show_search); -extern void cgit_print_snapshot_start(const char *mimetype, - const char *filename, +extern void cgit_print_snapshot_start(const char *mimetype, + const char *filename, struct cacheitem *item); extern void cgit_print_repolist(struct cacheitem *item); @@ -176,8 +176,9 @@ extern void cgit_print_view(const char *hex, char *path); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *rev, const char *hex, char *path); extern void cgit_print_commit(const char *hex); -extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path); -extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, +extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, + char *path); +extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, const char *format, const char *prefix, const char *filename); diff --git a/ui-diff.c b/ui-diff.c @@ -66,11 +66,23 @@ static void filepair_cb(struct diff_filepair *pair) html("</tr></td>"); } -void cgit_print_diff(const char *old_hex, const char *new_hex, char *path) +void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) { unsigned char sha1[20], sha2[20]; enum object_type type; unsigned long size; + struct commit *commit; + + if (head && !old_hex && !new_hex) { + get_sha1(head, sha1); + commit = lookup_commit_reference(sha1); + if (commit && !parse_commit(commit)) { + html("<table class='diff'>"); + cgit_diff_commit(commit, filepair_cb); + html("</td></tr></table>"); + } + return; + } get_sha1(old_hex, sha1); get_sha1(new_hex, sha2);