author | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:53:02 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:53:02 (UTC) |
commit | 42a7eb9c73457319a3fd5441ff26046fc9b31dad (patch) (side-by-side diff) | |
tree | 4771b955e031005e7c222ef0cbabb719f7cd003a | |
parent | 48c487d72daef7e71683a85f775db8d36ab20341 (diff) | |
download | cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.zip cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.tar.gz cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.tar.bz2 |
Add cgit_commit_link() + support for id=sha1 to commit view
This adds a function to generate links to the commit page and extends said
page to use id from querystring as primary revision specified (fallback to
h).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | ui-commit.c | 3 | ||||
-rw-r--r-- | ui-log.c | 7 | ||||
-rw-r--r-- | ui-shared.c | 14 | ||||
-rw-r--r-- | ui-summary.c | 18 | ||||
-rw-r--r-- | ui-tree.c | 1 |
7 files changed, 30 insertions, 17 deletions
@@ -102,3 +102,3 @@ static void cgit_print_repo_page(struct cacheitem *item) case CMD_COMMIT: - cgit_print_commit(cgit_query_head); + cgit_print_commit(cgit_query_sha1); break; @@ -207,2 +207,4 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, char *rev, char *path); +extern void cgit_commit_link(char *name, char *title, char *class, char *head, + char *rev); diff --git a/ui-commit.c b/ui-commit.c index 885f870..8864fc6 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -158,2 +158,5 @@ void cgit_print_commit(const char *hex) + if (!hex) + hex = cgit_query_head; + if (get_sha1(hex, sha1)) { @@ -33,7 +33,4 @@ void print_commit(struct commit *commit) html("</td><td>"); - char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); - char *url = cgit_pageurl(cgit_query_repo, "commit", qry); - html_link_open(url, NULL, NULL); - html_ntxt(cgit_max_msg_len, info->subject); - html_link_close(); + cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, + sha1_to_hex(commit->object.sha1)); if (cgit_repo->enable_log_filecount) { diff --git a/ui-shared.c b/ui-shared.c index 64ee79c..71c899a 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -138,3 +138,3 @@ static char *repolink(char *title, char *class, char *page, char *head, -static char *reporevlink(char *page, char *name, char *title, char *class, +static void reporevlink(char *page, char *name, char *title, char *class, char *head, char *rev, char *path) @@ -166,2 +166,14 @@ void cgit_log_link(char *name, char *title, char *class, char *head, +void cgit_commit_link(char *name, char *title, char *class, char *head, + char *rev) +{ + if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { + name[cgit_max_msg_len] = '\0'; + name[cgit_max_msg_len - 1] = '.'; + name[cgit_max_msg_len - 2] = '.'; + name[cgit_max_msg_len - 3] = '.'; + } + reporevlink("commit", name, title, class, head, rev, NULL); +} + void cgit_print_date(time_t secs, char *format) diff --git a/ui-summary.c b/ui-summary.c index 29b76e3..03dd078 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -17,4 +17,6 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, struct commitinfo *info; - char buf[256], *url; + char buf[256]; + char *ref; + ref = xstrdup(refname); strncpy(buf, refname, sizeof(buf)); @@ -27,3 +29,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html("<tr><td>"); - cgit_log_link(refname, NULL, NULL, refname, NULL, NULL); + cgit_log_link(ref, NULL, NULL, ref, NULL, NULL); html("</td><td>"); @@ -33,7 +35,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html("</td><td>"); - url = cgit_pageurl(cgit_query_repo, "commit", - fmt("h=%s", sha1_to_hex(sha1))); - html_link_open(url, NULL, NULL); - html_ntxt(cgit_max_msg_len, info->subject); - html_link_close(); + cgit_commit_link(info->subject, NULL, NULL, ref, NULL); html("</td></tr>\n"); @@ -47,2 +45,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, } + free(ref); return 0; @@ -56,4 +55,5 @@ static void cgit_print_object_ref(struct object *obj) if (obj->type == OBJ_COMMIT) { - page = "commit"; - arg = "h"; + cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, + cgit_query_head, sha1_to_hex(obj->sha1)); + return; } else if (obj->type == OBJ_TREE) { @@ -60,3 +60,2 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, unsigned long size = 0; - char *url, *qry; |