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) (unidiff) | |
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 | 16 | ||||
-rw-r--r-- | ui-summary.c | 18 | ||||
-rw-r--r-- | ui-tree.c | 1 |
7 files changed, 31 insertions, 18 deletions
@@ -71,65 +71,65 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
71 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { | 71 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
72 | cgit_print_snapshot(item, cgit_query_sha1, "zip", | 72 | cgit_print_snapshot(item, cgit_query_sha1, "zip", |
73 | cgit_repo->url, cgit_query_name); | 73 | cgit_repo->url, cgit_query_name); |
74 | return; | 74 | return; |
75 | } | 75 | } |
76 | 76 | ||
77 | if (cgit_cmd == CMD_BLOB) { | 77 | if (cgit_cmd == CMD_BLOB) { |
78 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 78 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
79 | return; | 79 | return; |
80 | } | 80 | } |
81 | 81 | ||
82 | show_search = (cgit_cmd == CMD_LOG); | 82 | show_search = (cgit_cmd == CMD_LOG); |
83 | cgit_print_docstart(title, item); | 83 | cgit_print_docstart(title, item); |
84 | if (!cgit_cmd) { | 84 | if (!cgit_cmd) { |
85 | cgit_print_pageheader("summary", show_search); | 85 | cgit_print_pageheader("summary", show_search); |
86 | cgit_print_summary(); | 86 | cgit_print_summary(); |
87 | cgit_print_docend(); | 87 | cgit_print_docend(); |
88 | return; | 88 | return; |
89 | } | 89 | } |
90 | 90 | ||
91 | cgit_print_pageheader(cgit_query_page, show_search); | 91 | cgit_print_pageheader(cgit_query_page, show_search); |
92 | 92 | ||
93 | switch(cgit_cmd) { | 93 | switch(cgit_cmd) { |
94 | case CMD_LOG: | 94 | case CMD_LOG: |
95 | cgit_print_log(cgit_query_head, cgit_query_ofs, | 95 | cgit_print_log(cgit_query_head, cgit_query_ofs, |
96 | cgit_max_commit_count, cgit_query_search, | 96 | cgit_max_commit_count, cgit_query_search, |
97 | cgit_query_path, 1); | 97 | cgit_query_path, 1); |
98 | break; | 98 | break; |
99 | case CMD_TREE: | 99 | case CMD_TREE: |
100 | cgit_print_tree(cgit_query_sha1, cgit_query_path); | 100 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
101 | break; | 101 | break; |
102 | case CMD_COMMIT: | 102 | case CMD_COMMIT: |
103 | cgit_print_commit(cgit_query_head); | 103 | cgit_print_commit(cgit_query_sha1); |
104 | break; | 104 | break; |
105 | case CMD_DIFF: | 105 | case CMD_DIFF: |
106 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, | 106 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, |
107 | cgit_query_path); | 107 | cgit_query_path); |
108 | break; | 108 | break; |
109 | default: | 109 | default: |
110 | cgit_print_error("Invalid request"); | 110 | cgit_print_error("Invalid request"); |
111 | } | 111 | } |
112 | cgit_print_docend(); | 112 | cgit_print_docend(); |
113 | } | 113 | } |
114 | 114 | ||
115 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 115 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
116 | { | 116 | { |
117 | static char buf[PATH_MAX]; | 117 | static char buf[PATH_MAX]; |
118 | int stdout2; | 118 | int stdout2; |
119 | 119 | ||
120 | getcwd(buf, sizeof(buf)); | 120 | getcwd(buf, sizeof(buf)); |
121 | item->st.st_mtime = time(NULL); | 121 | item->st.st_mtime = time(NULL); |
122 | 122 | ||
123 | if (use_cache) { | 123 | if (use_cache) { |
124 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 124 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
125 | "Preserving STDOUT"); | 125 | "Preserving STDOUT"); |
126 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 126 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
127 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 127 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
128 | } | 128 | } |
129 | 129 | ||
130 | if (cgit_repo) | 130 | if (cgit_repo) |
131 | cgit_print_repo_page(item); | 131 | cgit_print_repo_page(item); |
132 | else | 132 | else |
133 | cgit_print_repolist(item); | 133 | cgit_print_repolist(item); |
134 | 134 | ||
135 | if (use_cache) { | 135 | if (use_cache) { |
@@ -176,56 +176,58 @@ extern char *fmt(const char *format,...); | |||
176 | extern void html(const char *txt); | 176 | extern void html(const char *txt); |
177 | extern void htmlf(const char *format,...); | 177 | extern void htmlf(const char *format,...); |
178 | extern void html_txt(char *txt); | 178 | extern void html_txt(char *txt); |
179 | extern void html_ntxt(int len, char *txt); | 179 | extern void html_ntxt(int len, char *txt); |
180 | extern void html_attr(char *txt); | 180 | extern void html_attr(char *txt); |
181 | extern void html_hidden(char *name, char *value); | 181 | extern void html_hidden(char *name, char *value); |
182 | extern void html_link_open(char *url, char *title, char *class); | 182 | extern void html_link_open(char *url, char *title, char *class); |
183 | extern void html_link_close(void); | 183 | extern void html_link_close(void); |
184 | extern void html_filemode(unsigned short mode); | 184 | extern void html_filemode(unsigned short mode); |
185 | extern int html_include(const char *filename); | 185 | extern int html_include(const char *filename); |
186 | 186 | ||
187 | extern int cgit_read_config(const char *filename, configfn fn); | 187 | extern int cgit_read_config(const char *filename, configfn fn); |
188 | extern int cgit_parse_query(char *txt, configfn fn); | 188 | extern int cgit_parse_query(char *txt, configfn fn); |
189 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 189 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
190 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 190 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
191 | extern void cgit_parse_url(const char *url); | 191 | extern void cgit_parse_url(const char *url); |
192 | 192 | ||
193 | extern char *cache_safe_filename(const char *unsafe); | 193 | extern char *cache_safe_filename(const char *unsafe); |
194 | extern int cache_lock(struct cacheitem *item); | 194 | extern int cache_lock(struct cacheitem *item); |
195 | extern int cache_unlock(struct cacheitem *item); | 195 | extern int cache_unlock(struct cacheitem *item); |
196 | extern int cache_cancel_lock(struct cacheitem *item); | 196 | extern int cache_cancel_lock(struct cacheitem *item); |
197 | extern int cache_exist(struct cacheitem *item); | 197 | extern int cache_exist(struct cacheitem *item); |
198 | extern int cache_expired(struct cacheitem *item); | 198 | extern int cache_expired(struct cacheitem *item); |
199 | 199 | ||
200 | extern char *cgit_repourl(const char *reponame); | 200 | extern char *cgit_repourl(const char *reponame); |
201 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 201 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
202 | const char *query); | 202 | const char *query); |
203 | 203 | ||
204 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 204 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
205 | char *rev, char *path); | 205 | char *rev, char *path); |
206 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 206 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
207 | char *rev, char *path); | 207 | char *rev, char *path); |
208 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | ||
209 | char *rev); | ||
208 | 210 | ||
209 | extern void cgit_print_error(char *msg); | 211 | extern void cgit_print_error(char *msg); |
210 | extern void cgit_print_date(time_t secs, char *format); | 212 | extern void cgit_print_date(time_t secs, char *format); |
211 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 213 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
212 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 214 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
213 | extern void cgit_print_docend(); | 215 | extern void cgit_print_docend(); |
214 | extern void cgit_print_pageheader(char *title, int show_search); | 216 | extern void cgit_print_pageheader(char *title, int show_search); |
215 | extern void cgit_print_snapshot_start(const char *mimetype, | 217 | extern void cgit_print_snapshot_start(const char *mimetype, |
216 | const char *filename, | 218 | const char *filename, |
217 | struct cacheitem *item); | 219 | struct cacheitem *item); |
218 | 220 | ||
219 | extern void cgit_print_repolist(struct cacheitem *item); | 221 | extern void cgit_print_repolist(struct cacheitem *item); |
220 | extern void cgit_print_summary(); | 222 | extern void cgit_print_summary(); |
221 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); | 223 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); |
222 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 224 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
223 | extern void cgit_print_tree(const char *rev, char *path); | 225 | extern void cgit_print_tree(const char *rev, char *path); |
224 | extern void cgit_print_commit(const char *hex); | 226 | extern void cgit_print_commit(const char *hex); |
225 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | 227 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, |
226 | char *path); | 228 | char *path); |
227 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 229 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
228 | const char *format, const char *prefix, | 230 | const char *format, const char *prefix, |
229 | const char *filename); | 231 | const char *filename); |
230 | 232 | ||
231 | #endif /* CGIT_H */ | 233 | #endif /* CGIT_H */ |
diff --git a/ui-commit.c b/ui-commit.c index 885f870..8864fc6 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -127,64 +127,67 @@ void inspect_filepair(struct diff_filepair *pair) | |||
127 | slots = 4; | 127 | slots = 4; |
128 | else | 128 | else |
129 | slots = slots * 2; | 129 | slots = slots * 2; |
130 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 130 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
131 | } | 131 | } |
132 | items[files-1].status = pair->status; | 132 | items[files-1].status = pair->status; |
133 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | 133 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
134 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | 134 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
135 | items[files-1].old_mode = pair->one->mode; | 135 | items[files-1].old_mode = pair->one->mode; |
136 | items[files-1].new_mode = pair->two->mode; | 136 | items[files-1].new_mode = pair->two->mode; |
137 | items[files-1].old_path = xstrdup(pair->one->path); | 137 | items[files-1].old_path = xstrdup(pair->one->path); |
138 | items[files-1].new_path = xstrdup(pair->two->path); | 138 | items[files-1].new_path = xstrdup(pair->two->path); |
139 | items[files-1].added = lines_added; | 139 | items[files-1].added = lines_added; |
140 | items[files-1].removed = lines_removed; | 140 | items[files-1].removed = lines_removed; |
141 | if (lines_added + lines_removed > max_changes) | 141 | if (lines_added + lines_removed > max_changes) |
142 | max_changes = lines_added + lines_removed; | 142 | max_changes = lines_added + lines_removed; |
143 | total_adds += lines_added; | 143 | total_adds += lines_added; |
144 | total_rems += lines_removed; | 144 | total_rems += lines_removed; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | void cgit_print_commit(const char *hex) | 148 | void cgit_print_commit(const char *hex) |
149 | { | 149 | { |
150 | struct commit *commit, *parent; | 150 | struct commit *commit, *parent; |
151 | struct commitinfo *info; | 151 | struct commitinfo *info; |
152 | struct commit_list *p; | 152 | struct commit_list *p; |
153 | unsigned char sha1[20]; | 153 | unsigned char sha1[20]; |
154 | char *query; | 154 | char *query; |
155 | char *filename; | 155 | char *filename; |
156 | char *tmp; | 156 | char *tmp; |
157 | int i; | 157 | int i; |
158 | 158 | ||
159 | if (!hex) | ||
160 | hex = cgit_query_head; | ||
161 | |||
159 | if (get_sha1(hex, sha1)) { | 162 | if (get_sha1(hex, sha1)) { |
160 | cgit_print_error(fmt("Bad object id: %s", hex)); | 163 | cgit_print_error(fmt("Bad object id: %s", hex)); |
161 | return; | 164 | return; |
162 | } | 165 | } |
163 | commit = lookup_commit_reference(sha1); | 166 | commit = lookup_commit_reference(sha1); |
164 | if (!commit) { | 167 | if (!commit) { |
165 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 168 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
166 | return; | 169 | return; |
167 | } | 170 | } |
168 | info = cgit_parse_commit(commit); | 171 | info = cgit_parse_commit(commit); |
169 | 172 | ||
170 | html("<table class='commit-info'>\n"); | 173 | html("<table class='commit-info'>\n"); |
171 | html("<tr><th>author</th><td>"); | 174 | html("<tr><th>author</th><td>"); |
172 | html_txt(info->author); | 175 | html_txt(info->author); |
173 | html(" "); | 176 | html(" "); |
174 | html_txt(info->author_email); | 177 | html_txt(info->author_email); |
175 | html("</td><td class='right'>"); | 178 | html("</td><td class='right'>"); |
176 | cgit_print_date(info->author_date, FMT_LONGDATE); | 179 | cgit_print_date(info->author_date, FMT_LONGDATE); |
177 | html("</td></tr>\n"); | 180 | html("</td></tr>\n"); |
178 | html("<tr><th>committer</th><td>"); | 181 | html("<tr><th>committer</th><td>"); |
179 | html_txt(info->committer); | 182 | html_txt(info->committer); |
180 | html(" "); | 183 | html(" "); |
181 | html_txt(info->committer_email); | 184 | html_txt(info->committer_email); |
182 | html("</td><td class='right'>"); | 185 | html("</td><td class='right'>"); |
183 | cgit_print_date(info->committer_date, FMT_LONGDATE); | 186 | cgit_print_date(info->committer_date, FMT_LONGDATE); |
184 | html("</td></tr>\n"); | 187 | html("</td></tr>\n"); |
185 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 188 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
186 | tmp = xstrdup(hex); | 189 | tmp = xstrdup(hex); |
187 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 190 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
188 | cgit_query_head, tmp, NULL); | 191 | cgit_query_head, tmp, NULL); |
189 | html("</td></tr>\n"); | 192 | html("</td></tr>\n"); |
190 | for (p = commit->parents; p ; p = p->next) { | 193 | for (p = commit->parents; p ; p = p->next) { |
@@ -2,69 +2,66 @@ | |||
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int files, lines; | 11 | int files, lines; |
12 | 12 | ||
13 | void count_lines(char *line, int size) | 13 | void count_lines(char *line, int size) |
14 | { | 14 | { |
15 | if (size>0 && (line[0] == '+' || line[0] == '-')) | 15 | if (size>0 && (line[0] == '+' || line[0] == '-')) |
16 | lines++; | 16 | lines++; |
17 | } | 17 | } |
18 | 18 | ||
19 | void inspect_files(struct diff_filepair *pair) | 19 | void inspect_files(struct diff_filepair *pair) |
20 | { | 20 | { |
21 | files++; | 21 | files++; |
22 | if (cgit_repo->enable_log_linecount) | 22 | if (cgit_repo->enable_log_linecount) |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
24 | } | 24 | } |
25 | 25 | ||
26 | void print_commit(struct commit *commit) | 26 | void print_commit(struct commit *commit) |
27 | { | 27 | { |
28 | struct commitinfo *info; | 28 | struct commitinfo *info; |
29 | 29 | ||
30 | info = cgit_parse_commit(commit); | 30 | info = cgit_parse_commit(commit); |
31 | html("<tr><td>"); | 31 | html("<tr><td>"); |
32 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 32 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
33 | html("</td><td>"); | 33 | html("</td><td>"); |
34 | char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); | 34 | cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, |
35 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); | 35 | sha1_to_hex(commit->object.sha1)); |
36 | html_link_open(url, NULL, NULL); | ||
37 | html_ntxt(cgit_max_msg_len, info->subject); | ||
38 | html_link_close(); | ||
39 | if (cgit_repo->enable_log_filecount) { | 36 | if (cgit_repo->enable_log_filecount) { |
40 | files = 0; | 37 | files = 0; |
41 | lines = 0; | 38 | lines = 0; |
42 | cgit_diff_commit(commit, inspect_files); | 39 | cgit_diff_commit(commit, inspect_files); |
43 | html("</td><td class='right'>"); | 40 | html("</td><td class='right'>"); |
44 | htmlf("%d", files); | 41 | htmlf("%d", files); |
45 | if (cgit_repo->enable_log_linecount) { | 42 | if (cgit_repo->enable_log_linecount) { |
46 | html("</td><td class='right'>"); | 43 | html("</td><td class='right'>"); |
47 | htmlf("%d", lines); | 44 | htmlf("%d", lines); |
48 | } | 45 | } |
49 | } | 46 | } |
50 | html("</td><td>"); | 47 | html("</td><td>"); |
51 | html_txt(info->author); | 48 | html_txt(info->author); |
52 | html("</td></tr>\n"); | 49 | html("</td></tr>\n"); |
53 | cgit_free_commitinfo(info); | 50 | cgit_free_commitinfo(info); |
54 | } | 51 | } |
55 | 52 | ||
56 | 53 | ||
57 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) | 54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
58 | { | 55 | { |
59 | struct rev_info rev; | 56 | struct rev_info rev; |
60 | struct commit *commit; | 57 | struct commit *commit; |
61 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; | 58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
62 | int argc = 2; | 59 | int argc = 2; |
63 | int i; | 60 | int i; |
64 | 61 | ||
65 | if (grep) | 62 | if (grep) |
66 | argv[argc++] = fmt("--grep=%s", grep); | 63 | argv[argc++] = fmt("--grep=%s", grep); |
67 | if (path) { | 64 | if (path) { |
68 | argv[argc++] = "--"; | 65 | argv[argc++] = "--"; |
69 | argv[argc++] = path; | 66 | argv[argc++] = path; |
70 | } | 67 | } |
diff --git a/ui-shared.c b/ui-shared.c index 64ee79c..71c899a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -107,92 +107,104 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
107 | if (cgit_virtual_root) { | 107 | if (cgit_virtual_root) { |
108 | html_attr(cgit_virtual_root); | 108 | html_attr(cgit_virtual_root); |
109 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') | 109 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') |
110 | html("/"); | 110 | html("/"); |
111 | html_attr(cgit_repo->url); | 111 | html_attr(cgit_repo->url); |
112 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 112 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
113 | html("/"); | 113 | html("/"); |
114 | html(page); | 114 | html(page); |
115 | html("/"); | 115 | html("/"); |
116 | if (path) | 116 | if (path) |
117 | html_attr(path); | 117 | html_attr(path); |
118 | } else { | 118 | } else { |
119 | html(cgit_script_name); | 119 | html(cgit_script_name); |
120 | html("?url="); | 120 | html("?url="); |
121 | html_attr(cgit_repo->url); | 121 | html_attr(cgit_repo->url); |
122 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 122 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
123 | html("/"); | 123 | html("/"); |
124 | html(page); | 124 | html(page); |
125 | html("/"); | 125 | html("/"); |
126 | if (path) | 126 | if (path) |
127 | html_attr(path); | 127 | html_attr(path); |
128 | delim = "&"; | 128 | delim = "&"; |
129 | } | 129 | } |
130 | if (head && strcmp(head, cgit_repo->defbranch)) { | 130 | if (head && strcmp(head, cgit_repo->defbranch)) { |
131 | html(delim); | 131 | html(delim); |
132 | html("h="); | 132 | html("h="); |
133 | html_attr(head); | 133 | html_attr(head); |
134 | delim = "&"; | 134 | delim = "&"; |
135 | } | 135 | } |
136 | return fmt("%s", delim); | 136 | return fmt("%s", delim); |
137 | } | 137 | } |
138 | 138 | ||
139 | static char *reporevlink(char *page, char *name, char *title, char *class, | 139 | static void reporevlink(char *page, char *name, char *title, char *class, |
140 | char *head, char *rev, char *path) | 140 | char *head, char *rev, char *path) |
141 | { | 141 | { |
142 | char *delim; | 142 | char *delim; |
143 | 143 | ||
144 | delim = repolink(title, class, page, head, path); | 144 | delim = repolink(title, class, page, head, path); |
145 | if (rev && strcmp(rev, cgit_query_head)) { | 145 | if (rev && strcmp(rev, cgit_query_head)) { |
146 | html(delim); | 146 | html(delim); |
147 | html("id="); | 147 | html("id="); |
148 | html_attr(rev); | 148 | html_attr(rev); |
149 | } | 149 | } |
150 | html("'>"); | 150 | html("'>"); |
151 | html_txt(name); | 151 | html_txt(name); |
152 | html("</a>"); | 152 | html("</a>"); |
153 | } | 153 | } |
154 | 154 | ||
155 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 155 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
156 | char *rev, char *path) | 156 | char *rev, char *path) |
157 | { | 157 | { |
158 | reporevlink("tree", name, title, class, head, rev, path); | 158 | reporevlink("tree", name, title, class, head, rev, path); |
159 | } | 159 | } |
160 | 160 | ||
161 | void cgit_log_link(char *name, char *title, char *class, char *head, | 161 | void cgit_log_link(char *name, char *title, char *class, char *head, |
162 | char *rev, char *path) | 162 | char *rev, char *path) |
163 | { | 163 | { |
164 | reporevlink("log", name, title, class, head, rev, path); | 164 | reporevlink("log", name, title, class, head, rev, path); |
165 | } | 165 | } |
166 | 166 | ||
167 | void cgit_commit_link(char *name, char *title, char *class, char *head, | ||
168 | char *rev) | ||
169 | { | ||
170 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | ||
171 | name[cgit_max_msg_len] = '\0'; | ||
172 | name[cgit_max_msg_len - 1] = '.'; | ||
173 | name[cgit_max_msg_len - 2] = '.'; | ||
174 | name[cgit_max_msg_len - 3] = '.'; | ||
175 | } | ||
176 | reporevlink("commit", name, title, class, head, rev, NULL); | ||
177 | } | ||
178 | |||
167 | void cgit_print_date(time_t secs, char *format) | 179 | void cgit_print_date(time_t secs, char *format) |
168 | { | 180 | { |
169 | char buf[64]; | 181 | char buf[64]; |
170 | struct tm *time; | 182 | struct tm *time; |
171 | 183 | ||
172 | time = gmtime(&secs); | 184 | time = gmtime(&secs); |
173 | strftime(buf, sizeof(buf)-1, format, time); | 185 | strftime(buf, sizeof(buf)-1, format, time); |
174 | html_txt(buf); | 186 | html_txt(buf); |
175 | } | 187 | } |
176 | 188 | ||
177 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 189 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
178 | { | 190 | { |
179 | time_t now, secs; | 191 | time_t now, secs; |
180 | 192 | ||
181 | time(&now); | 193 | time(&now); |
182 | secs = now - t; | 194 | secs = now - t; |
183 | 195 | ||
184 | if (secs > max_relative && max_relative >= 0) { | 196 | if (secs > max_relative && max_relative >= 0) { |
185 | cgit_print_date(t, format); | 197 | cgit_print_date(t, format); |
186 | return; | 198 | return; |
187 | } | 199 | } |
188 | 200 | ||
189 | if (secs < TM_HOUR * 2) { | 201 | if (secs < TM_HOUR * 2) { |
190 | htmlf("<span class='age-mins'>%.0f min.</span>", | 202 | htmlf("<span class='age-mins'>%.0f min.</span>", |
191 | secs * 1.0 / TM_MIN); | 203 | secs * 1.0 / TM_MIN); |
192 | return; | 204 | return; |
193 | } | 205 | } |
194 | if (secs < TM_DAY * 2) { | 206 | if (secs < TM_DAY * 2) { |
195 | htmlf("<span class='age-hours'>%.0f hours</span>", | 207 | htmlf("<span class='age-hours'>%.0f hours</span>", |
196 | secs * 1.0 / TM_HOUR); | 208 | secs * 1.0 / TM_HOUR); |
197 | return; | 209 | return; |
198 | } | 210 | } |
diff --git a/ui-summary.c b/ui-summary.c index 29b76e3..03dd078 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -1,90 +1,90 @@ | |||
1 | /* ui-summary.c: functions for generating repo summary page | 1 | /* ui-summary.c: functions for generating repo summary page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | static int header; | 11 | static int header; |
12 | 12 | ||
13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | 13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, |
14 | int flags, void *cb_data) | 14 | int flags, void *cb_data) |
15 | { | 15 | { |
16 | struct commit *commit; | 16 | struct commit *commit; |
17 | struct commitinfo *info; | 17 | struct commitinfo *info; |
18 | char buf[256], *url; | 18 | char buf[256]; |
19 | char *ref; | ||
19 | 20 | ||
21 | ref = xstrdup(refname); | ||
20 | strncpy(buf, refname, sizeof(buf)); | 22 | strncpy(buf, refname, sizeof(buf)); |
21 | commit = lookup_commit(sha1); | 23 | commit = lookup_commit(sha1); |
22 | // object is not really parsed at this point, because of some fallout | 24 | // object is not really parsed at this point, because of some fallout |
23 | // from previous calls to git functions in cgit_print_log() | 25 | // from previous calls to git functions in cgit_print_log() |
24 | commit->object.parsed = 0; | 26 | commit->object.parsed = 0; |
25 | if (commit && !parse_commit(commit)){ | 27 | if (commit && !parse_commit(commit)){ |
26 | info = cgit_parse_commit(commit); | 28 | info = cgit_parse_commit(commit); |
27 | html("<tr><td>"); | 29 | html("<tr><td>"); |
28 | cgit_log_link(refname, NULL, NULL, refname, NULL, NULL); | 30 | cgit_log_link(ref, NULL, NULL, ref, NULL, NULL); |
29 | html("</td><td>"); | 31 | html("</td><td>"); |
30 | cgit_print_age(commit->date, -1, NULL); | 32 | cgit_print_age(commit->date, -1, NULL); |
31 | html("</td><td>"); | 33 | html("</td><td>"); |
32 | html_txt(info->author); | 34 | html_txt(info->author); |
33 | html("</td><td>"); | 35 | html("</td><td>"); |
34 | url = cgit_pageurl(cgit_query_repo, "commit", | 36 | cgit_commit_link(info->subject, NULL, NULL, ref, NULL); |
35 | fmt("h=%s", sha1_to_hex(sha1))); | ||
36 | html_link_open(url, NULL, NULL); | ||
37 | html_ntxt(cgit_max_msg_len, info->subject); | ||
38 | html_link_close(); | ||
39 | html("</td></tr>\n"); | 37 | html("</td></tr>\n"); |
40 | cgit_free_commitinfo(info); | 38 | cgit_free_commitinfo(info); |
41 | } else { | 39 | } else { |
42 | html("<tr><td>"); | 40 | html("<tr><td>"); |
43 | html_txt(buf); | 41 | html_txt(buf); |
44 | html("</td><td colspan='3'>"); | 42 | html("</td><td colspan='3'>"); |
45 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); | 43 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); |
46 | html("</td></tr>\n"); | 44 | html("</td></tr>\n"); |
47 | } | 45 | } |
46 | free(ref); | ||
48 | return 0; | 47 | return 0; |
49 | } | 48 | } |
50 | 49 | ||
51 | 50 | ||
52 | static void cgit_print_object_ref(struct object *obj) | 51 | static void cgit_print_object_ref(struct object *obj) |
53 | { | 52 | { |
54 | char *page, *arg, *url; | 53 | char *page, *arg, *url; |
55 | 54 | ||
56 | if (obj->type == OBJ_COMMIT) { | 55 | if (obj->type == OBJ_COMMIT) { |
57 | page = "commit"; | 56 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
58 | arg = "h"; | 57 | cgit_query_head, sha1_to_hex(obj->sha1)); |
58 | return; | ||
59 | } else if (obj->type == OBJ_TREE) { | 59 | } else if (obj->type == OBJ_TREE) { |
60 | page = "tree"; | 60 | page = "tree"; |
61 | arg = "id"; | 61 | arg = "id"; |
62 | } else { | 62 | } else { |
63 | page = "view"; | 63 | page = "view"; |
64 | arg = "id"; | 64 | arg = "id"; |
65 | } | 65 | } |
66 | 66 | ||
67 | url = cgit_pageurl(cgit_query_repo, page, | 67 | url = cgit_pageurl(cgit_query_repo, page, |
68 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 68 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
69 | html_link_open(url, NULL, NULL); | 69 | html_link_open(url, NULL, NULL); |
70 | htmlf("%s %s", typename(obj->type), | 70 | htmlf("%s %s", typename(obj->type), |
71 | sha1_to_hex(obj->sha1)); | 71 | sha1_to_hex(obj->sha1)); |
72 | html_link_close(); | 72 | html_link_close(); |
73 | } | 73 | } |
74 | 74 | ||
75 | static void print_tag_header() | 75 | static void print_tag_header() |
76 | { | 76 | { |
77 | html("<tr class='nohover'><th class='left'>Tag</th>" | 77 | html("<tr class='nohover'><th class='left'>Tag</th>" |
78 | "<th class='left'>Age</th>" | 78 | "<th class='left'>Age</th>" |
79 | "<th class='left'>Author</th>" | 79 | "<th class='left'>Author</th>" |
80 | "<th class='left'>Reference</th></tr>\n"); | 80 | "<th class='left'>Reference</th></tr>\n"); |
81 | header = 1; | 81 | header = 1; |
82 | } | 82 | } |
83 | 83 | ||
84 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, | 84 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, |
85 | int flags, void *cb_data) | 85 | int flags, void *cb_data) |
86 | { | 86 | { |
87 | struct tag *tag; | 87 | struct tag *tag; |
88 | struct taginfo *info; | 88 | struct taginfo *info; |
89 | struct object *obj; | 89 | struct object *obj; |
90 | char buf[256], *url; | 90 | char buf[256], *url; |
@@ -29,65 +29,64 @@ static void print_object(const unsigned char *sha1, char *path) | |||
29 | if (!buf) { | 29 | if (!buf) { |
30 | cgit_print_error(fmt("Error reading object %s", | 30 | cgit_print_error(fmt("Error reading object %s", |
31 | sha1_to_hex(sha1))); | 31 | sha1_to_hex(sha1))); |
32 | return; | 32 | return; |
33 | } | 33 | } |
34 | 34 | ||
35 | html("<table class='blob'>\n"); | 35 | html("<table class='blob'>\n"); |
36 | idx = 0; | 36 | idx = 0; |
37 | start = 0; | 37 | start = 0; |
38 | lineno = 0; | 38 | lineno = 0; |
39 | while(idx < size) { | 39 | while(idx < size) { |
40 | if (buf[idx] == '\n') { | 40 | if (buf[idx] == '\n') { |
41 | buf[idx] = '\0'; | 41 | buf[idx] = '\0'; |
42 | htmlf("<tr><td class='no'>%d</td><td class='txt'>", | 42 | htmlf("<tr><td class='no'>%d</td><td class='txt'>", |
43 | ++lineno); | 43 | ++lineno); |
44 | html_txt(buf + start); | 44 | html_txt(buf + start); |
45 | html("</td></tr>\n"); | 45 | html("</td></tr>\n"); |
46 | start = idx + 1; | 46 | start = idx + 1; |
47 | } | 47 | } |
48 | idx++; | 48 | idx++; |
49 | } | 49 | } |
50 | html("</table>\n"); | 50 | html("</table>\n"); |
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, | 54 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
55 | const char *pathname, unsigned int mode, int stage) | 55 | const char *pathname, unsigned int mode, int stage) |
56 | { | 56 | { |
57 | char *name; | 57 | char *name; |
58 | char *fullpath; | 58 | char *fullpath; |
59 | enum object_type type; | 59 | enum object_type type; |
60 | unsigned long size = 0; | 60 | unsigned long size = 0; |
61 | char *url, *qry; | ||
62 | 61 | ||
63 | name = xstrdup(pathname); | 62 | name = xstrdup(pathname); |
64 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", | 63 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
65 | cgit_query_path ? "/" : "", name); | 64 | cgit_query_path ? "/" : "", name); |
66 | 65 | ||
67 | type = sha1_object_info(sha1, &size); | 66 | type = sha1_object_info(sha1, &size); |
68 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { | 67 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
69 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", | 68 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
70 | name, | 69 | name, |
71 | sha1_to_hex(sha1)); | 70 | sha1_to_hex(sha1)); |
72 | return 0; | 71 | return 0; |
73 | } | 72 | } |
74 | 73 | ||
75 | html("<tr><td class='ls-mode'>"); | 74 | html("<tr><td class='ls-mode'>"); |
76 | html_filemode(mode); | 75 | html_filemode(mode); |
77 | html("</td><td>"); | 76 | html("</td><td>"); |
78 | if (S_ISDIRLNK(mode)) { | 77 | if (S_ISDIRLNK(mode)) { |
79 | htmlf("<a class='ls-mod' href='"); | 78 | htmlf("<a class='ls-mod' href='"); |
80 | html_attr(fmt(cgit_repo->module_link, | 79 | html_attr(fmt(cgit_repo->module_link, |
81 | name, | 80 | name, |
82 | sha1_to_hex(sha1))); | 81 | sha1_to_hex(sha1))); |
83 | html("'>"); | 82 | html("'>"); |
84 | html_txt(name); | 83 | html_txt(name); |
85 | html("</a>"); | 84 | html("</a>"); |
86 | } else if (S_ISDIR(mode)) { | 85 | } else if (S_ISDIR(mode)) { |
87 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, | 86 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, |
88 | curr_rev, fullpath); | 87 | curr_rev, fullpath); |
89 | } else { | 88 | } else { |
90 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, | 89 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, |
91 | curr_rev, fullpath); | 90 | curr_rev, fullpath); |
92 | } | 91 | } |
93 | htmlf("</td><td class='ls-size'>%li</td>", size); | 92 | htmlf("</td><td class='ls-size'>%li</td>", size); |