Add ofs argument to cgit_log_link and use it in ui-log.c

This fixes a bug in the prev/next links on the log page: when on the default
branch the links to prev/next page would contain h=(null).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 30 insertions, 16 deletions

diff --git a/cgit.h b/cgit.h
index ddb2fff..a59a370 100644
--- a/cgit.h
+++ b/cgit.h
@@ -206,7 +206,7 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
-                          char *rev, char *path);
+                          char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
diff --git a/ui-log.c b/ui-log.c
index 95cb453..d38e40a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -113,17 +113,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
         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;");
+                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs - cnt);
+                        html("&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;");
+                        cgit_log_link("[next]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs + cnt);
                 }
                 html("</div>");
         }
diff --git a/ui-repolist.c b/ui-repolist.c
index c735368..4c86543 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -98,7 +98,7 @@ void cgit_print_repolist(struct cacheitem *item)
                         html_link_open(cgit_repourl(cgit_repo->url),
                                        NULL, "button");
                         html("summary</a>");
-                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL);
+                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0);
                         cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                         html("</td>");
                 }
diff --git a/ui-shared.c b/ui-shared.c
index 64c237f..bfcc2ac 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -163,9 +163,25 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+                   char *rev, char *path, int ofs)
 {
-        reporevlink("log", name, title, class, head, rev, path);
+        char *delim;
+
+        delim = repolink(title, class, "log", head, path);
+        if (rev && strcmp(rev, cgit_query_head)) {
+                html(delim);
+                html("id=");
+                html_attr(rev);
+                delim = "&";
+        }
+        if (ofs > 0) {
+                html(delim);
+                html("ofs=");
+                htmlf("%d", ofs);
+        }
+        html("'>");
+        html_txt(name);
+        html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
@@ -302,7 +318,7 @@ void cgit_print_pageheader(char *title, int show_search)
                             NULL, NULL);
                 html(" ");
                 cgit_log_link("log", NULL, NULL, cgit_query_head,
-                              cgit_query_sha1, cgit_query_path);
+                              cgit_query_sha1, cgit_query_path, 0);
                 html(" ");
                 cgit_tree_link("tree", NULL, NULL, cgit_query_head,
                                cgit_query_sha1, NULL);
diff --git a/ui-summary.c b/ui-summary.c
index 03dd078..b4bc6d8 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -27,7 +27,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
-                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
+                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
                 html("</td><td>");
                 cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
diff --git a/ui-tree.c b/ui-tree.c
index b6cb813..c5d64ff 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -93,7 +93,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
         html("<td>");
         cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-                      fullpath);
+                      fullpath, 0);
         html("</td></tr>\n");
         free(name);
         return 0;