crtxcr/cgitsb
1
0
Fork 0
程式碼 問題 合併請求 版本發布 Wiki 動態

ui-log: add support for showing the full commit message

瀏覽代碼 
Some users prefer to see the full message, so to make these users happy
the new querystring parameter "showmsg" can be used to print the full
commit message per log entry.

A link is provided in the log heading to make this function accessible,
and all links and forms tries to preserve the users preference.

Note: the new link is not displayed on the summary page since the point
of the summary page is to be a summary, but it is still obeyed if specified
manually.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-11-29 18:39:41 +01:00
父節點 7b5cee65fd
當前提交 0274b57d55
共有 8 個檔案被更改，包括 45 行新增 和 11 行删除
顯示統計資料 下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

2
cgit.c
查看文件

@ -154,6 +154,8 @@ static void querystring_cb(const char *name, const char *value)
ctx.qry.name = xstrdup(value);
} else if (!strcmp(name, "mimetype")) {
ctx.qry.mimetype = xstrdup(value);
} else if (!strcmp(name, "showmsg")) {
ctx.qry.showmsg = atoi(value);
}
}

1
cgit.h
查看文件

@ -121,6 +121,7 @@ struct cgit_query {
char *url;
int ofs;
int nohead;
int showmsg;
};
struct cgit_config {

32
ui-log.c
查看文件

@ -44,8 +44,12 @@ void print_commit(struct commit *commit)
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
html_link_close();
html("</td><td>");
if (ctx.qry.showmsg)
html("<u>");
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
sha1_to_hex(commit->object.sha1));
if (ctx.qry.showmsg)
html("</u>");
html("</td><td>");
html_txt(info->author);
if (ctx.repo->enable_log_filecount) {
@ -61,6 +65,17 @@ void print_commit(struct commit *commit)
}
}
html("</td></tr>\n");
if (ctx.qry.showmsg) {
html("<tr class='nohover'><td></td><td><div class='commit-msg'>");
html_txt(info->msg);
html("</div><br/></td><td></td>");
if (ctx.repo->enable_log_filecount) {
html("<td></td>");
if (ctx.repo->enable_log_linecount)
html("<td></td>");
}
html("</tr>\n");
}
cgit_free_commitinfo(info);
}
@ -100,8 +115,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
html("<table class='list nowrap'>");
html("<tr class='nohover'><th class='left'>Age</th>"
"<th class='left'>Commit message</th>"
"<th class='left'>Author</th>");
"<th class='left'>Commit message");
if (pager) {
html(" (");
cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
html(")");
}
html("</th><th class='left'>Author</th>");
if (ctx.repo->enable_log_filecount) {
html("<th class='left'>Files</th>");
columns++;
@ -136,20 +158,20 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
ctx.qry.sha1, ctx.qry.path,
ofs - cnt, ctx.qry.grep,
ctx.qry.search);
ctx.qry.search, ctx.qry.showmsg);
html("&nbsp;");
}
if ((commit = get_revision(&rev)) != NULL) {
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
ctx.qry.sha1, ctx.qry.path,
ofs + cnt, ctx.qry.grep,
ctx.qry.search);
ctx.qry.search, ctx.qry.showmsg);
}
html("</div>");
} else if ((commit = get_revision(&rev)) != NULL) {
html("<tr class='nohover'><td colspan='3'>");
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
NULL, NULL);
NULL, NULL, ctx.qry.showmsg);
html("</td></tr>\n");
}
}

3
ui-refs.c
查看文件

@ -58,7 +58,8 @@ static int print_branch(struct refinfo *ref)
if (!info)
return 1;
html("<tr><td>");
cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
ctx.qry.showmsg);
html("</td><td>");
if (ref->object->type == OBJ_COMMIT) {

2
ui-repolist.c
查看文件

@ -146,7 +146,7 @@ void cgit_print_repolist()
html("<td>");
cgit_summary_link("summary", NULL, "button", NULL);
cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
0, NULL, NULL);
0, NULL, NULL, ctx.qry.showmsg);
cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
html("</td>");
}

12
ui-shared.c
查看文件

@ -281,7 +281,8 @@ void cgit_plain_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, int ofs, char *grep, char *pattern)
char *rev, char *path, int ofs, char *grep, char *pattern,
int showmsg)
{
char *delim;
@ -305,6 +306,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
html(delim);
html("ofs=");
htmlf("%d", ofs);
delim = "&";
}
if (showmsg) {
html(delim);
html("showmsg=1");
}
html("'>");
html_txt(name);
@ -568,6 +574,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
html_hidden("id", ctx.qry.sha1);
if (ctx.qry.sha2)
html_hidden("id2", ctx.qry.sha2);
if (ctx.qry.showmsg)
html_hidden("showmsg", "1");
if (incl_search) {
if (ctx.qry.grep)
@ -634,7 +642,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
NULL, NULL, 0, NULL, NULL);
NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_commit_link("commit", NULL, hc(cmd, "commit"),

2
ui-shared.h
查看文件

@ -19,7 +19,7 @@ extern void cgit_plain_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, int ofs, char *grep,
char *pattern);
char *pattern, int showmsg);
extern void cgit_commit_link(char *name, char *title, char *class, char *head,
char *rev);
extern void cgit_patch_link(char *name, char *title, char *class, char *head,

2
ui-tree.c
查看文件

@ -106,7 +106,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
html("<td>");
cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
fullpath, 0, NULL, NULL);
fullpath, 0, NULL, NULL, ctx.qry.showmsg);
html("</td></tr>\n");
free(name);
return 0;