mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 10:08:42 +00:00
Add git_log_link() and fix bug in generic repolink function
The generic repolink function compared head with cgit_query_head, which almost always would be the same pointer. The test now compares with repo.defbranch, which is the wanted behavour. Bug discovered while adding cgit_log_link(), so this commit also contain that change. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
parent
426032f767
commit
48c487d72d
2
cgit.h
2
cgit.h
@ -203,6 +203,8 @@ 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);
|
||||
|
||||
extern void cgit_print_error(char *msg);
|
||||
extern void cgit_print_date(time_t secs, char *format);
|
||||
|
@ -89,9 +89,7 @@ void cgit_print_repolist(struct cacheitem *item)
|
||||
html_link_open(cgit_repourl(cgit_repo->url),
|
||||
"Summary", "button");
|
||||
html("S</a>");
|
||||
html_link_open(cgit_pageurl(cgit_repo->name, "log", NULL),
|
||||
"Log", "button");
|
||||
html("L</a>");
|
||||
cgit_log_link("L", "Log", "button", NULL, NULL, NULL);
|
||||
cgit_tree_link("F", "Files", "button", NULL, NULL, NULL);
|
||||
html("</td></tr>\n");
|
||||
}
|
||||
|
20
ui-shared.c
20
ui-shared.c
@ -127,7 +127,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
|
||||
html_attr(path);
|
||||
delim = "&";
|
||||
}
|
||||
if (head && strcmp(head, cgit_query_head)) {
|
||||
if (head && strcmp(head, cgit_repo->defbranch)) {
|
||||
html(delim);
|
||||
html("h=");
|
||||
html_attr(head);
|
||||
@ -136,12 +136,12 @@ static char *repolink(char *title, char *class, char *page, char *head,
|
||||
return fmt("%s", delim);
|
||||
}
|
||||
|
||||
void cgit_tree_link(char *name, char *title, char *class, char *head,
|
||||
char *rev, char *path)
|
||||
static char *reporevlink(char *page, char *name, char *title, char *class,
|
||||
char *head, char *rev, char *path)
|
||||
{
|
||||
char *delim;
|
||||
|
||||
delim = repolink(title, class, "tree", head, path);
|
||||
delim = repolink(title, class, page, head, path);
|
||||
if (rev && strcmp(rev, cgit_query_head)) {
|
||||
html(delim);
|
||||
html("id=");
|
||||
@ -152,6 +152,18 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
|
||||
html("</a>");
|
||||
}
|
||||
|
||||
void cgit_tree_link(char *name, char *title, char *class, char *head,
|
||||
char *rev, char *path)
|
||||
{
|
||||
reporevlink("tree", name, title, class, head, rev, path);
|
||||
}
|
||||
|
||||
void cgit_log_link(char *name, char *title, char *class, char *head,
|
||||
char *rev, char *path)
|
||||
{
|
||||
reporevlink("log", name, title, class, head, rev, path);
|
||||
}
|
||||
|
||||
void cgit_print_date(time_t secs, char *format)
|
||||
{
|
||||
char buf[64];
|
||||
|
@ -25,11 +25,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>");
|
||||
url = cgit_pageurl(cgit_query_repo, "log",
|
||||
fmt("h=%s", refname));
|
||||
html_link_open(url, NULL, NULL);
|
||||
html_txt(buf);
|
||||
html_link_close();
|
||||
cgit_log_link(refname, NULL, NULL, refname, NULL, NULL);
|
||||
html("</td><td>");
|
||||
cgit_print_age(commit->date, -1, NULL);
|
||||
html("</td><td>");
|
||||
|
12
ui-tree.c
12
ui-tree.c
@ -92,14 +92,10 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
|
||||
}
|
||||
htmlf("</td><td class='ls-size'>%li</td>", size);
|
||||
|
||||
html("<td><a href='");
|
||||
qry = fmt("h=%s&path=%s%s%s", curr_rev,
|
||||
cgit_query_path ? cgit_query_path : "",
|
||||
cgit_query_path ? "/" : "", pathname);
|
||||
url = cgit_pageurl(cgit_query_repo, "log", qry);
|
||||
html_attr(url);
|
||||
html("' title='Log' class='button'>L</a></td>");
|
||||
html("</tr>\n");
|
||||
html("<td>");
|
||||
cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
|
||||
fullpath);
|
||||
html("</td></tr>\n");
|
||||
free(name);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user