-rw-r--r-- | Makefile | 14 | ||||
-rw-r--r-- | cgit.c | 67 | ||||
-rw-r--r-- | cgit.css | 64 | ||||
-rw-r--r-- | cgit.h | 12 | ||||
-rw-r--r-- | cgit.png | bin | 3790 -> 5406 bytes | |||
-rw-r--r-- | cgitrc | 12 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | html.c | 2 | ||||
-rw-r--r-- | parsing.c | 25 | ||||
-rw-r--r-- | shared.c | 14 | ||||
-rw-r--r-- | tests/.gitignore | 2 | ||||
-rw-r--r-- | tests/Makefile | 13 | ||||
-rwxr-xr-x | tests/setup.sh | 108 | ||||
-rwxr-xr-x | tests/t0010-validate-html.sh | 31 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 13 | ||||
-rwxr-xr-x | tests/t0102-summary.sh | 20 | ||||
-rwxr-xr-x | tests/t0103-log.sh | 15 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 21 | ||||
-rwxr-xr-x | tests/t0105-commit.sh | 22 | ||||
-rwxr-xr-x | tests/t0106-diff.sh | 20 | ||||
-rwxr-xr-x | tests/t0107-snapshot.sh | 36 | ||||
-rw-r--r-- | ui-commit.c | 6 | ||||
-rw-r--r-- | ui-diff.c | 2 | ||||
-rw-r--r-- | ui-log.c | 23 | ||||
-rw-r--r-- | ui-patch.c | 110 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 67 | ||||
-rw-r--r-- | ui-summary.c | 2 | ||||
-rw-r--r-- | ui-tree.c | 6 |
29 files changed, 653 insertions, 76 deletions
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | |||
4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.5.3.8 | 7 | GIT_VER = 1.5.4.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # | 10 | # |
@@ -16,10 +16,15 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |||
16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ | 18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ |
19 | ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o | 19 | ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o |
20 | 20 | ||
21 | 21 | ||
22 | .PHONY: all git install clean distclean emptycache force-version get-git | 22 | ifdef NEEDS_LIBICONV |
23 | EXTLIBS += -liconv | ||
24 | endif | ||
25 | |||
26 | |||
27 | .PHONY: all git test install clean distclean emptycache force-version get-git | ||
23 | 28 | ||
24 | all: cgit git | 29 | all: cgit git |
25 | 30 | ||
@@ -49,6 +54,9 @@ git: | |||
49 | cd git && $(MAKE) xdiff/lib.a | 54 | cd git && $(MAKE) xdiff/lib.a |
50 | cd git && $(MAKE) libgit.a | 55 | cd git && $(MAKE) libgit.a |
51 | 56 | ||
57 | test: all | ||
58 | $(MAKE) -C tests | ||
59 | |||
52 | install: all | 60 | install: all |
53 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 61 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
54 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 62 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
@@ -45,13 +45,44 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
45 | return 1; | 45 | return 1; |
46 | } | 46 | } |
47 | 47 | ||
48 | struct refmatch { | ||
49 | char *req_ref; | ||
50 | char *first_ref; | ||
51 | int match; | ||
52 | }; | ||
53 | |||
54 | int find_current_ref(const char *refname, const unsigned char *sha1, | ||
55 | int flags, void *cb_data) | ||
56 | { | ||
57 | struct refmatch *info; | ||
58 | |||
59 | info = (struct refmatch *)cb_data; | ||
60 | if (!strcmp(refname, info->req_ref)) | ||
61 | info->match = 1; | ||
62 | if (!info->first_ref) | ||
63 | info->first_ref = xstrdup(refname); | ||
64 | return info->match; | ||
65 | } | ||
66 | |||
67 | char *find_default_branch(struct repoinfo *repo) | ||
68 | { | ||
69 | struct refmatch info; | ||
70 | |||
71 | info.req_ref = repo->defbranch; | ||
72 | info.first_ref = NULL; | ||
73 | info.match = 0; | ||
74 | for_each_branch_ref(find_current_ref, &info); | ||
75 | if (info.match) | ||
76 | return info.req_ref; | ||
77 | else | ||
78 | return info.first_ref; | ||
79 | } | ||
80 | |||
48 | static void cgit_print_repo_page(struct cacheitem *item) | 81 | static void cgit_print_repo_page(struct cacheitem *item) |
49 | { | 82 | { |
50 | char *title; | 83 | char *title, *tmp; |
51 | int show_search; | 84 | int show_search; |
52 | 85 | unsigned char sha1[20]; | |
53 | if (!cgit_query_head) | ||
54 | cgit_query_head = cgit_repo->defbranch; | ||
55 | 86 | ||
56 | if (chdir(cgit_repo->path)) { | 87 | if (chdir(cgit_repo->path)) { |
57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); | 88 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
@@ -67,6 +98,29 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
67 | show_search = 0; | 98 | show_search = 0; |
68 | setenv("GIT_DIR", cgit_repo->path, 1); | 99 | setenv("GIT_DIR", cgit_repo->path, 1); |
69 | 100 | ||
101 | if (!cgit_query_head) { | ||
102 | cgit_query_head = xstrdup(find_default_branch(cgit_repo)); | ||
103 | cgit_repo->defbranch = cgit_query_head; | ||
104 | } | ||
105 | |||
106 | if (!cgit_query_head) { | ||
107 | cgit_print_docstart(title, item); | ||
108 | cgit_print_pageheader(title, 0); | ||
109 | cgit_print_error("Repository seems to be empty"); | ||
110 | cgit_print_docend(); | ||
111 | return; | ||
112 | } | ||
113 | |||
114 | if (get_sha1(cgit_query_head, sha1)) { | ||
115 | tmp = xstrdup(cgit_query_head); | ||
116 | cgit_query_head = cgit_repo->defbranch; | ||
117 | cgit_print_docstart(title, item); | ||
118 | cgit_print_pageheader(title, 0); | ||
119 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | ||
120 | cgit_print_docend(); | ||
121 | return; | ||
122 | } | ||
123 | |||
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { | 124 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, | 125 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
72 | cgit_repobasename(cgit_repo->url), | 126 | cgit_repobasename(cgit_repo->url), |
@@ -75,6 +129,11 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
75 | return; | 129 | return; |
76 | } | 130 | } |
77 | 131 | ||
132 | if (cgit_cmd == CMD_PATCH) { | ||
133 | cgit_print_patch(cgit_query_sha1, item); | ||
134 | return; | ||
135 | } | ||
136 | |||
78 | if (cgit_cmd == CMD_BLOB) { | 137 | if (cgit_cmd == CMD_BLOB) { |
79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 138 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
80 | return; | 139 | return; |
@@ -8,7 +8,7 @@ body { | |||
8 | font-size: 10pt; | 8 | font-size: 10pt; |
9 | color: #333; | 9 | color: #333; |
10 | background: white; | 10 | background: white; |
11 | padding-left: 4px; | 11 | padding: 4px; |
12 | } | 12 | } |
13 | 13 | ||
14 | table { | 14 | table { |
@@ -78,29 +78,39 @@ img { | |||
78 | border: none; | 78 | border: none; |
79 | } | 79 | } |
80 | 80 | ||
81 | div#sidebar { | 81 | table#layout { |
82 | border-collapse: collapse; | ||
83 | border: none; | ||
84 | margin: 0px; | ||
85 | } | ||
86 | |||
87 | td#sidebar { | ||
82 | vertical-align: top; | 88 | vertical-align: top; |
83 | width: 162px; | 89 | width: 162px; |
84 | padding: 0px 0px 0px 0px; | 90 | padding: 0px 0px 0px 0px; |
85 | margin: 4px; | 91 | margin: 0px; |
86 | float: left; | ||
87 | } | 92 | } |
88 | 93 | ||
89 | div#logo { | 94 | td#sidebar table { |
95 | border-collapse: separate; | ||
96 | border-spacing: 0px; | ||
90 | margin: 0px; | 97 | margin: 0px; |
91 | padding: 4px 0px 4px 0px; | 98 | padding: 0px; |
92 | text-align: center; | ||
93 | background-color: #ccc; | 99 | background-color: #ccc; |
100 | } | ||
101 | |||
102 | td#sidebar table.sidebar td.sidebar { | ||
103 | padding: 4px; | ||
94 | border-top: solid 1px #eee; | 104 | border-top: solid 1px #eee; |
95 | border-left: solid 1px #eee; | 105 | border-left: solid 1px #eee; |
96 | border-right: solid 1px #aaa; | 106 | border-right: solid 1px #aaa; |
97 | border-bottom: solid 1px #aaa; | 107 | border-bottom: solid 1px #aaa; |
98 | } | 108 | } |
99 | 109 | ||
100 | div#sidebar div.infobox { | 110 | div#logo { |
101 | margin: 0px 0px 0px 0px; | 111 | margin: 0px; |
102 | padding: 0.5em; | 112 | padding: 4px 0px 4px 0px; |
103 | text-align: left; | 113 | text-align: center; |
104 | background-color: #ccc; | 114 | background-color: #ccc; |
105 | border-top: solid 1px #eee; | 115 | border-top: solid 1px #eee; |
106 | border-left: solid 1px #eee; | 116 | border-left: solid 1px #eee; |
@@ -108,50 +118,44 @@ div#sidebar div.infobox { | |||
108 | border-bottom: solid 1px #aaa; | 118 | border-bottom: solid 1px #aaa; |
109 | } | 119 | } |
110 | 120 | ||
111 | div#sidebar div.infobox h1 { | 121 | td#sidebar h1 { |
112 | font-size: 11pt; | 122 | font-size: 10pt; |
113 | font-weight: bold; | 123 | font-weight: bold; |
114 | margin: 0px; | 124 | margin: 8px 0px 0px 0px; |
115 | } | 125 | } |
116 | 126 | ||
117 | div#sidebar div.infobox a.menu { | 127 | td#sidebar h1.first { |
128 | margin-top: 0px; | ||
129 | } | ||
130 | |||
131 | td#sidebar a.menu { | ||
118 | display: block; | 132 | display: block; |
119 | background-color: #ccc; | 133 | background-color: #ccc; |
120 | padding: 0.1em 0.5em; | 134 | padding: 0.1em 0.5em; |
121 | text-decoration: none; | 135 | text-decoration: none; |
122 | } | 136 | } |
123 | 137 | ||
124 | div#sidebar div.infobox a.menu:hover { | 138 | td#sidebar a.menu:hover { |
125 | background-color: #bbb; | 139 | background-color: #bbb; |
126 | text-decoration: none; | 140 | text-decoration: none; |
127 | } | 141 | } |
128 | 142 | ||
129 | div#sidebar div.infobox select { | 143 | td#sidebar select { |
130 | width: 100%; | 144 | width: 100%; |
131 | border: solid 1px #aaa; | ||
132 | background-color: #bbb; | ||
133 | margin: 2px 0px 0px 0px; | 145 | margin: 2px 0px 0px 0px; |
134 | padding: 0px; | ||
135 | } | 146 | } |
136 | 147 | ||
137 | td#branch-dropdown-cell { | 148 | td#sidebar form { |
138 | width: 99%; | 149 | text-align: right; |
139 | } | 150 | } |
140 | 151 | ||
141 | input#switch-btn { | 152 | input#switch-btn { |
142 | width: 20px; | ||
143 | border: solid 1px #aaa; | ||
144 | background-color: #bbb; | ||
145 | margin: 2px 0px 0px 0px; | 153 | margin: 2px 0px 0px 0px; |
146 | padding: 0px; | ||
147 | } | 154 | } |
148 | 155 | ||
149 | div#sidebar div.infobox input.txt { | 156 | td#sidebar input.txt { |
150 | width: 100%; | 157 | width: 100%; |
151 | border: solid 1px #aaa; | ||
152 | background-color: #bbb; | ||
153 | margin: 2px 0px 0px 0px; | 158 | margin: 2px 0px 0px 0px; |
154 | padding: 0; | ||
155 | } | 159 | } |
156 | 160 | ||
157 | table#grid { | 161 | table#grid { |
@@ -16,6 +16,7 @@ | |||
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | ||
19 | 20 | ||
20 | 21 | ||
21 | /* | 22 | /* |
@@ -29,6 +30,7 @@ | |||
29 | #define CMD_SNAPSHOT 6 | 30 | #define CMD_SNAPSHOT 6 |
30 | #define CMD_TAG 7 | 31 | #define CMD_TAG 7 |
31 | #define CMD_REFS 8 | 32 | #define CMD_REFS 8 |
33 | #define CMD_PATCH 9 | ||
32 | 34 | ||
33 | /* | 35 | /* |
34 | * Dateformats used on misc. pages | 36 | * Dateformats used on misc. pages |
@@ -48,6 +50,11 @@ | |||
48 | #define TM_MONTH (TM_YEAR / 12.0) | 50 | #define TM_MONTH (TM_YEAR / 12.0) |
49 | 51 | ||
50 | 52 | ||
53 | /* | ||
54 | * Default encoding | ||
55 | */ | ||
56 | #define PAGE_ENCODING "UTF-8" | ||
57 | |||
51 | typedef void (*configfn)(const char *name, const char *value); | 58 | typedef void (*configfn)(const char *name, const char *value); |
52 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 59 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
53 | typedef void (*linediff_fn)(char *line, int len); | 60 | typedef void (*linediff_fn)(char *line, int len); |
@@ -69,6 +76,7 @@ struct repoinfo { | |||
69 | char *group; | 76 | char *group; |
70 | char *module_link; | 77 | char *module_link; |
71 | char *readme; | 78 | char *readme; |
79 | char *clone_url; | ||
72 | int snapshots; | 80 | int snapshots; |
73 | int enable_log_filecount; | 81 | int enable_log_filecount; |
74 | int enable_log_linecount; | 82 | int enable_log_linecount; |
@@ -90,6 +98,7 @@ struct commitinfo { | |||
90 | unsigned long committer_date; | 98 | unsigned long committer_date; |
91 | char *subject; | 99 | char *subject; |
92 | char *msg; | 100 | char *msg; |
101 | char *msg_encoding; | ||
93 | }; | 102 | }; |
94 | 103 | ||
95 | struct taginfo { | 104 | struct taginfo { |
@@ -132,6 +141,8 @@ extern char *cgit_virtual_root; | |||
132 | extern char *cgit_script_name; | 141 | extern char *cgit_script_name; |
133 | extern char *cgit_cache_root; | 142 | extern char *cgit_cache_root; |
134 | extern char *cgit_repo_group; | 143 | extern char *cgit_repo_group; |
144 | extern char *cgit_robots; | ||
145 | extern char *cgit_clone_prefix; | ||
135 | 146 | ||
136 | extern int cgit_nocache; | 147 | extern int cgit_nocache; |
137 | extern int cgit_snapshots; | 148 | extern int cgit_snapshots; |
@@ -273,6 +284,7 @@ extern void cgit_print_commit(char *hex); | |||
273 | extern void cgit_print_refs(); | 284 | extern void cgit_print_refs(); |
274 | extern void cgit_print_tag(char *revname); | 285 | extern void cgit_print_tag(char *revname); |
275 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); | 286 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
287 | extern void cgit_print_patch(char *hex, struct cacheitem *item); | ||
276 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 288 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, |
277 | const char *hex, const char *prefix, | 289 | const char *hex, const char *prefix, |
278 | const char *filename, int snapshot); | 290 | const char *filename, int snapshot); |
Binary files differ | |||
@@ -8,6 +8,11 @@ | |||
8 | #nocache=0 | 8 | #nocache=0 |
9 | 9 | ||
10 | 10 | ||
11 | ## This variable can be used to override the default value for "robots" | ||
12 | ## meta-tag. If unset, the meta-tag isn't generated. | ||
13 | #robots=index, nofollow | ||
14 | |||
15 | |||
11 | ## Set allowed snapshot types by default. Can be overridden per repo | 16 | ## Set allowed snapshot types by default. Can be overridden per repo |
12 | # can be any combination of zip/tar.gz/tar.bz2/tar | 17 | # can be any combination of zip/tar.gz/tar.bz2/tar |
13 | #snapshots=0 | 18 | #snapshots=0 |
@@ -111,6 +116,11 @@ | |||
111 | #module-link=./?repo=%s&page=commit&id=%s | 116 | #module-link=./?repo=%s&page=commit&id=%s |
112 | 117 | ||
113 | 118 | ||
119 | ## Shared prefix which, when combined with repo url, becomes the url used | ||
120 | ## to clone the repo | ||
121 | #clone-prefix= | ||
122 | |||
123 | |||
114 | ## Number of chars shown of repo description (in repolist view) | 124 | ## Number of chars shown of repo description (in repolist view) |
115 | #max-repodesc-length=60 | 125 | #max-repodesc-length=60 |
116 | 126 | ||
@@ -162,12 +172,14 @@ | |||
162 | #repo.enable-log-linecount=0 ## override the default linecount setting | 172 | #repo.enable-log-linecount=0 ## override the default linecount setting |
163 | #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link | 173 | #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link |
164 | #repo.readme=info/web/readme ## specify a file to include on summary page | 174 | #repo.readme=info/web/readme ## specify a file to include on summary page |
175 | #repo.clone-url=git://hjemli.net/pub/git/cgit | ||
165 | 176 | ||
166 | ## Additional repositories grouped under "mirrors" | 177 | ## Additional repositories grouped under "mirrors" |
167 | #repo.group=mirrors | 178 | #repo.group=mirrors |
168 | 179 | ||
169 | #repo.url=git | 180 | #repo.url=git |
170 | #repo.path=/pub/git/git | 181 | #repo.path=/pub/git/git |
182 | #repo.clone-url=git://hjemli.net/pub/git/git | ||
171 | # | 183 | # |
172 | #repo.url=linux | 184 | #repo.url=linux |
173 | #repo.path=/pub/git/linux | 185 | #repo.path=/pub/git/linux |
diff --git a/git b/git | |||
Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c | Subproject 527270689c364bea9b0630df9bae5e09c2071c1 | ||
@@ -122,7 +122,7 @@ void html_option(char *value, char *text, char *selected_value) | |||
122 | html_attr(value); | 122 | html_attr(value); |
123 | html("'"); | 123 | html("'"); |
124 | if (selected_value && !strcmp(selected_value, value)) | 124 | if (selected_value && !strcmp(selected_value, value)) |
125 | html(" selected"); | 125 | html(" selected='selected'"); |
126 | html(">"); | 126 | html(">"); |
127 | html_txt(text); | 127 | html_txt(text); |
128 | html("</option>\n"); | 128 | html("</option>\n"); |
@@ -199,6 +199,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | ret->msg_encoding = NULL; | ||
202 | 203 | ||
203 | if (p == NULL) | 204 | if (p == NULL) |
204 | return ret; | 205 | return ret; |
@@ -233,6 +234,14 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
233 | p = strchr(t, '\n') + 1; | 234 | p = strchr(t, '\n') + 1; |
234 | } | 235 | } |
235 | 236 | ||
237 | if (!strncmp(p, "encoding ", 9)) { | ||
238 | p += 9; | ||
239 | t = strchr(p, '\n') + 1; | ||
240 | ret->msg_encoding = substr(p, t); | ||
241 | p = t; | ||
242 | } else | ||
243 | ret->msg_encoding = xstrdup(PAGE_ENCODING); | ||
244 | |||
236 | while (*p && (*p != '\n')) | 245 | while (*p && (*p != '\n')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 246 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 247 | ||
@@ -253,6 +262,22 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
253 | } else | 262 | } else |
254 | ret->subject = substr(p, p+strlen(p)); | 263 | ret->subject = substr(p, p+strlen(p)); |
255 | 264 | ||
265 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { | ||
266 | t = reencode_string(ret->subject, PAGE_ENCODING, | ||
267 | ret->msg_encoding); | ||
268 | if(t) { | ||
269 | free(ret->subject); | ||
270 | ret->subject = t; | ||
271 | } | ||
272 | |||
273 | t = reencode_string(ret->msg, PAGE_ENCODING, | ||
274 | ret->msg_encoding); | ||
275 | if(t) { | ||
276 | free(ret->msg); | ||
277 | ret->msg = t; | ||
278 | } | ||
279 | } | ||
280 | |||
256 | return ret; | 281 | return ret; |
257 | } | 282 | } |
258 | 283 | ||
@@ -26,6 +26,8 @@ char *cgit_virtual_root = NULL; | |||
26 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 26 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
27 | char *cgit_cache_root = CGIT_CACHE_ROOT; | 27 | char *cgit_cache_root = CGIT_CACHE_ROOT; |
28 | char *cgit_repo_group = NULL; | 28 | char *cgit_repo_group = NULL; |
29 | char *cgit_robots = "index, nofollow"; | ||
30 | char *cgit_clone_prefix = NULL; | ||
29 | 31 | ||
30 | int cgit_nocache = 0; | 32 | int cgit_nocache = 0; |
31 | int cgit_snapshots = 0; | 33 | int cgit_snapshots = 0; |
@@ -68,7 +70,7 @@ int htmlfd = 0; | |||
68 | int cgit_get_cmd_index(const char *cmd) | 70 | int cgit_get_cmd_index(const char *cmd) |
69 | { | 71 | { |
70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 72 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
71 | "snapshot", "tag", "refs", NULL}; | 73 | "snapshot", "tag", "refs", "patch", NULL}; |
72 | int i; | 74 | int i; |
73 | 75 | ||
74 | for(i = 0; cmds[i]; i++) | 76 | for(i = 0; cmds[i]; i++) |
@@ -197,6 +199,10 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
197 | cgit_agefile = xstrdup(value); | 199 | cgit_agefile = xstrdup(value); |
198 | else if (!strcmp(name, "renamelimit")) | 200 | else if (!strcmp(name, "renamelimit")) |
199 | cgit_renamelimit = atoi(value); | 201 | cgit_renamelimit = atoi(value); |
202 | else if (!strcmp(name, "robots")) | ||
203 | cgit_robots = xstrdup(value); | ||
204 | else if (!strcmp(name, "clone-prefix")) | ||
205 | cgit_clone_prefix = xstrdup(value); | ||
200 | else if (!strcmp(name, "repo.group")) | 206 | else if (!strcmp(name, "repo.group")) |
201 | cgit_repo_group = xstrdup(value); | 207 | cgit_repo_group = xstrdup(value); |
202 | else if (!strcmp(name, "repo.url")) | 208 | else if (!strcmp(name, "repo.url")) |
@@ -205,6 +211,8 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
205 | cgit_repo->name = xstrdup(value); | 211 | cgit_repo->name = xstrdup(value); |
206 | else if (cgit_repo && !strcmp(name, "repo.path")) | 212 | else if (cgit_repo && !strcmp(name, "repo.path")) |
207 | cgit_repo->path = trim_end(value, '/'); | 213 | cgit_repo->path = trim_end(value, '/'); |
214 | else if (cgit_repo && !strcmp(name, "repo.clone-url")) | ||
215 | cgit_repo->clone_url = xstrdup(value); | ||
208 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 216 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
209 | cgit_repo->desc = xstrdup(value); | 217 | cgit_repo->desc = xstrdup(value); |
210 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 218 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
@@ -267,6 +275,8 @@ void *cgit_free_commitinfo(struct commitinfo *info) | |||
267 | free(info->committer); | 275 | free(info->committer); |
268 | free(info->committer_email); | 276 | free(info->committer_email); |
269 | free(info->subject); | 277 | free(info->subject); |
278 | free(info->msg); | ||
279 | free(info->msg_encoding); | ||
270 | free(info); | 280 | free(info); |
271 | return NULL; | 281 | return NULL; |
272 | } | 282 | } |
@@ -482,7 +492,7 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
482 | opt.output_format = DIFF_FORMAT_CALLBACK; | 492 | opt.output_format = DIFF_FORMAT_CALLBACK; |
483 | opt.detect_rename = 1; | 493 | opt.detect_rename = 1; |
484 | opt.rename_limit = cgit_renamelimit; | 494 | opt.rename_limit = cgit_renamelimit; |
485 | opt.recursive = 1; | 495 | DIFF_OPT_SET(&opt, RECURSIVE); |
486 | opt.format_callback = cgit_diff_tree_cb; | 496 | opt.format_callback = cgit_diff_tree_cb; |
487 | opt.format_callback_data = fn; | 497 | opt.format_callback_data = fn; |
488 | if (prefix) { | 498 | if (prefix) { |
diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..c1c1c0b --- a/dev/null +++ b/tests/.gitignore | |||
@@ -0,0 +1,2 @@ | |||
1 | trash | ||
2 | test-output.log | ||
diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..697e5a1 --- a/dev/null +++ b/tests/Makefile | |||
@@ -0,0 +1,13 @@ | |||
1 | |||
2 | |||
3 | T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) | ||
4 | |||
5 | all: $(T) | ||
6 | |||
7 | $(T): | ||
8 | @$@ | ||
9 | |||
10 | clean: | ||
11 | $(RM) -rf trash | ||
12 | |||
13 | .PHONY: $(T) clean | ||
diff --git a/tests/setup.sh b/tests/setup.sh new file mode 100755 index 0000000..51d5a75 --- a/dev/null +++ b/tests/setup.sh | |||
@@ -0,0 +1,108 @@ | |||
1 | # This file should be sourced by all test-scripts | ||
2 | # | ||
3 | # Main functions: | ||
4 | # prepare_tests(description) - setup for testing, i.e. create repos+config | ||
5 | # run_test(description, script) - run one test, i.e. eval script | ||
6 | # | ||
7 | # Helper functions | ||
8 | # cgit_query(querystring) - call cgit with the specified querystring | ||
9 | # cgit_url(url) - call cgit with the specified virtual url | ||
10 | # | ||
11 | # Example script: | ||
12 | # | ||
13 | # . setup.sh | ||
14 | # prepare_tests "html validation" | ||
15 | # run_test 'repo index' 'cgit_url "/" | tidy -e' | ||
16 | # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' | ||
17 | |||
18 | |||
19 | mkrepo() { | ||
20 | name=$1 | ||
21 | count=$2 | ||
22 | dir=$PWD | ||
23 | test -d $name && return | ||
24 | printf "Creating testrepo %s\n" $name | ||
25 | mkdir -p $name | ||
26 | cd $name | ||
27 | git init | ||
28 | for ((n=1; n<=count; n++)) | ||
29 | do | ||
30 | echo $n >file-$n | ||
31 | git add file-$n | ||
32 | git commit -m "commit $n" | ||
33 | done | ||
34 | cd $dir | ||
35 | } | ||
36 | |||
37 | setup_repos() | ||
38 | { | ||
39 | rm -rf trash/cache | ||
40 | mkdir -p trash/cache | ||
41 | mkrepo trash/repos/foo 5 >/dev/null | ||
42 | mkrepo trash/repos/bar 50 >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | ||
44 | virtual-root=/ | ||
45 | cache-root=$PWD/trash/cache | ||
46 | |||
47 | nocache=0 | ||
48 | snapshots=tar.gz tar.bz zip | ||
49 | enable-log-filecount=1 | ||
50 | enable-log-linecount=1 | ||
51 | summary-log=5 | ||
52 | summary-branches=5 | ||
53 | summary-tags=5 | ||
54 | |||
55 | repo.url=foo | ||
56 | repo.path=$PWD/trash/repos/foo/.git | ||
57 | repo.desc=the foo repo | ||
58 | |||
59 | repo.url=bar | ||
60 | repo.path=$PWD/trash/repos/bar/.git | ||
61 | repo.desc=the bar repo | ||
62 | EOF | ||
63 | } | ||
64 | |||
65 | prepare_tests() | ||
66 | { | ||
67 | setup_repos | ||
68 | test_count=0 | ||
69 | test_failed=0 | ||
70 | echo "$@" "($0)" | ||
71 | } | ||
72 | |||
73 | tests_done() | ||
74 | { | ||
75 | printf "\n" | ||
76 | if test $test_failed -gt 0 | ||
77 | then | ||
78 | printf "[%s of %s tests failed]\n" $test_failed $test_count | ||
79 | false | ||
80 | fi | ||
81 | } | ||
82 | |||
83 | run_test() | ||
84 | { | ||
85 | desc=$1 | ||
86 | script=$2 | ||
87 | ((test_count++)) | ||
88 | eval "$2" >test-output.log | ||
89 | res=$? | ||
90 | if test $res = 0 | ||
91 | then | ||
92 | printf " %s: ok - %s\n" $test_count "$desc" | ||
93 | else | ||
94 | ((test_failed++)) | ||
95 | printf " %s: fail - %s\n" $test_count "$desc" | ||
96 | fi | ||
97 | } | ||
98 | |||
99 | cgit_query() | ||
100 | { | ||
101 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | ||
102 | } | ||
103 | |||
104 | cgit_url() | ||
105 | { | ||
106 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | ||
107 | } | ||
108 | |||
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh new file mode 100755 index 0000000..907a415 --- a/dev/null +++ b/tests/t0010-validate-html.sh | |||
@@ -0,0 +1,31 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | |||
6 | test_url() | ||
7 | { | ||
8 | tidy_opt="-eq" | ||
9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" | ||
10 | cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count | ||
11 | tidy $tidy_opt trash/tidy-$test_count | ||
12 | rc=$? | ||
13 | if test $rc = 2 | ||
14 | then | ||
15 | false | ||
16 | else | ||
17 | : | ||
18 | fi | ||
19 | } | ||
20 | |||
21 | prepare_tests 'Validate html with tidy' | ||
22 | |||
23 | run_test 'index page' 'test_url ""' | ||
24 | run_test 'foo' 'test_url "foo"' | ||
25 | run_test 'foo/log' 'test_url "foo/log"' | ||
26 | run_test 'foo/tree' 'test_url "foo/tree"' | ||
27 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' | ||
28 | run_test 'foo/commit' 'test_url "foo/commit"' | ||
29 | run_test 'foo/diff' 'test_url "foo/diff"' | ||
30 | |||
31 | tests_done | ||
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh new file mode 100755 index 0000000..12ed00c --- a/dev/null +++ b/tests/t0101-index.sh | |||
@@ -0,0 +1,13 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on index page" | ||
6 | |||
7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' | ||
8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' | ||
9 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | ||
10 | run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp' | ||
11 | run_test 'no log-link' 'grep -ve "foo/log" trash/tmp' | ||
12 | |||
13 | tests_done | ||
diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh new file mode 100755 index 0000000..7edd675 --- a/dev/null +++ b/tests/t0102-summary.sh | |||
@@ -0,0 +1,20 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on summary page" | ||
6 | |||
7 | run_test 'generate foo summary' 'cgit_url "foo" >trash/tmp' | ||
8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | ||
10 | run_test 'find branch master' 'grep -e "master" trash/tmp' | ||
11 | run_test 'no tags' 'grep -ve "tags" trash/tmp' | ||
12 | |||
13 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' | ||
14 | run_test 'no commit 45' 'grep -ve "commit 45" trash/tmp' | ||
15 | run_test 'find commit 46' 'grep -e "commit 46" trash/tmp' | ||
16 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | ||
17 | run_test 'find branch master' 'grep -e "master" trash/tmp' | ||
18 | run_test 'no tags' 'grep -ve "tags" trash/tmp' | ||
19 | |||
20 | tests_done | ||
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh new file mode 100755 index 0000000..b08cd29 --- a/dev/null +++ b/tests/t0103-log.sh | |||
@@ -0,0 +1,15 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on log page" | ||
6 | |||
7 | run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp' | ||
8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | ||
10 | |||
11 | run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp' | ||
12 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
13 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | ||
14 | |||
15 | tests_done | ||
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh new file mode 100755 index 0000000..2516c72 --- a/dev/null +++ b/tests/t0104-tree.sh | |||
@@ -0,0 +1,21 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on tree page" | ||
6 | |||
7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' | ||
8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' | ||
9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' | ||
10 | |||
11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' | ||
12 | |||
13 | run_test 'find line 1' ' | ||
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | ||
15 | ' | ||
16 | |||
17 | run_test 'no line 2' ' | ||
18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | ||
19 | ' | ||
20 | |||
21 | tests_done | ||
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh new file mode 100755 index 0000000..aa2bf33 --- a/dev/null +++ b/tests/t0105-commit.sh | |||
@@ -0,0 +1,22 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on commit page" | ||
6 | |||
7 | run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' | ||
8 | run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' | ||
9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' | ||
10 | |||
11 | run_test 'find commit subject' ' | ||
12 | grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp | ||
13 | ' | ||
14 | |||
15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' | ||
16 | run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' | ||
17 | |||
18 | run_test 'find diff summary' ' | ||
19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp | ||
20 | ' | ||
21 | |||
22 | tests_done | ||
diff --git a/tests/t0106-diff.sh b/tests/t0106-diff.sh new file mode 100755 index 0000000..e140bcc --- a/dev/null +++ b/tests/t0106-diff.sh | |||
@@ -0,0 +1,20 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on diff page" | ||
6 | |||
7 | run_test 'generate foo/diff' 'cgit_url "foo/diff" >trash/tmp' | ||
8 | run_test 'find diff header' 'grep -e "a/file-5 b/file-5" trash/tmp' | ||
9 | run_test 'find blob link' 'grep -e "<a href=./foo/tree/file-5?id=" trash/tmp' | ||
10 | run_test 'find added file' 'grep -e "new file mode 100644" trash/tmp' | ||
11 | |||
12 | run_test 'find hunk header' ' | ||
13 | grep -e "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp | ||
14 | ' | ||
15 | |||
16 | run_test 'find added line' ' | ||
17 | grep -e "<div class=.add.>+5</div>" trash/tmp | ||
18 | ' | ||
19 | |||
20 | tests_done | ||
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh new file mode 100755 index 0000000..8e90e10 --- a/dev/null +++ b/tests/t0107-snapshot.sh | |||
@@ -0,0 +1,36 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Verify snapshot" | ||
6 | |||
7 | run_test 'get foo/snapshot/test.tar.gz' ' | ||
8 | cgit_url "foo/snapshot/test.tar.gz" >trash/tmp | ||
9 | ' | ||
10 | |||
11 | run_test 'check html headers' ' | ||
12 | head -n 1 trash/tmp | | ||
13 | grep -e "Content-Type: application/x-tar" && | ||
14 | |||
15 | head -n 2 trash/tmp | | ||
16 | grep -e "Content-Disposition: inline; filename=.test.tar.gz." | ||
17 | ' | ||
18 | |||
19 | run_test 'strip off the header lines' ' | ||
20 | tail -n +6 trash/tmp > trash/test.tar.gz | ||
21 | ' | ||
22 | |||
23 | run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' | ||
24 | run_test 'untar' 'tar -xf trash/test.tar.gz -C trash' | ||
25 | |||
26 | run_test 'count files' ' | ||
27 | c=$(ls -1 trash/foo/ | wc -l) && | ||
28 | test $c = 5 | ||
29 | ' | ||
30 | |||
31 | run_test 'verify untarred file-5' ' | ||
32 | grep -e "^5$" trash/foo/file-5 && | ||
33 | test $(cat trash/foo/file-5 | wc -l) = 1 | ||
34 | ' | ||
35 | |||
36 | tests_done | ||
diff --git a/ui-commit.c b/ui-commit.c index 4ac8955..bd55a33 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -84,7 +84,7 @@ void print_fileinfo(struct fileinfo *info) | |||
84 | html("</td><td class='right'>"); | 84 | html("</td><td class='right'>"); |
85 | htmlf("%d", info->added + info->removed); | 85 | htmlf("%d", info->added + info->removed); |
86 | html("</td><td class='graph'>"); | 86 | html("</td><td class='graph'>"); |
87 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 87 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
88 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 88 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
89 | info->added * 100.0 / max_changes); | 89 | info->added * 100.0 / max_changes); |
90 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 90 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
@@ -157,7 +157,7 @@ void cgit_print_commit(char *hex) | |||
157 | } | 157 | } |
158 | info = cgit_parse_commit(commit); | 158 | info = cgit_parse_commit(commit); |
159 | 159 | ||
160 | html("<table class='commit-info'>\n"); | 160 | html("<table summary='commit info' class='commit-info'>\n"); |
161 | html("<tr><th>author</th><td>"); | 161 | html("<tr><th>author</th><td>"); |
162 | html_txt(info->author); | 162 | html_txt(info->author); |
163 | html(" "); | 163 | html(" "); |
@@ -209,7 +209,7 @@ void cgit_print_commit(char *hex) | |||
209 | html("</div>"); | 209 | html("</div>"); |
210 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { | 210 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { |
211 | html("<div class='diffstat-header'>Diffstat</div>"); | 211 | html("<div class='diffstat-header'>Diffstat</div>"); |
212 | html("<table class='diffstat'>"); | 212 | html("<table summary='diffstat' class='diffstat'>"); |
213 | max_changes = 0; | 213 | max_changes = 0; |
214 | cgit_diff_commit(commit, inspect_filepair); | 214 | cgit_diff_commit(commit, inspect_filepair); |
215 | for(i = 0; i<files; i++) | 215 | for(i = 0; i<files; i++) |
@@ -141,7 +141,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
141 | if (!commit2 || parse_commit(commit2)) | 141 | if (!commit2 || parse_commit(commit2)) |
142 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); | 142 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
143 | } | 143 | } |
144 | html("<table class='diff'>"); | 144 | html("<table summary='diff' class='diff'>"); |
145 | html("<tr><td>"); | 145 | html("<tr><td>"); |
146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); | 146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
147 | html("</td></tr>"); | 147 | html("</td></tr>"); |
@@ -8,12 +8,18 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int files, lines; | 11 | int files, add_lines, rem_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) |
16 | lines++; | 16 | return; |
17 | |||
18 | if (line[0] == '+') | ||
19 | add_lines++; | ||
20 | |||
21 | else if (line[0] == '-') | ||
22 | rem_lines++; | ||
17 | } | 23 | } |
18 | 24 | ||
19 | void inspect_files(struct diff_filepair *pair) | 25 | void inspect_files(struct diff_filepair *pair) |
@@ -35,13 +41,14 @@ void print_commit(struct commit *commit) | |||
35 | sha1_to_hex(commit->object.sha1)); | 41 | sha1_to_hex(commit->object.sha1)); |
36 | if (cgit_repo->enable_log_filecount) { | 42 | if (cgit_repo->enable_log_filecount) { |
37 | files = 0; | 43 | files = 0; |
38 | lines = 0; | 44 | add_lines = 0; |
45 | rem_lines = 0; | ||
39 | cgit_diff_commit(commit, inspect_files); | 46 | cgit_diff_commit(commit, inspect_files); |
40 | html("</td><td class='right'>"); | 47 | html("</td><td class='right'>"); |
41 | htmlf("%d", files); | 48 | htmlf("%d", files); |
42 | if (cgit_repo->enable_log_linecount) { | 49 | if (cgit_repo->enable_log_linecount) { |
43 | html("</td><td class='right'>"); | 50 | html("</td><td class='right'>"); |
44 | htmlf("%d", lines); | 51 | htmlf("-%d/+%d", rem_lines, add_lines); |
45 | } | 52 | } |
46 | } | 53 | } |
47 | html("</td><td>"); | 54 | html("</td><td>"); |
@@ -83,14 +90,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
83 | } | 90 | } |
84 | prepare_revision_walk(&rev); | 91 | prepare_revision_walk(&rev); |
85 | 92 | ||
86 | html("<table class='list nowrap'>"); | 93 | html("<table summary='log' class='list nowrap'>"); |
87 | html("<tr class='nohover'><th class='left'>Age</th>" | 94 | html("<tr class='nohover'><th class='left'>Age</th>" |
88 | "<th class='left'>Message</th>"); | 95 | "<th class='left'>Message</th>"); |
89 | 96 | ||
90 | if (cgit_repo->enable_log_filecount) { | 97 | if (cgit_repo->enable_log_filecount) { |
91 | html("<th class='left'>Files</th>"); | 98 | html("<th class='right'>Files</th>"); |
92 | if (cgit_repo->enable_log_linecount) | 99 | if (cgit_repo->enable_log_linecount) |
93 | html("<th class='left'>Lines</th>"); | 100 | html("<th class='right'>Lines</th>"); |
94 | } | 101 | } |
95 | html("<th class='left'>Author</th></tr>\n"); | 102 | html("<th class='left'>Author</th></tr>\n"); |
96 | 103 | ||
diff --git a/ui-patch.c b/ui-patch.c new file mode 100644 index 0000000..e7a010a --- a/dev/null +++ b/ui-patch.c | |||
@@ -0,0 +1,110 @@ | |||
1 | /* ui-patch.c: generate patch view | ||
2 | * | ||
3 | * Copyright (C) 2007 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 | static void print_line(char *line, int len) | ||
12 | { | ||
13 | char c = line[len-1]; | ||
14 | |||
15 | line[len-1] = '\0'; | ||
16 | htmlf("%s\n", line); | ||
17 | line[len-1] = c; | ||
18 | } | ||
19 | |||
20 | static void header(unsigned char *sha1, char *path1, int mode1, | ||
21 | unsigned char *sha2, char *path2, int mode2) | ||
22 | { | ||
23 | char *abbrev1, *abbrev2; | ||
24 | int subproject; | ||
25 | |||
26 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | ||
27 | htmlf("diff --git a/%s b/%s\n", path1, path2); | ||
28 | |||
29 | if (is_null_sha1(sha1)) | ||
30 | path1 = "dev/null"; | ||
31 | if (is_null_sha1(sha2)) | ||
32 | path2 = "dev/null"; | ||
33 | |||
34 | if (mode1 == 0) | ||
35 | htmlf("new file mode %.6o\n", mode2); | ||
36 | |||
37 | if (mode2 == 0) | ||
38 | htmlf("deleted file mode %.6o\n", mode1); | ||
39 | |||
40 | if (!subproject) { | ||
41 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | ||
42 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | ||
43 | htmlf("index %s..%s", abbrev1, abbrev2); | ||
44 | free(abbrev1); | ||
45 | free(abbrev2); | ||
46 | if (mode1 != 0 && mode2 != 0) { | ||
47 | htmlf(" %.6o", mode1); | ||
48 | if (mode2 != mode1) | ||
49 | htmlf("..%.6o", mode2); | ||
50 | } | ||
51 | htmlf("\n--- a/%s\n", path1); | ||
52 | htmlf("+++ b/%s\n", path2); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | static void filepair_cb(struct diff_filepair *pair) | ||
57 | { | ||
58 | header(pair->one->sha1, pair->one->path, pair->one->mode, | ||
59 | pair->two->sha1, pair->two->path, pair->two->mode); | ||
60 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | ||
61 | if (S_ISGITLINK(pair->one->mode)) | ||
62 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | ||
63 | if (S_ISGITLINK(pair->two->mode)) | ||
64 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | ||
65 | return; | ||
66 | } | ||
67 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | ||
68 | html("Error running diff"); | ||
69 | } | ||
70 | |||
71 | void cgit_print_patch(char *hex, struct cacheitem *item) | ||
72 | { | ||
73 | struct commit *commit; | ||
74 | struct commitinfo *info; | ||
75 | unsigned char sha1[20], old_sha1[20]; | ||
76 | char *patchname; | ||
77 | |||
78 | if (!hex) | ||
79 | hex = cgit_query_head; | ||
80 | |||
81 | if (get_sha1(hex, sha1)) { | ||
82 | cgit_print_error(fmt("Bad object id: %s", hex)); | ||
83 | return; | ||
84 | } | ||
85 | commit = lookup_commit_reference(sha1); | ||
86 | if (!commit) { | ||
87 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | ||
88 | return; | ||
89 | } | ||
90 | info = cgit_parse_commit(commit); | ||
91 | hashcpy(old_sha1, commit->parents->item->object.sha1); | ||
92 | |||
93 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); | ||
94 | cgit_print_snapshot_start("text/plain", patchname, item); | ||
95 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); | ||
96 | htmlf("From: %s%s\n", info->author, info->author_email); | ||
97 | html("Date: "); | ||
98 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); | ||
99 | htmlf("Subject: %s\n\n", info->subject); | ||
100 | if (info->msg && *info->msg) { | ||
101 | htmlf("%s", info->msg); | ||
102 | if (info->msg[strlen(info->msg) - 1] != '\n') | ||
103 | html("\n"); | ||
104 | } | ||
105 | html("---\n"); | ||
106 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); | ||
107 | html("--\n"); | ||
108 | htmlf("cgit %s\n", CGIT_VERSION); | ||
109 | cgit_free_commitinfo(info); | ||
110 | } | ||
diff --git a/ui-repolist.c b/ui-repolist.c index 9aa5c1e..3e97ca9 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -53,7 +53,7 @@ void cgit_print_repolist(struct cacheitem *item) | |||
53 | cgit_print_docstart(cgit_root_title, item); | 53 | cgit_print_docstart(cgit_root_title, item); |
54 | cgit_print_pageheader(cgit_root_title, 0); | 54 | cgit_print_pageheader(cgit_root_title, 0); |
55 | 55 | ||
56 | html("<table class='list nowrap'>"); | 56 | html("<table summary='repository list' class='list nowrap'>"); |
57 | if (cgit_index_header) { | 57 | if (cgit_index_header) { |
58 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", | 58 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", |
59 | columns); | 59 | columns); |
diff --git a/ui-shared.c b/ui-shared.c index 4944dfd..60aa2e3 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -272,6 +272,12 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
272 | html("</a>"); | 272 | html("</a>"); |
273 | } | 273 | } |
274 | 274 | ||
275 | void cgit_patch_link(char *name, char *title, char *class, char *head, | ||
276 | char *rev) | ||
277 | { | ||
278 | reporevlink("patch", name, title, class, head, rev, NULL); | ||
279 | } | ||
280 | |||
275 | void cgit_object_link(struct object *obj) | 281 | void cgit_object_link(struct object *obj) |
276 | { | 282 | { |
277 | char *page, *arg, *url; | 283 | char *page, *arg, *url; |
@@ -356,18 +362,20 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
356 | 362 | ||
357 | void cgit_print_docstart(char *title, struct cacheitem *item) | 363 | void cgit_print_docstart(char *title, struct cacheitem *item) |
358 | { | 364 | { |
359 | html("Content-Type: text/html; charset=utf-8\n"); | 365 | html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); |
360 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 366 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
361 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 367 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
362 | ttl_seconds(item->ttl))); | 368 | ttl_seconds(item->ttl))); |
363 | html("\n"); | 369 | html("\n"); |
364 | html(cgit_doctype); | 370 | html(cgit_doctype); |
365 | html("<html>\n"); | 371 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
366 | html("<head>\n"); | 372 | html("<head>\n"); |
367 | html("<title>"); | 373 | html("<title>"); |
368 | html_txt(title); | 374 | html_txt(title); |
369 | html("</title>\n"); | 375 | html("</title>\n"); |
370 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 376 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
377 | if (cgit_robots && *cgit_robots) | ||
378 | htmlf("<meta name='robots' content='%s'/>\n", cgit_robots); | ||
371 | html("<link rel='stylesheet' type='text/css' href='"); | 379 | html("<link rel='stylesheet' type='text/css' href='"); |
372 | html_attr(cgit_css); | 380 | html_attr(cgit_css); |
373 | html("'/>\n"); | 381 | html("'/>\n"); |
@@ -377,7 +385,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
377 | 385 | ||
378 | void cgit_print_docend() | 386 | void cgit_print_docend() |
379 | { | 387 | { |
380 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); | 388 | html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); |
381 | } | 389 | } |
382 | 390 | ||
383 | int print_branch_option(const char *refname, const unsigned char *sha1, | 391 | int print_branch_option(const char *refname, const unsigned char *sha1, |
@@ -415,7 +423,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
415 | hashcpy(fileid, sha1); | 423 | hashcpy(fileid, sha1); |
416 | } | 424 | } |
417 | if (!*header) { | 425 | if (!*header) { |
418 | html("<p><h1>download</h1>"); | 426 | html("<h1>download</h1>\n"); |
419 | *header = 1; | 427 | *header = 1; |
420 | } | 428 | } |
421 | url = cgit_pageurl(cgit_query_repo, "blob", | 429 | url = cgit_pageurl(cgit_query_repo, "blob", |
@@ -458,23 +466,26 @@ void cgit_print_pageheader(char *title, int show_search) | |||
458 | { | 466 | { |
459 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 467 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
460 | int header = 0; | 468 | int header = 0; |
469 | char *url; | ||
461 | 470 | ||
462 | html("<div id='sidebar'>\n"); | 471 | html("<table id='layout' summary=''>\n"); |
463 | html("<a href='"); | 472 | html("<tr><td id='sidebar'>\n"); |
473 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); | ||
474 | html("<tr><td class='sidebar'>\n<a href='"); | ||
464 | html_attr(cgit_rooturl()); | 475 | html_attr(cgit_rooturl()); |
465 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", | 476 | htmlf("'><img src='%s' alt='cgit'/></a>\n", |
466 | cgit_logo); | 477 | cgit_logo); |
467 | html("<div class='infobox'>"); | 478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
468 | if (cgit_query_repo) { | 479 | if (cgit_query_repo) { |
469 | html("<h1>"); | 480 | html("<h1 class='first'>"); |
470 | html_txt(strrpart(cgit_repo->name, 20)); | 481 | html_txt(strrpart(cgit_repo->name, 20)); |
471 | html("</h1>\n"); | 482 | html("</h1>\n"); |
472 | html_txt(cgit_repo->desc); | 483 | html_txt(cgit_repo->desc); |
473 | if (cgit_repo->owner) { | 484 | if (cgit_repo->owner) { |
474 | html("<p>\n<h1>owner</h1>\n"); | 485 | html("<h1>owner</h1>\n"); |
475 | html_txt(cgit_repo->owner); | 486 | html_txt(cgit_repo->owner); |
476 | } | 487 | } |
477 | html("<p>\n<h1>navigate</h1>\n"); | 488 | html("<h1>navigate</h1>\n"); |
478 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 489 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
479 | NULL, NULL); | 490 | NULL, NULL); |
480 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, | 491 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, |
@@ -485,22 +496,40 @@ void cgit_print_pageheader(char *title, int show_search) | |||
485 | cgit_query_sha1); | 496 | cgit_query_sha1); |
486 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, | 497 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, |
487 | cgit_query_sha1, cgit_query_sha2, NULL); | 498 | cgit_query_sha1, cgit_query_sha2, NULL); |
499 | cgit_patch_link("patch", NULL, "menu", cgit_query_head, | ||
500 | cgit_query_sha1); | ||
488 | 501 | ||
489 | for_each_ref(print_archive_ref, &header); | 502 | for_each_ref(print_archive_ref, &header); |
490 | 503 | ||
491 | html("<p>\n<h1>branch</h1>\n"); | 504 | if (cgit_repo->clone_url || cgit_clone_prefix) { |
505 | html("<h1>clone</h1>\n"); | ||
506 | if (cgit_repo->clone_url) | ||
507 | url = cgit_repo->clone_url; | ||
508 | else | ||
509 | url = fmt("%s%s", cgit_clone_prefix, | ||
510 | cgit_repo->url); | ||
511 | html("<a class='menu' href='"); | ||
512 | html_attr(url); | ||
513 | html("' title='"); | ||
514 | html_attr(url); | ||
515 | html("'>\n"); | ||
516 | html_txt(strrpart(url, 20)); | ||
517 | html("</a>\n"); | ||
518 | } | ||
519 | |||
520 | html("<h1>branch</h1>\n"); | ||
492 | html("<form method='get' action=''>\n"); | 521 | html("<form method='get' action=''>\n"); |
493 | add_hidden_formfields(0, 1, cgit_query_page); | 522 | add_hidden_formfields(0, 1, cgit_query_page); |
494 | html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); | 523 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
495 | html("<select name='h' onchange='this.form.submit();'>\n"); | 524 | html("<select name='h' onchange='this.form.submit();'>\n"); |
496 | for_each_branch_ref(print_branch_option, cgit_query_head); | 525 | for_each_branch_ref(print_branch_option, cgit_query_head); |
497 | html("</select>\n"); | 526 | html("</select>\n"); |
498 | html("</td><td>"); | 527 | // html("</td><td>"); |
499 | html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); | 528 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); |
500 | html("</td></tr></table>"); | 529 | // html("</td></tr></table>"); |
501 | html("</form>\n"); | 530 | html("</form>\n"); |
502 | 531 | ||
503 | html("<p>\n<h1>search</h1>\n"); | 532 | html("<h1>search</h1>\n"); |
504 | html("<form method='get' action='"); | 533 | html("<form method='get' action='"); |
505 | if (cgit_virtual_root) | 534 | if (cgit_virtual_root) |
506 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 535 | html_attr(cgit_fileurl(cgit_query_repo, "log", |
@@ -521,9 +550,9 @@ void cgit_print_pageheader(char *title, int show_search) | |||
521 | html(default_info); | 550 | html(default_info); |
522 | } | 551 | } |
523 | 552 | ||
524 | html("</div>\n"); | 553 | html("</td></tr></table></td>\n"); |
525 | 554 | ||
526 | html("</div>\n<table class='grid'><tr><td id='content'>\n"); | 555 | html("<td id='content'>\n"); |
527 | } | 556 | } |
528 | 557 | ||
529 | 558 | ||
diff --git a/ui-summary.c b/ui-summary.c index c856793..b96414e 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -190,7 +190,7 @@ void cgit_print_summary() | |||
190 | if (cgit_summary_log > 0) | 190 | if (cgit_summary_log > 0) |
191 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, | 191 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, |
192 | NULL, NULL, 0); | 192 | NULL, NULL, 0); |
193 | html("<table class='list nowrap'>"); | 193 | html("<table summary='repository info' class='list nowrap'>"); |
194 | if (cgit_summary_log > 0) | 194 | if (cgit_summary_log > 0) |
195 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 195 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
196 | cgit_print_branches(cgit_summary_branches); | 196 | cgit_print_branches(cgit_summary_branches); |
@@ -17,7 +17,7 @@ static void print_object(const unsigned char *sha1, char *path) | |||
17 | enum object_type type; | 17 | enum object_type type; |
18 | char *buf; | 18 | char *buf; |
19 | unsigned long size, lineno, start, idx; | 19 | unsigned long size, lineno, start, idx; |
20 | const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; | 20 | const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; |
21 | 21 | ||
22 | type = sha1_object_info(sha1, &size); | 22 | type = sha1_object_info(sha1, &size); |
23 | if (type == OBJ_BAD) { | 23 | if (type == OBJ_BAD) { |
@@ -37,7 +37,7 @@ static void print_object(const unsigned char *sha1, char *path) | |||
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); | 37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); | 38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
39 | 39 | ||
40 | html("<table class='blob'>\n"); | 40 | html("<table summary='blob content' class='blob'>\n"); |
41 | idx = 0; | 41 | idx = 0; |
42 | start = 0; | 42 | start = 0; |
43 | lineno = 0; | 43 | lineno = 0; |
@@ -108,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
108 | 108 | ||
109 | static void ls_head() | 109 | static void ls_head() |
110 | { | 110 | { |
111 | html("<table class='list'>\n"); | 111 | html("<table summary='tree listing' class='list'>\n"); |
112 | html("<tr class='nohover'>"); | 112 | html("<tr class='nohover'>"); |
113 | html("<th class='left'>Mode</th>"); | 113 | html("<th class='left'>Mode</th>"); |
114 | html("<th class='left'>Name</th>"); | 114 | html("<th class='left'>Name</th>"); |