diff options
author | Ondrej Jirman | 2007-05-26 03:26:14 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-05-31 10:24:37 +0200 |
commit | a922615dae5d1f7b932dd1fc5a5f121748d96c5a (patch) | |
tree | 05fec55980234a64658f6612499212f923206d29 | |
parent | Handle single-line and empty commit subjects (diff) | |
download | cgit-a922615dae5d1f7b932dd1fc5a5f121748d96c5a.tar.gz cgit-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.c | 2 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | ui-log.c | 32 |
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) | |||
94 | case CMD_LOG: | 94 | case CMD_LOG: |
95 | cgit_print_log(cgit_query_head, cgit_query_ofs, | 95 | cgit_print_log(cgit_query_head, cgit_query_ofs, |
96 | cgit_max_commit_count, cgit_query_search, | 96 | cgit_max_commit_count, cgit_query_search, |
97 | cgit_query_path); | 97 | cgit_query_path, 1); |
98 | break; | 98 | break; |
99 | case CMD_TREE: | 99 | case CMD_TREE: |
100 | cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); | 100 | 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, | |||
213 | 213 | ||
214 | extern void cgit_print_repolist(struct cacheitem *item); | 214 | extern void cgit_print_repolist(struct cacheitem *item); |
215 | extern void cgit_print_summary(); | 215 | extern void cgit_print_summary(); |
216 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); | 216 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); |
217 | extern void cgit_print_view(const char *hex, char *path); | 217 | extern void cgit_print_view(const char *hex, char *path); |
218 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 218 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
219 | extern void cgit_print_tree(const char *rev, const char *hex, char *path); | 219 | 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) | |||
54 | } | 54 | } |
55 | 55 | ||
56 | 56 | ||
57 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) | 57 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
58 | { | 58 | { |
59 | struct rev_info rev; | 59 | struct rev_info rev; |
60 | struct commit *commit; | 60 | struct commit *commit; |
@@ -110,19 +110,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) | |||
110 | } | 110 | } |
111 | html("</table>\n"); | 111 | html("</table>\n"); |
112 | 112 | ||
113 | html("<div class='pager'>"); | 113 | if (pager) { |
114 | if (ofs > 0) { | 114 | html("<div class='pager'>"); |
115 | html(" <a href='"); | 115 | if (ofs > 0) { |
116 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, | 116 | html(" <a href='"); |
117 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); | 117 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, |
118 | html("'>[prev]</a> "); | 118 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); |
119 | } | 119 | html("'>[prev]</a> "); |
120 | 120 | } | |
121 | if ((commit = get_revision(&rev)) != NULL) { | 121 | |
122 | html(" <a href='"); | 122 | if ((commit = get_revision(&rev)) != NULL) { |
123 | html(cgit_pageurl(cgit_query_repo, "log", | 123 | html(" <a href='"); |
124 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); | 124 | html(cgit_pageurl(cgit_query_repo, "log", |
125 | html("'>[next]</a> "); | 125 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); |
126 | html("'>[next]</a> "); | ||
127 | } | ||
128 | html("</div>"); | ||
126 | } | 129 | } |
127 | html("</div>"); | ||
128 | } | 130 | } |