crtxcr/cgitsb
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri Sürüm Wiki Aktivite

diff: move layout to page function

Kaynağa Gözat 
The existing "show_ctrls" flag is used to control whether we are running
in an existing page or control the page ourselves.

Signed-off-by: John Keeping <john@keeping.me.uk>
Bu işleme şunda yer alıyor:
John Keeping 2015-08-14 12:47:14 +01:00 işlemeyi yapan: Jason A. Donenfeld
ebeveyn c53a15c77a
işleme 3b220eb22d
2 değiştirilmiş dosya ile 15 ekleme ve 6 silme
İstatistikleri Göster Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

2
cmd.c
Dosyayı Görüntüle

@ -158,7 +158,7 @@ struct cgit_cmd *cgit_get_cmd(void)
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, 0, 1, 0), def_cmd(commit, 1, 0, 1, 0),
def_cmd(diff, 1, 1, 1, 0), def_cmd(diff, 1, 0, 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),
def_cmd(ls_cache, 0, 0, 0, 0), def_cmd(ls_cache, 0, 0, 0, 0),

19
ui-diff.c
Dosyayı Görüntüle

@ -403,19 +403,22 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
if (!new_rev) if (!new_rev)
new_rev = ctx.qry.head; new_rev = ctx.qry.head;
if (get_sha1(new_rev, new_rev_sha1)) { if (get_sha1(new_rev, new_rev_sha1)) {
cgit_print_error("Bad object name: %s", new_rev); cgit_print_error_page(404, "Not found",
"Bad object name: %s", new_rev);
return; return;
} }
commit = lookup_commit_reference(new_rev_sha1); commit = lookup_commit_reference(new_rev_sha1);
if (!commit || parse_commit(commit)) { if (!commit || parse_commit(commit)) {
cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1)); cgit_print_error_page(404, "Not found",
"Bad commit: %s", sha1_to_hex(new_rev_sha1));
return; return;
} }
new_tree_sha1 = commit->tree->object.sha1; new_tree_sha1 = commit->tree->object.sha1;
if (old_rev) { if (old_rev) {
if (get_sha1(old_rev, old_rev_sha1)) { if (get_sha1(old_rev, old_rev_sha1)) {
cgit_print_error("Bad object name: %s", old_rev); cgit_print_error_page(404, "Not found",
"Bad object name: %s", old_rev);
return; return;
} }
} else if (commit->parents && commit->parents->item) { } else if (commit->parents && commit->parents->item) {
@ -427,7 +430,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
if (!is_null_sha1(old_rev_sha1)) { if (!is_null_sha1(old_rev_sha1)) {
commit2 = lookup_commit_reference(old_rev_sha1); commit2 = lookup_commit_reference(old_rev_sha1);
if (!commit2 || parse_commit(commit2)) { if (!commit2 || parse_commit(commit2)) {
cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1)); cgit_print_error_page(404, "Not found",
"Bad commit: %s", sha1_to_hex(old_rev_sha1));
return; return;
} }
old_tree_sha1 = commit2->tree->object.sha1; old_tree_sha1 = commit2->tree->object.sha1;
@ -460,8 +464,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype; difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
use_ssdiff = difftype == DIFF_SSDIFF; use_ssdiff = difftype == DIFF_SSDIFF;
if (show_ctrls) if (show_ctrls) {
cgit_print_layout_start();
cgit_print_diff_ctrls(); cgit_print_diff_ctrls();
}
/* /*
* Clicking on a link to a file in the diff stat should show a diff * Clicking on a link to a file in the diff stat should show a diff
@ -489,4 +495,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
if (!use_ssdiff) if (!use_ssdiff)
html("</td></tr>"); html("</td></tr>");
html("</table>"); html("</table>");
if (show_ctrls)
cgit_print_layout_end();
} }