author | Lars Hjemli <hjemli@gmail.com> | 2007-05-15 23:38:02 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-15 23:39:08 (UTC) |
commit | 97de8f0554649544c78aeb35a4c3431f17667ec5 (patch) (unidiff) | |
tree | c418bbd4e37606c0d63ea2e304825a4975b45b9a | |
parent | dff894d12953a8a3cd7cdca2357771212a2f57d6 (diff) | |
download | cgit-97de8f0554649544c78aeb35a4c3431f17667ec5.zip cgit-97de8f0554649544c78aeb35a4c3431f17667ec5.tar.gz cgit-97de8f0554649544c78aeb35a4c3431f17667ec5.tar.bz2 |
Add support for tree listing via h parameter
This makes the tree page benefit from repo.defbranch.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -56,34 +56,44 @@ static int print_entry(const unsigned char *sha1, const char *base, | |||
56 | html("<td class='links'><a href='"); | 56 | html("<td class='links'><a href='"); |
57 | html_attr(cgit_pageurl(cgit_query_repo, "log", | 57 | html_attr(cgit_pageurl(cgit_query_repo, "log", |
58 | fmt("h=%s&path=%s%s", | 58 | fmt("h=%s&path=%s%s", |
59 | curr_rev, | 59 | curr_rev, |
60 | cgit_query_path ? cgit_query_path : "", | 60 | cgit_query_path ? cgit_query_path : "", |
61 | pathname))); | 61 | pathname))); |
62 | html("'>history</a></td>"); | 62 | html("'>history</a></td>"); |
63 | html("</tr>\n"); | 63 | html("</tr>\n"); |
64 | free(name); | 64 | free(name); |
65 | return 0; | 65 | return 0; |
66 | } | 66 | } |
67 | 67 | ||
68 | void cgit_print_tree(const char *rev, const char *hex, char *path) | 68 | void cgit_print_tree(const char *rev, const char *hex, char *path) |
69 | { | 69 | { |
70 | struct tree *tree; | 70 | struct tree *tree; |
71 | unsigned char sha1[20]; | 71 | unsigned char sha1[20]; |
72 | struct commit *commit; | ||
72 | 73 | ||
73 | curr_rev = xstrdup(rev); | 74 | curr_rev = xstrdup(rev); |
75 | get_sha1(rev, sha1); | ||
76 | commit = lookup_commit_reference(sha1); | ||
77 | if (!commit || parse_commit(commit)) { | ||
78 | cgit_print_error(fmt("Invalid head: %s", rev)); | ||
79 | return; | ||
80 | } | ||
81 | if (!hex) | ||
82 | hex = sha1_to_hex(commit->tree->object.sha1); | ||
83 | |||
74 | if (get_sha1_hex(hex, sha1)) { | 84 | if (get_sha1_hex(hex, sha1)) { |
75 | cgit_print_error(fmt("Invalid object id: %s", hex)); | 85 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
76 | return; | 86 | return; |
77 | } | 87 | } |
78 | tree = parse_tree_indirect(sha1); | 88 | tree = parse_tree_indirect(sha1); |
79 | if (!tree) { | 89 | if (!tree) { |
80 | cgit_print_error(fmt("Not a tree object: %s", hex)); | 90 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
81 | return; | 91 | return; |
82 | } | 92 | } |
83 | 93 | ||
84 | html_txt(path); | 94 | html_txt(path); |
85 | html("<table class='list'>\n"); | 95 | html("<table class='list'>\n"); |
86 | html("<tr class='nohover'>"); | 96 | html("<tr class='nohover'>"); |
87 | html("<th class='left'>Mode</th>"); | 97 | html("<th class='left'>Mode</th>"); |
88 | html("<th class='left'>Name</th>"); | 98 | html("<th class='left'>Name</th>"); |
89 | html("<th class='right'>Size</th>"); | 99 | html("<th class='right'>Size</th>"); |