From: john at keeping.me.uk (John Keeping)
Subject: [PATCH v2 14/22] diff: move layout to page function
Date: Fri, 14 Aug 2015 12:47:14 +0100 [thread overview]
Message-ID: <a7a2b801e4c01032755b88ba1f0e5aa2b996b39c.1439552492.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1439552492.git.john@keeping.me.uk>
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 at keeping.me.uk>
---
cmd.c | 2 +-
ui-diff.c | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/cmd.c b/cmd.c
index 1b42a47..d9f6eff 100644
--- a/cmd.c
+++ b/cmd.c
@@ -158,7 +158,7 @@ struct cgit_cmd *cgit_get_cmd(void)
def_cmp(about, 0, 0, 0, 0),
def_cmd(blob, 1, 0, 0, 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(log, 1, 1, 1, 0),
def_cmd(ls_cache, 0, 0, 0, 0),
diff --git a/ui-diff.c b/ui-diff.c
index caebd5d..5d18296 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -403,19 +403,22 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
if (!new_rev)
new_rev = ctx.qry.head;
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;
}
commit = lookup_commit_reference(new_rev_sha1);
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;
}
new_tree_sha1 = commit->tree->object.sha1;
if (old_rev) {
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;
}
} 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)) {
commit2 = lookup_commit_reference(old_rev_sha1);
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;
}
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;
use_ssdiff = difftype == DIFF_SSDIFF;
- if (show_ctrls)
+ if (show_ctrls) {
+ cgit_print_layout_start();
cgit_print_diff_ctrls();
+ }
/*
* 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)
html("</td></tr>");
html("</table>");
+
+ if (show_ctrls)
+ cgit_print_layout_end();
}
--
2.5.0.466.g9af26fa
next prev parent reply other threads:[~2015-08-14 11:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 15:54 [PATCH 00/17] HTTP response code improvements john
2015-04-05 15:54 ` [PATCH 01/17] ui-shared: add cgit_print_error_page() function john
2015-04-07 13:23 ` Jason
2015-04-07 13:32 ` john
2015-04-07 13:36 ` Jason
2015-04-07 18:17 ` john
2015-04-05 15:54 ` [PATCH 02/17] cgit: use cgit_print_error_page() where appropriate john
2015-04-05 15:54 ` [PATCH 03/17] clone: use cgit_print_error_page() instead of html_status() john
2015-04-05 15:54 ` [PATCH 04/17] plain: " john
2015-04-05 15:54 ` [PATCH 05/17] snapshot: " john
2015-04-05 15:54 ` [PATCH 06/17] html: remove html_status() john
2015-04-05 15:54 ` [PATCH 07/17] ui-shared: add cgit_print_layout_{start,end}() john
2015-04-05 15:54 ` [PATCH 08/17] about: move layout into page functions john
2015-04-05 15:54 ` [PATCH 09/17] commit: move layout into page function john
2015-04-05 15:54 ` [PATCH 10/17] diff: move layout to " john
2015-04-05 15:54 ` [PATCH 11/17] log: move layout into " john
2015-04-05 15:54 ` [PATCH 12/17] refs: move layout to " john
2015-04-05 15:54 ` [PATCH 13/17] stats: move layout into " john
2015-04-05 15:55 ` [PATCH 14/17] summary: " john
2015-04-05 15:55 ` [PATCH 15/17] tag: " john
2015-04-05 15:55 ` [PATCH 16/17] tree: " john
2015-04-05 18:31 ` john
2015-04-05 15:55 ` [PATCH 17/17] cmd: remove "want_layout" field john
2015-04-05 16:28 ` [PATCH 00/17] HTTP response code improvements john
2015-08-14 11:47 ` [PATCH v2 00/22] HTTP status " john
2015-08-14 11:47 ` [PATCH v2 01/22] ui-shared: add cgit_print_error_page() function john
2015-08-14 11:47 ` [PATCH v2 02/22] cgit: use cgit_print_error_page() where appropriate john
2015-08-14 11:47 ` [PATCH v2 03/22] clone: use cgit_print_error_page() instead of html_status() john
2015-08-14 11:47 ` [PATCH v2 04/22] plain: " john
2015-08-14 11:47 ` [PATCH v2 05/22] snapshot: " john
2015-08-14 11:47 ` [PATCH v2 06/22] blob: use cgit_print_error_page() to add HTTP headers john
2015-08-14 11:47 ` [PATCH v2 07/22] patch: use cgit_print_error_page() for HTTP status codes john
2015-08-14 11:47 ` [PATCH v2 08/22] snapshot: " john
2015-08-14 11:47 ` [PATCH v2 09/22] snapshot: don't reimplement cgit_print_error_page() john
2015-08-14 11:47 ` [PATCH v2 10/22] html: remove html_status() john
2015-08-14 11:47 ` [PATCH v2 11/22] ui-shared: add cgit_print_layout_{start,end}() john
2015-08-14 11:47 ` [PATCH v2 12/22] about: move layout into page functions john
2015-08-14 11:47 ` [PATCH v2 13/22] commit: move layout into page function john
2015-08-14 11:47 ` john [this message]
2015-08-14 11:47 ` [PATCH v2 15/22] log: " john
2015-08-14 11:47 ` [PATCH v2 16/22] refs: move layout to " john
2015-08-14 11:47 ` [PATCH v2 17/22] stats: move layout into " john
2015-08-14 11:47 ` [PATCH v2 18/22] summary: " john
2015-08-14 11:47 ` [PATCH v2 19/22] tag: " john
2015-08-14 11:47 ` [PATCH v2 20/22] tree: " john
2015-08-14 11:47 ` [PATCH v2 21/22] cmd: remove "want_layout" field john
2015-08-14 11:47 ` [PATCH v2 22/22] ui-shared: cache errors for "dynamic TTL" john
2015-08-14 12:17 ` [PATCH v2 00/22] HTTP status code improvements nicolas.dely
2015-08-14 13:56 ` Jason
2015-08-14 14:20 ` john
2015-08-14 14:24 ` list
2015-08-14 14:40 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a7a2b801e4c01032755b88ba1f0e5aa2b996b39c.1439552492.git.john@keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).