mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit: move layout into page function

Browse Source 
This allows us to return a proper HTTP status code when an object is not
found by switching from cgit_print_error() to cgit_print_error_page().

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2015-08-14 12:47:13 +01:00 committed by Jason A. Donenfeld
parent 51d9176e4b
commit c53a15c77a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd.c
View File

@ -157,7 +157,7 @@ struct cgit_cmd *cgit_get_cmd(void)
def_cmd(atom, 1, 0, 0, 0), def_cmd(atom, 1, 0, 0, 0),
def_cmp(about, 0, 0, 0, 0), def_cmp(about, 0, 0, 0, 0),
def_cmd(blob, 1, 0, 0, 0), def_cmd(blob, 1, 0, 0, 0),
def_cmd(commit, 1, 1, 1, 0), def_cmd(commit, 1, 0, 1, 0),
def_cmd(diff, 1, 1, 1, 0), def_cmd(diff, 1, 1, 1, 0),
def_cmd(info, 1, 0, 0, 1), def_cmd(info, 1, 0, 0, 1),
def_cmd(log, 1, 1, 1, 0), def_cmd(log, 1, 1, 1, 0),

8
ui-commit.c
View File

@ -27,12 +27,14 @@ void cgit_print_commit(char *hex, const char *prefix)
hex = ctx.qry.head; hex = ctx.qry.head;
if (get_sha1(hex, sha1)) { if (get_sha1(hex, sha1)) {
cgit_print_error("Bad object id: %s", hex); cgit_print_error_page(400, "Bad request",
"Bad object id: %s", hex);
return; return;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
if (!commit) { if (!commit) {
cgit_print_error("Bad commit reference: %s", hex); cgit_print_error_page(404, "Not found",
"Bad commit reference: %s", hex);
return; return;
} }
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
@ -41,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix)
load_ref_decorations(DECORATE_FULL_REFS); load_ref_decorations(DECORATE_FULL_REFS);
cgit_print_layout_start();
cgit_print_diff_ctrls(); cgit_print_diff_ctrls();
html("<table summary='commit info' class='commit-info'>\n"); html("<table summary='commit info' class='commit-info'>\n");
html("<tr><th>author</th><td>"); html("<tr><th>author</th><td>");
@ -139,4 +142,5 @@ void cgit_print_commit(char *hex, const char *prefix)
} }
strbuf_release(&notes); strbuf_release(&notes);
cgit_free_commitinfo(info); cgit_free_commitinfo(info);
cgit_print_layout_end();
} }