-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.c | 6 | ||||
-rw-r--r-- | cgit.css | 11 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | git.h | 13 | ||||
-rw-r--r-- | ui-log.c | 7 | ||||
-rw-r--r-- | ui-summary.c | 7 | ||||
-rw-r--r-- | ui-tree.c | 70 | ||||
-rw-r--r-- | ui-view.c | 2 |
9 files changed, 112 insertions, 7 deletions
@@ -3,13 +3,13 @@ CGIT_VERSION = 0.1-pre | |||
3 | INSTALL_BIN = /var/www/htdocs/cgit.cgi | 3 | INSTALL_BIN = /var/www/htdocs/cgit.cgi |
4 | INSTALL_CSS = /var/www/htdocs/cgit.css | 4 | INSTALL_CSS = /var/www/htdocs/cgit.css |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | 6 | ||
7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto | 7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto |
8 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 8 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
9 | ui-summary.o ui-log.o ui-view.c | 9 | ui-summary.o ui-log.o ui-view.c ui-tree.c |
10 | 10 | ||
11 | CFLAGS += -Wall | 11 | CFLAGS += -Wall |
12 | 12 | ||
13 | all: cgit | 13 | all: cgit |
14 | 14 | ||
15 | install: all | 15 | install: all |
@@ -23,16 +23,18 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); | 25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); | 26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
27 | cgit_print_docstart(title, item); | 27 | cgit_print_docstart(title, item); |
28 | cgit_print_pageheader(title); | 28 | cgit_print_pageheader(title); |
29 | if (!cgit_query_page) | 29 | if (!cgit_query_page) { |
30 | cgit_print_summary(); | 30 | cgit_print_summary(); |
31 | else if (!strcmp(cgit_query_page, "log")) { | 31 | } else if (!strcmp(cgit_query_page, "log")) { |
32 | cgit_print_log(cgit_query_head, 0, 100); | 32 | cgit_print_log(cgit_query_head, 0, 100); |
33 | } else if (!strcmp(cgit_query_page, "tree")) { | ||
34 | cgit_print_tree(cgit_query_sha1); | ||
33 | } else if (!strcmp(cgit_query_page, "view")) { | 35 | } else if (!strcmp(cgit_query_page, "view")) { |
34 | cgit_print_view(cgit_query_sha1); | 36 | cgit_print_view(cgit_query_sha1); |
35 | } | 37 | } |
36 | cgit_print_docend(); | 38 | cgit_print_docend(); |
37 | } | 39 | } |
38 | 40 | ||
@@ -27,13 +27,13 @@ table.list th { | |||
27 | border-bottom: solid 1px #aaa; | 27 | border-bottom: solid 1px #aaa; |
28 | padding: 0.1em 0.5em 0.1em; | 28 | padding: 0.1em 0.5em 0.1em; |
29 | vertical-align: baseline; | 29 | vertical-align: baseline; |
30 | } | 30 | } |
31 | table.list td { | 31 | table.list td { |
32 | border: none; | 32 | border: none; |
33 | padding: 0.1em 0.5em; | 33 | padding: 0.1em 1em 0.1em 0.5em; |
34 | background: white; | 34 | background: white; |
35 | } | 35 | } |
36 | 36 | ||
37 | img { | 37 | img { |
38 | border: none; | 38 | border: none; |
39 | } | 39 | } |
@@ -58,6 +58,15 @@ div#content { | |||
58 | 58 | ||
59 | div.error { | 59 | div.error { |
60 | color: red; | 60 | color: red; |
61 | font-weight: bold; | 61 | font-weight: bold; |
62 | margin: 1em 2em; | 62 | margin: 1em 2em; |
63 | } \ No newline at end of file | 63 | } \ No newline at end of file |
64 | div.ls-dir a { | ||
65 | font-weight: bold; | ||
66 | } | ||
67 | th.filesize, td.filesize { | ||
68 | text-align: right; | ||
69 | } | ||
70 | th.filemode, td.filemode { | ||
71 | text-align: center; | ||
72 | } | ||
@@ -80,8 +80,9 @@ extern void cgit_print_docend(); | |||
80 | extern void cgit_print_pageheader(char *title); | 80 | extern void cgit_print_pageheader(char *title); |
81 | 81 | ||
82 | extern void cgit_print_repolist(struct cacheitem *item); | 82 | extern void cgit_print_repolist(struct cacheitem *item); |
83 | extern void cgit_print_summary(); | 83 | extern void cgit_print_summary(); |
84 | extern void cgit_print_log(const char *tip, int ofs, int cnt); | 84 | extern void cgit_print_log(const char *tip, int ofs, int cnt); |
85 | extern void cgit_print_view(char *hex); | 85 | extern void cgit_print_view(char *hex); |
86 | extern void cgit_print_tree(const char *sha1); | ||
86 | 87 | ||
87 | #endif /* CGIT_H */ | 88 | #endif /* CGIT_H */ |
@@ -185,12 +185,25 @@ struct tree { | |||
185 | struct object object; | 185 | struct object object; |
186 | void *buffer; | 186 | void *buffer; |
187 | unsigned long size; | 187 | unsigned long size; |
188 | }; | 188 | }; |
189 | 189 | ||
190 | 190 | ||
191 | struct tree *lookup_tree(const unsigned char *sha1); | ||
192 | int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size); | ||
193 | int parse_tree(struct tree *tree); | ||
194 | struct tree *parse_tree_indirect(const unsigned char *sha1); | ||
195 | |||
196 | typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int); | ||
197 | |||
198 | extern int read_tree_recursive(struct tree *tree, | ||
199 | const char *base, int baselen, | ||
200 | int stage, const char **match, | ||
201 | read_tree_fn_t fn); | ||
202 | |||
203 | extern int read_tree(struct tree *tree, int stage, const char **paths); | ||
191 | 204 | ||
192 | 205 | ||
193 | /* from git:commit.h */ | 206 | /* from git:commit.h */ |
194 | 207 | ||
195 | struct commit_list { | 208 | struct commit_list { |
196 | struct commit *item; | 209 | struct commit *item; |
@@ -79,12 +79,17 @@ static void cgit_print_commit_shortlog(struct commit *commit) | |||
79 | char *url = cgit_pageurl(cgit_query_repo, "view", qry); | 79 | char *url = cgit_pageurl(cgit_query_repo, "view", qry); |
80 | html_link_open(url, NULL, NULL); | 80 | html_link_open(url, NULL, NULL); |
81 | html_txt(subject); | 81 | html_txt(subject); |
82 | html_link_close(); | 82 | html_link_close(); |
83 | html("</td><td>"); | 83 | html("</td><td>"); |
84 | html_txt(author); | 84 | html_txt(author); |
85 | html("</td><td><a href='"); | ||
86 | html_attr(cgit_pageurl(cgit_query_repo, "tree", | ||
87 | fmt("id=%s", | ||
88 | sha1_to_hex(commit->tree->object.sha1)))); | ||
89 | html("'>tree</a>"); | ||
85 | html("</td></tr>\n"); | 90 | html("</td></tr>\n"); |
86 | } | 91 | } |
87 | 92 | ||
88 | void cgit_print_log(const char *tip, int ofs, int cnt) | 93 | void cgit_print_log(const char *tip, int ofs, int cnt) |
89 | { | 94 | { |
90 | struct rev_info rev; | 95 | struct rev_info rev; |
@@ -99,13 +104,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt) | |||
99 | rev.show_root_diff = 0; | 104 | rev.show_root_diff = 0; |
100 | setup_revisions(2, argv, &rev, NULL); | 105 | setup_revisions(2, argv, &rev, NULL); |
101 | prepare_revision_walk(&rev); | 106 | prepare_revision_walk(&rev); |
102 | 107 | ||
103 | html("<h2>Log</h2>"); | 108 | html("<h2>Log</h2>"); |
104 | html("<table class='list'>"); | 109 | html("<table class='list'>"); |
105 | html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); | 110 | html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</th></tr>\n"); |
106 | while ((commit = get_revision(&rev)) != NULL && n++ < 100) { | 111 | while ((commit = get_revision(&rev)) != NULL && n++ < 100) { |
107 | cgit_print_commit_shortlog(commit); | 112 | cgit_print_commit_shortlog(commit); |
108 | free(commit->buffer); | 113 | free(commit->buffer); |
109 | commit->buffer = NULL; | 114 | commit->buffer = NULL; |
110 | free_commit_list(commit->parents); | 115 | free_commit_list(commit->parents); |
111 | commit->parents = NULL; | 116 | commit->parents = NULL; |
diff --git a/ui-summary.c b/ui-summary.c index cc918ad..29baa74 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -24,12 +24,17 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
24 | html_txt(buf); | 24 | html_txt(buf); |
25 | html_link_close(); | 25 | html_link_close(); |
26 | html("</td><td>"); | 26 | html("</td><td>"); |
27 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, | 27 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, |
28 | sizeof(buf), 0, NULL, NULL, 0); | 28 | sizeof(buf), 0, NULL, NULL, 0); |
29 | html_txt(buf); | 29 | html_txt(buf); |
30 | html("</td><td><a href='"); | ||
31 | html_attr(cgit_pageurl(cgit_query_repo, "tree", | ||
32 | fmt("id=%s", | ||
33 | sha1_to_hex(commit->tree->object.sha1)))); | ||
34 | html("'>tree</a>"); | ||
30 | html("</td></tr>\n"); | 35 | html("</td></tr>\n"); |
31 | } else { | 36 | } else { |
32 | html("<tr><td>"); | 37 | html("<tr><td>"); |
33 | html_txt(buf); | 38 | html_txt(buf); |
34 | html("</td><td>"); | 39 | html("</td><td>"); |
35 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); | 40 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); |
@@ -38,13 +43,13 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
38 | return 0; | 43 | return 0; |
39 | } | 44 | } |
40 | 45 | ||
41 | static void cgit_print_branches() | 46 | static void cgit_print_branches() |
42 | { | 47 | { |
43 | html("<table class='list'>"); | 48 | html("<table class='list'>"); |
44 | html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); | 49 | html("<tr><th>Branch name</th><th>Latest</th><th>Link</th></tr>\n"); |
45 | for_each_branch_ref(cgit_print_branch_cb, NULL); | 50 | for_each_branch_ref(cgit_print_branch_cb, NULL); |
46 | html("</table>"); | 51 | html("</table>"); |
47 | } | 52 | } |
48 | 53 | ||
49 | void cgit_print_summary() | 54 | void cgit_print_summary() |
50 | { | 55 | { |
diff --git a/ui-tree.c b/ui-tree.c new file mode 100644 index 0000000..84930cb --- a/dev/null +++ b/ui-tree.c | |||
@@ -0,0 +1,70 @@ | |||
1 | /* ui-tree.c: functions for tree output | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | |||
11 | |||
12 | static int print_entry(const unsigned char *sha1, const char *base, | ||
13 | int baselen, const char *pathname, unsigned int mode, | ||
14 | int stage) | ||
15 | { | ||
16 | char *name; | ||
17 | char type[20]; | ||
18 | unsigned long size; | ||
19 | |||
20 | if (sha1_object_info(sha1, type, &size)) { | ||
21 | cgit_print_error(fmt("Bad object name: %s", | ||
22 | sha1_to_hex(sha1))); | ||
23 | return 0; | ||
24 | } | ||
25 | name = xstrdup(pathname); | ||
26 | html("<tr><td>"); | ||
27 | if (S_ISDIR(mode)) { | ||
28 | html("<div class='ls-dir'><a href='"); | ||
29 | html_attr(cgit_pageurl(cgit_query_repo, "tree", | ||
30 | fmt("id=%s", sha1_to_hex(sha1)))); | ||
31 | } else { | ||
32 | html("<div class='ls-blob'><a href='"); | ||
33 | html_attr(cgit_pageurl(cgit_query_repo, "view", | ||
34 | fmt("id=%s", sha1_to_hex(sha1)))); | ||
35 | } | ||
36 | html("'>"); | ||
37 | html_txt(name); | ||
38 | if (S_ISDIR(mode)) | ||
39 | html("/"); | ||
40 | html("</a></div></td>"); | ||
41 | htmlf("<td class='filesize'>%li</td>", size); | ||
42 | htmlf("<td class='filemode'>%06o</td>", mode); | ||
43 | html("</tr>\n"); | ||
44 | free(name); | ||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | void cgit_print_tree(const char *hex) | ||
49 | { | ||
50 | struct tree *tree; | ||
51 | unsigned char sha1[20]; | ||
52 | |||
53 | if (get_sha1_hex(hex, sha1)) { | ||
54 | cgit_print_error(fmt("Invalid object id: %s", hex)); | ||
55 | return; | ||
56 | } | ||
57 | tree = parse_tree_indirect(sha1); | ||
58 | if (!tree) { | ||
59 | cgit_print_error(fmt("Not a tree object: %s", hex)); | ||
60 | return; | ||
61 | } | ||
62 | |||
63 | html("<h2>Tree content</h2>\n"); | ||
64 | html("<table class='list'>\n"); | ||
65 | html("<tr><th>Name</th>"); | ||
66 | html("<th class='filesize'>Size</th>"); | ||
67 | html("<th class='filemode'>Mode</th></tr>\n"); | ||
68 | read_tree_recursive(tree, "", 0, 1, NULL, print_entry); | ||
69 | html("</table>\n"); | ||
70 | } | ||
@@ -17,13 +17,13 @@ void cgit_print_view(char *hex) | |||
17 | 17 | ||
18 | if (get_sha1_hex(hex, sha1)){ | 18 | if (get_sha1_hex(hex, sha1)){ |
19 | cgit_print_error(fmt("Bad hex value: %s", hex)); | 19 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
20 | return; | 20 | return; |
21 | } | 21 | } |
22 | 22 | ||
23 | if (sha1_object_info(sha1, type, NULL)){ | 23 | if (sha1_object_info(sha1, type, &size)){ |
24 | cgit_print_error("Bad object name"); | 24 | cgit_print_error("Bad object name"); |
25 | return; | 25 | return; |
26 | } | 26 | } |
27 | 27 | ||
28 | buf = read_sha1_file(sha1, type, &size); | 28 | buf = read_sha1_file(sha1, type, &size); |
29 | if (!buf) { | 29 | if (!buf) { |