about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOndrej Jirman <ondrej.jirman@zonio.net>2007-05-26 03:26:14 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-31 10:24:37 +0200
commita922615dae5d1f7b932dd1fc5a5f121748d96c5a (patch)
tree05fec55980234a64658f6612499212f923206d29
parentHandle single-line and empty commit subjects (diff)
downloadcgit-pink-a922615dae5d1f7b932dd1fc5a5f121748d96c5a.tar.gz
cgit-pink-a922615dae5d1f7b932dd1fc5a5f121748d96c5a.zip
Add option to disable pager to cgit_print_log().
This is needed for upcomming shortlog on summary page
patch.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.c2
-rw-r--r--cgit.h2
-rw-r--r--ui-log.c32
3 files changed, 19 insertions, 17 deletions
diff --git a/cgit.c b/cgit.c
index e5d8fbd..34e590e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -94,7 +94,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	case CMD_LOG:
 		cgit_print_log(cgit_query_head, cgit_query_ofs,
 			       cgit_max_commit_count, cgit_query_search,
-			       cgit_query_path);
+			       cgit_query_path, 1);
 		break;
 	case CMD_TREE:
 		cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
diff --git a/cgit.h b/cgit.h
index 5c55bec..d6bcde2 100644
--- a/cgit.h
+++ b/cgit.h
@@ -213,7 +213,7 @@ extern void cgit_print_snapshot_start(const char *mimetype,
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
-extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path);
+extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 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);
diff --git a/ui-log.c b/ui-log.c
index 75bbbe4..bb17e1d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -54,7 +54,7 @@ void print_commit(struct commit *commit)
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager)
 {
 	struct rev_info rev;
 	struct commit *commit;
@@ -110,19 +110,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 	}
 	html("</table>\n");
 
-	html("<div class='pager'>");
-	if (ofs > 0) {
-		html("&nbsp;<a href='");
-		html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-				  fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-		html("'>[prev]</a>&nbsp;");
-       	}
-
-	if ((commit = get_revision(&rev)) != NULL) {
-		html("&nbsp;<a href='");
-		html(cgit_pageurl(cgit_query_repo, "log",
-				  fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-		html("'>[next]</a>&nbsp;");
+	if (pager) {
+		html("<div class='pager'>");
+		if (ofs > 0) {
+			html("&nbsp;<a href='");
+			html(cgit_pageurl(cgit_query_repo, cgit_query_page,
+					  fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
+			html("'>[prev]</a>&nbsp;");
+		}
+
+		if ((commit = get_revision(&rev)) != NULL) {
+			html("&nbsp;<a href='");
+			html(cgit_pageurl(cgit_query_repo, "log",
+					  fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
+			html("'>[next]</a>&nbsp;");
+		}
+		html("</div>");
 	}
-	html("</div>");
 }
r> 2019-02-20Move /opt/pkg after /usr in PATHJune McEnroe Installing mandoc from pkgsrc also installs a man executable which is horribly broken. Keep using the system man. 2019-02-20Set man_hard_wrap in nvimJune McEnroe Vendoring man.vim until <https://github.com/neovim/neovim/pull/9633> is merged and appears in a release. 2019-02-18Use hi -o anchor in upJune McEnroe 2019-02-18Don't match nested parentheses in Tag for CJune McEnroe Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe