mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add git_log_link() and fix bug in generic repolink function

Browse Source 
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:
Lars Hjemli 2007-06-17 13:57:51 +02:00
parent 426032f767
commit 48c487d72d
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgit.h
View File

@ -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, extern void cgit_tree_link(char *name, char *title, char *class, char *head,
char *rev, char *path); 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_error(char *msg);
extern void cgit_print_date(time_t secs, char *format); extern void cgit_print_date(time_t secs, char *format);

4
ui-repolist.c
View File

@ -89,9 +89,7 @@ void cgit_print_repolist(struct cacheitem *item)
html_link_open(cgit_repourl(cgit_repo->url), html_link_open(cgit_repourl(cgit_repo->url),
"Summary", "button"); "Summary", "button");
html("S</a>"); html("S</a>");
html_link_open(cgit_pageurl(cgit_repo->name, "log", NULL), cgit_log_link("L", "Log", "button", NULL, NULL, NULL);
"Log", "button");
html("L</a>");
cgit_tree_link("F", "Files", "button", NULL, NULL, NULL); cgit_tree_link("F", "Files", "button", NULL, NULL, NULL);
html("</td></tr>\n"); html("</td></tr>\n");
} }

20
ui-shared.c
View File

@ -127,7 +127,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
html_attr(path); html_attr(path);
delim = "&amp;"; delim = "&amp;";
} }
if (head && strcmp(head, cgit_query_head)) { if (head && strcmp(head, cgit_repo->defbranch)) {
html(delim); html(delim);
html("h="); html("h=");
html_attr(head); html_attr(head);
@ -136,12 +136,12 @@ static char *repolink(char *title, char *class, char *page, char *head,
return fmt("%s", delim); return fmt("%s", delim);
} }
void cgit_tree_link(char *name, char *title, char *class, char *head, static char *reporevlink(char *page, char *name, char *title, char *class,
char *rev, char *path) char *head, char *rev, char *path)
{ {
char *delim; char *delim;
delim = repolink(title, class, "tree", head, path); delim = repolink(title, class, page, head, path);
if (rev && strcmp(rev, cgit_query_head)) { if (rev && strcmp(rev, cgit_query_head)) {
html(delim); html(delim);
html("id="); html("id=");
@ -152,6 +152,18 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
html("</a>"); 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) void cgit_print_date(time_t secs, char *format)
{ {
char buf[64]; char buf[64];

6
ui-summary.c
View File

@ -25,11 +25,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
if (commit && !parse_commit(commit)){ if (commit && !parse_commit(commit)){
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
html("<tr><td>"); html("<tr><td>");
url = cgit_pageurl(cgit_query_repo, "log", cgit_log_link(refname, NULL, NULL, refname, NULL, NULL);
fmt("h=%s", refname));
html_link_open(url, NULL, NULL);
html_txt(buf);
html_link_close();
html("</td><td>"); html("</td><td>");
cgit_print_age(commit->date, -1, NULL); cgit_print_age(commit->date, -1, NULL);
html("</td><td>"); html("</td><td>");

12
ui-tree.c
View File

@ -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); htmlf("</td><td class='ls-size'>%li</td>", size);
html("<td><a href='"); html("<td>");
qry = fmt("h=%s&amp;path=%s%s%s", curr_rev, cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
cgit_query_path ? cgit_query_path : "", fullpath);
cgit_query_path ? "/" : "", pathname); html("</td></tr>\n");
url = cgit_pageurl(cgit_query_repo, "log", qry);
html_attr(url);
html("' title='Log' class='button'>L</a></td>");
html("</tr>\n");
free(name); free(name);
return 0; return 0;
} }