author | Lars Hjemli <hjemli@gmail.com> | 2007-05-15 22:26:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-15 22:26:23 (UTC) |
commit | a2ddc10479ec463708e422ca5ce7ec02c22a7d02 (patch) (unidiff) | |
tree | e099ad98a79d61eb6e368a7e7972700f0e65b9ae | |
parent | b28b105ec172b258ae5d629381a5890697c2f938 (diff) | |
download | cgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.zip cgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.tar.gz cgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.tar.bz2 |
Change commit-view to expect h parameter, not id
The change makes the commit-page benefit from repo.defbranch.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-log.c | 3 | ||||
-rw-r--r-- | ui-summary.c | 16 |
4 files changed, 13 insertions, 10 deletions
@@ -118,3 +118,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
118 | } else if (!strcmp(cgit_query_page, "commit")) { | 118 | } else if (!strcmp(cgit_query_page, "commit")) { |
119 | cgit_print_commit(cgit_query_sha1); | 119 | cgit_print_commit(cgit_query_head); |
120 | } else if (!strcmp(cgit_query_page, "view")) { | 120 | } else if (!strcmp(cgit_query_page, "view")) { |
diff --git a/ui-commit.c b/ui-commit.c index 8011dfc..93eb8fd 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -199,3 +199,3 @@ void cgit_print_commit(const char *hex) | |||
199 | "<a href='"); | 199 | "<a href='"); |
200 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); | 200 | query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); |
201 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 201 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
@@ -36,3 +36,3 @@ void print_commit(struct commit *commit) | |||
36 | html("</td><td>"); | 36 | html("</td><td>"); |
37 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 37 | char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); |
38 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); | 38 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
@@ -123,2 +123 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) | |||
123 | } | 123 | } |
124 | |||
diff --git a/ui-summary.c b/ui-summary.c index b99ea98..e7158cc 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -35,3 +35,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
35 | url = cgit_pageurl(cgit_query_repo, "commit", | 35 | url = cgit_pageurl(cgit_query_repo, "commit", |
36 | fmt("id=%s", sha1_to_hex(sha1))); | 36 | fmt("h=%s", sha1_to_hex(sha1))); |
37 | html_link_open(url, NULL, NULL); | 37 | html_link_open(url, NULL, NULL); |
@@ -54,13 +54,17 @@ static void cgit_print_object_ref(struct object *obj) | |||
54 | { | 54 | { |
55 | char *page, *url; | 55 | char *page, *arg, *url; |
56 | 56 | ||
57 | if (obj->type == OBJ_COMMIT) | 57 | if (obj->type == OBJ_COMMIT) { |
58 | page = "commit"; | 58 | page = "commit"; |
59 | else if (obj->type == OBJ_TREE) | 59 | arg = "h"; |
60 | } else if (obj->type == OBJ_TREE) { | ||
60 | page = "tree"; | 61 | page = "tree"; |
61 | else | 62 | arg = "id"; |
63 | } else { | ||
62 | page = "view"; | 64 | page = "view"; |
65 | arg = "id"; | ||
66 | } | ||
63 | 67 | ||
64 | url = cgit_pageurl(cgit_query_repo, page, | 68 | url = cgit_pageurl(cgit_query_repo, page, |
65 | fmt("id=%s", sha1_to_hex(obj->sha1))); | 69 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
66 | html_link_open(url, NULL, NULL); | 70 | html_link_open(url, NULL, NULL); |