author | Lars Hjemli <hjemli@gmail.com> | 2006-12-12 23:13:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-12 23:13:27 (UTC) |
commit | 06fe0c2f47eaf467db8ab1443e61dfa1c280f30a (patch) (unidiff) | |
tree | 481164eeeeb5ca3302f7b3d38d1debbad9db9296 /cgit.c | |
parent | 58d04f6523b0029281d65f841859fa42d0c744ff (diff) | |
download | cgit-06fe0c2f47eaf467db8ab1443e61dfa1c280f30a.zip cgit-06fe0c2f47eaf467db8ab1443e61dfa1c280f30a.tar.gz cgit-06fe0c2f47eaf467db8ab1443e61dfa1c280f30a.tar.bz2 |
Add display of tree content w/ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,80 +1,82 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
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 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | static void cgit_print_repo_page(struct cacheitem *item) | 13 | static void cgit_print_repo_page(struct cacheitem *item) |
14 | { | 14 | { |
15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
18 | cgit_print_docstart(title, item); | 18 | cgit_print_docstart(title, item); |
19 | cgit_print_pageheader(title); | 19 | cgit_print_pageheader(title); |
20 | cgit_print_error(fmt("Unable to scan repository: %s", | 20 | cgit_print_error(fmt("Unable to scan repository: %s", |
21 | strerror(errno))); | 21 | strerror(errno))); |
22 | cgit_print_docend(); | 22 | cgit_print_docend(); |
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 | ||
39 | static void cgit_fill_cache(struct cacheitem *item) | 41 | static void cgit_fill_cache(struct cacheitem *item) |
40 | { | 42 | { |
41 | htmlfd = item->fd; | 43 | htmlfd = item->fd; |
42 | item->st.st_mtime = time(NULL); | 44 | item->st.st_mtime = time(NULL); |
43 | if (cgit_query_repo) | 45 | if (cgit_query_repo) |
44 | cgit_print_repo_page(item); | 46 | cgit_print_repo_page(item); |
45 | else | 47 | else |
46 | cgit_print_repolist(item); | 48 | cgit_print_repolist(item); |
47 | } | 49 | } |
48 | 50 | ||
49 | static void cgit_check_cache(struct cacheitem *item) | 51 | static void cgit_check_cache(struct cacheitem *item) |
50 | { | 52 | { |
51 | int i = 0; | 53 | int i = 0; |
52 | 54 | ||
53 | cache_prepare(item); | 55 | cache_prepare(item); |
54 | top: | 56 | top: |
55 | if (++i > cgit_max_lock_attempts) { | 57 | if (++i > cgit_max_lock_attempts) { |
56 | die("cgit_refresh_cache: unable to lock %s: %s", | 58 | die("cgit_refresh_cache: unable to lock %s: %s", |
57 | item->name, strerror(errno)); | 59 | item->name, strerror(errno)); |
58 | } | 60 | } |
59 | if (!cache_exist(item)) { | 61 | if (!cache_exist(item)) { |
60 | if (!cache_lock(item)) { | 62 | if (!cache_lock(item)) { |
61 | sleep(1); | 63 | sleep(1); |
62 | goto top; | 64 | goto top; |
63 | } | 65 | } |
64 | if (!cache_exist(item)) { | 66 | if (!cache_exist(item)) { |
65 | cgit_fill_cache(item); | 67 | cgit_fill_cache(item); |
66 | cache_unlock(item); | 68 | cache_unlock(item); |
67 | } else { | 69 | } else { |
68 | cache_cancel_lock(item); | 70 | cache_cancel_lock(item); |
69 | } | 71 | } |
70 | } else if (cache_expired(item) && cache_lock(item)) { | 72 | } else if (cache_expired(item) && cache_lock(item)) { |
71 | if (cache_expired(item)) { | 73 | if (cache_expired(item)) { |
72 | cgit_fill_cache(item); | 74 | cgit_fill_cache(item); |
73 | cache_unlock(item); | 75 | cache_unlock(item); |
74 | } else { | 76 | } else { |
75 | cache_cancel_lock(item); | 77 | cache_cancel_lock(item); |
76 | } | 78 | } |
77 | } | 79 | } |
78 | } | 80 | } |
79 | 81 | ||
80 | static void cgit_print_cache(struct cacheitem *item) | 82 | static void cgit_print_cache(struct cacheitem *item) |