diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.c | 5 | ||||
-rw-r--r-- | cgit.css | 11 | ||||
-rw-r--r-- | cgit.h | 31 | ||||
-rw-r--r-- | cgitrc | 17 | ||||
-rwxr-xr-x | gen-version.sh | 2 | ||||
-rw-r--r-- | shared.c | 64 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-diff.c | 45 | ||||
-rw-r--r-- | ui-refs.c | 30 | ||||
-rw-r--r-- | ui-shared.c | 6 | ||||
-rw-r--r-- | ui-summary.c | 172 |
12 files changed, 299 insertions, 90 deletions
@@ -16,7 +16,7 @@ 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 | 19 | ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o |
20 | 20 | ||
21 | 21 | ||
22 | .PHONY: all git install clean distclean force-version get-git | 22 | .PHONY: all git install clean distclean force-version get-git |
@@ -103,11 +103,14 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
103 | case CMD_COMMIT: | 103 | case CMD_COMMIT: |
104 | cgit_print_commit(cgit_query_sha1); | 104 | cgit_print_commit(cgit_query_sha1); |
105 | break; | 105 | break; |
106 | case CMD_REFS: | ||
107 | cgit_print_refs(); | ||
108 | break; | ||
106 | case CMD_TAG: | 109 | case CMD_TAG: |
107 | cgit_print_tag(cgit_query_sha1); | 110 | cgit_print_tag(cgit_query_sha1); |
108 | break; | 111 | break; |
109 | case CMD_DIFF: | 112 | case CMD_DIFF: |
110 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | 113 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
111 | break; | 114 | break; |
112 | default: | 115 | default: |
113 | cgit_print_error("Invalid request"); | 116 | cgit_print_error("Invalid request"); |
@@ -272,10 +272,6 @@ table.diffstat { | |||
272 | background-color: #eee; | 272 | background-color: #eee; |
273 | } | 273 | } |
274 | 274 | ||
275 | table.diffstat tr:hover { | ||
276 | background-color: #ccc; | ||
277 | } | ||
278 | |||
279 | table.diffstat th { | 275 | table.diffstat th { |
280 | font-weight: normal; | 276 | font-weight: normal; |
281 | text-align: left; | 277 | text-align: left; |
@@ -339,6 +335,10 @@ div.diffstat-summary { | |||
339 | padding-top: 0.5em; | 335 | padding-top: 0.5em; |
340 | } | 336 | } |
341 | 337 | ||
338 | table.diff { | ||
339 | width: 100%; | ||
340 | } | ||
341 | |||
342 | table.diff td { | 342 | table.diff td { |
343 | font-family: monospace; | 343 | font-family: monospace; |
344 | white-space: pre; | 344 | white-space: pre; |
@@ -346,7 +346,8 @@ table.diff td { | |||
346 | 346 | ||
347 | table.diff td div.head { | 347 | table.diff td div.head { |
348 | font-weight: bold; | 348 | font-weight: bold; |
349 | padding-top: 1em; | 349 | margin-top: 1em; |
350 | background-color: #eee; | ||
350 | } | 351 | } |
351 | 352 | ||
352 | table.diff td div.hunk { | 353 | table.diff td div.hunk { |
@@ -28,6 +28,7 @@ | |||
28 | #define CMD_BLOB 5 | 28 | #define CMD_BLOB 5 |
29 | #define CMD_SNAPSHOT 6 | 29 | #define CMD_SNAPSHOT 6 |
30 | #define CMD_TAG 7 | 30 | #define CMD_TAG 7 |
31 | #define CMD_REFS 8 | ||
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Dateformats used on misc. pages | 34 | * Dateformats used on misc. pages |
@@ -98,6 +99,21 @@ struct taginfo { | |||
98 | char *msg; | 99 | char *msg; |
99 | }; | 100 | }; |
100 | 101 | ||
102 | struct refinfo { | ||
103 | const char *refname; | ||
104 | struct object *object; | ||
105 | union { | ||
106 | struct taginfo *tag; | ||
107 | struct commitinfo *commit; | ||
108 | }; | ||
109 | }; | ||
110 | |||
111 | struct reflist { | ||
112 | struct refinfo **refs; | ||
113 | int alloc; | ||
114 | int count; | ||
115 | }; | ||
116 | |||
101 | extern const char *cgit_version; | 117 | extern const char *cgit_version; |
102 | 118 | ||
103 | extern struct repolist cgit_repolist; | 119 | extern struct repolist cgit_repolist; |
@@ -128,6 +144,8 @@ extern int cgit_cache_dynamic_ttl; | |||
128 | extern int cgit_cache_static_ttl; | 144 | extern int cgit_cache_static_ttl; |
129 | extern int cgit_cache_max_create_time; | 145 | extern int cgit_cache_max_create_time; |
130 | extern int cgit_summary_log; | 146 | extern int cgit_summary_log; |
147 | extern int cgit_summary_tags; | ||
148 | extern int cgit_summary_branches; | ||
131 | 149 | ||
132 | extern int cgit_max_msg_len; | 150 | extern int cgit_max_msg_len; |
133 | extern int cgit_max_repodesc_len; | 151 | extern int cgit_max_repodesc_len; |
@@ -162,6 +180,10 @@ extern int chk_non_negative(int result, char *msg); | |||
162 | extern int hextoint(char c); | 180 | extern int hextoint(char c); |
163 | extern char *trim_end(const char *str, char c); | 181 | extern char *trim_end(const char *str, char c); |
164 | 182 | ||
183 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | ||
184 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | ||
185 | int flags, void *cb_data); | ||
186 | |||
165 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 187 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
166 | 188 | ||
167 | extern int cgit_diff_files(const unsigned char *old_sha1, | 189 | extern int cgit_diff_files(const unsigned char *old_sha1, |
@@ -170,7 +192,7 @@ extern int cgit_diff_files(const unsigned char *old_sha1, | |||
170 | 192 | ||
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 193 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
172 | const unsigned char *new_sha1, | 194 | const unsigned char *new_sha1, |
173 | filepair_fn fn); | 195 | filepair_fn fn, const char *prefix); |
174 | 196 | ||
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 197 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
176 | 198 | ||
@@ -214,6 +236,8 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, | |||
214 | char *rev, char *path, int ofs); | 236 | char *rev, char *path, int ofs); |
215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 237 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
216 | char *rev); | 238 | char *rev); |
239 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | ||
240 | char *rev, char *path); | ||
217 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 241 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
218 | char *head, char *rev, char *archivename); | 242 | char *head, char *rev, char *archivename); |
219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 243 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
@@ -230,6 +254,8 @@ extern void cgit_print_pageheader(char *title, int show_search); | |||
230 | extern void cgit_print_snapshot_start(const char *mimetype, | 254 | extern void cgit_print_snapshot_start(const char *mimetype, |
231 | const char *filename, | 255 | const char *filename, |
232 | struct cacheitem *item); | 256 | struct cacheitem *item); |
257 | extern void cgit_print_branches(int maxcount); | ||
258 | extern void cgit_print_tags(int maxcount); | ||
233 | 259 | ||
234 | extern void cgit_print_repolist(struct cacheitem *item); | 260 | extern void cgit_print_repolist(struct cacheitem *item); |
235 | extern void cgit_print_summary(); | 261 | extern void cgit_print_summary(); |
@@ -237,8 +263,9 @@ extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char * | |||
237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 263 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
238 | extern void cgit_print_tree(const char *rev, char *path); | 264 | extern void cgit_print_tree(const char *rev, char *path); |
239 | extern void cgit_print_commit(char *hex); | 265 | extern void cgit_print_commit(char *hex); |
266 | extern void cgit_print_refs(); | ||
240 | extern void cgit_print_tag(char *revname); | 267 | extern void cgit_print_tag(char *revname); |
241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); | 268 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
242 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 269 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, |
243 | const char *hex, const char *prefix, | 270 | const char *hex, const char *prefix, |
244 | const char *filename, int snapshot); | 271 | const char *filename, int snapshot); |
@@ -30,6 +30,16 @@ | |||
30 | #summary-log=0 | 30 | #summary-log=0 |
31 | 31 | ||
32 | 32 | ||
33 | ## Restrict the number of branches printed in summary view. Set to 0 to | ||
34 | ## print all branches. | ||
35 | #summary-branches=0 | ||
36 | |||
37 | |||
38 | ## Restrict the number of tags printed in summary view. Set to 0 to | ||
39 | ## print all tags. | ||
40 | #summary-tags=0 | ||
41 | |||
42 | |||
33 | ## The "Idle" column on the repository index page can read a timestamp | 43 | ## The "Idle" column on the repository index page can read a timestamp |
34 | ## from the specified agefile (if this file cannot be found, the mtime | 44 | ## from the specified agefile (if this file cannot be found, the mtime |
35 | ## of HEAD is used). | 45 | ## of HEAD is used). |
@@ -41,6 +51,13 @@ | |||
41 | #agefile=info/web/last-modified | 51 | #agefile=info/web/last-modified |
42 | 52 | ||
43 | 53 | ||
54 | ## Git detects renames, but with a limit on the number of files to | ||
55 | ## consider. This option can be used to specify another limit (or -1 to | ||
56 | ## use the default limit). | ||
57 | ## | ||
58 | #renamelimit=-1 | ||
59 | |||
60 | |||
44 | ## Specify a root for virtual urls. This makes cgit generate urls like | 61 | ## Specify a root for virtual urls. This makes cgit generate urls like |
45 | ## | 62 | ## |
46 | ## http://localhost/git/repo/log/?h=branch | 63 | ## http://localhost/git/repo/log/?h=branch |
diff --git a/gen-version.sh b/gen-version.sh index 739c83e..3a08015 100755 --- a/gen-version.sh +++ b/gen-version.sh | |||
@@ -6,7 +6,7 @@ V=$1 | |||
6 | # Use `git describe` to get current version if we're inside a git repo | 6 | # Use `git describe` to get current version if we're inside a git repo |
7 | if test -d .git | 7 | if test -d .git |
8 | then | 8 | then |
9 | V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') | 9 | V=$(git describe --abbrev=4 HEAD 2&g |