author | Lars Hjemli <hjemli@gmail.com> | 2007-02-08 13:47:56 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-02-08 13:47:56 (UTC) |
commit | ac70cb4795c90db02917db63d169b0fadfe9fb99 (patch) (unidiff) | |
tree | bf7a5c4c8c2789cda2dd511f0a180df279a0b389 | |
parent | ab2ab95f09994560f62fd631f07d3b6e3577aa6e (diff) | |
download | cgit-ac70cb4795c90db02917db63d169b0fadfe9fb99.zip cgit-ac70cb4795c90db02917db63d169b0fadfe9fb99.tar.gz cgit-ac70cb4795c90db02917db63d169b0fadfe9fb99.tar.bz2 |
Make snapshot feature configurable
Snapshots can now be enabled/disabled by default for all repositories in
cgitrc with param "snapshots". Additionally, any repo can override the
default setting with param "repo.snapshots".
By default, no snapshotting is enabled.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc | 5 | ||||
-rw-r--r-- | shared.c | 6 | ||||
-rw-r--r-- | ui-commit.c | 12 |
5 files changed, 22 insertions, 6 deletions
@@ -76,13 +76,14 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
76 | } | 76 | } |
77 | 77 | ||
78 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); | 78 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
79 | show_search = 0; | 79 | show_search = 0; |
80 | setenv("GIT_DIR", cgit_repo->path, 1); | 80 | setenv("GIT_DIR", cgit_repo->path, 1); |
81 | 81 | ||
82 | if (cgit_query_page && !strcmp(cgit_query_page, "snapshot")) { | 82 | if (cgit_repo->snapshots && cgit_query_page && |
83 | !strcmp(cgit_query_page, "snapshot")) { | ||
83 | cgit_print_snapshot(item, cgit_query_sha1, "zip", | 84 | cgit_print_snapshot(item, cgit_query_sha1, "zip", |
84 | cgit_repo->url, cgit_query_name); | 85 | cgit_repo->url, cgit_query_name); |
85 | return; | 86 | return; |
86 | } | 87 | } |
87 | 88 | ||
88 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) | 89 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) |
@@ -18,12 +18,13 @@ struct cacheitem { | |||
18 | struct repoinfo { | 18 | struct repoinfo { |
19 | char *url; | 19 | char *url; |
20 | char *name; | 20 | char *name; |
21 | char *path; | 21 | char *path; |
22 | char *desc; | 22 | char *desc; |
23 | char *owner; | 23 | char *owner; |
24 | int snapshots; | ||
24 | }; | 25 | }; |
25 | 26 | ||
26 | struct repolist { | 27 | struct repolist { |
27 | int length; | 28 | int length; |
28 | int count; | 29 | int count; |
29 | struct repoinfo *repos; | 30 | struct repoinfo *repos; |
@@ -58,12 +59,13 @@ extern char *cgit_css; | |||
58 | extern char *cgit_logo; | 59 | extern char *cgit_logo; |
59 | extern char *cgit_logo_link; | 60 | extern char *cgit_logo_link; |
60 | extern char *cgit_virtual_root; | 61 | extern char *cgit_virtual_root; |
61 | extern char *cgit_cache_root; | 62 | extern char *cgit_cache_root; |
62 | 63 | ||
63 | extern int cgit_nocache; | 64 | extern int cgit_nocache; |
65 | extern int cgit_snapshots; | ||
64 | extern int cgit_max_lock_attempts; | 66 | extern int cgit_max_lock_attempts; |
65 | extern int cgit_cache_root_ttl; | 67 | extern int cgit_cache_root_ttl; |
66 | extern int cgit_cache_repo_ttl; | 68 | extern int cgit_cache_repo_ttl; |
67 | extern int cgit_cache_dynamic_ttl; | 69 | extern int cgit_cache_dynamic_ttl; |
68 | extern int cgit_cache_static_ttl; | 70 | extern int cgit_cache_static_ttl; |
69 | extern int cgit_cache_max_create_time; | 71 | extern int cgit_cache_max_create_time; |
@@ -5,12 +5,16 @@ | |||
5 | 5 | ||
6 | ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly | 6 | ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly |
7 | ## usefull for testing. | 7 | ## usefull for testing. |
8 | #nocache=0 | 8 | #nocache=0 |
9 | 9 | ||
10 | 10 | ||
11 | ## Enable/disable snapshots by default. This can be overridden per repo | ||
12 | #snapshots=0 | ||
13 | |||
14 | |||
11 | ## Specify a root for virtual urls. This makes cgit generate urls like | 15 | ## Specify a root for virtual urls. This makes cgit generate urls like |
12 | ## | 16 | ## |
13 | ## http://localhost/git/repo/log/?id=master | 17 | ## http://localhost/git/repo/log/?id=master |
14 | ## | 18 | ## |
15 | ## instead of | 19 | ## instead of |
16 | ## | 20 | ## |
@@ -74,6 +78,7 @@ | |||
74 | ## repository section must start with repo.url). | 78 | ## repository section must start with repo.url). |
75 | #repo.url=cgit | 79 | #repo.url=cgit |
76 | #repo.name=cgit | 80 | #repo.name=cgit |
77 | #repo.desc=the caching cgi for git | 81 | #repo.desc=the caching cgi for git |
78 | #repo.path=/pub/git/cgit | 82 | #repo.path=/pub/git/cgit |
79 | #repo.owner=Lars Hjemli | 83 | #repo.owner=Lars Hjemli |
84 | #repo.snapshots=1 # override a sitewide snapshot-setting | ||
@@ -17,12 +17,13 @@ char *cgit_logo = "/git-logo.png"; | |||
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_virtual_root = NULL; | 18 | char *cgit_virtual_root = NULL; |
19 | 19 | ||
20 | char *cgit_cache_root = "/var/cache/cgit"; | 20 | char *cgit_cache_root = "/var/cache/cgit"; |
21 | 21 | ||
22 | int cgit_nocache = 0; | 22 | int cgit_nocache = 0; |
23 | int cgit_snapshots = 0; | ||
23 | int cgit_max_lock_attempts = 5; | 24 | int cgit_max_lock_attempts = 5; |
24 | int cgit_cache_root_ttl = 5; | 25 | int cgit_cache_root_ttl = 5; |
25 | int cgit_cache_repo_ttl = 5; | 26 | int cgit_cache_repo_ttl = 5; |
26 | int cgit_cache_dynamic_ttl = 5; | 27 | int cgit_cache_dynamic_ttl = 5; |
27 | int cgit_cache_static_ttl = -1; | 28 | int cgit_cache_static_ttl = -1; |
28 | int cgit_cache_max_create_time = 5; | 29 | int cgit_cache_max_create_time = 5; |
@@ -80,12 +81,13 @@ struct repoinfo *add_repo(const char *url) | |||
80 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 81 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
81 | ret->url = xstrdup(url); | 82 | ret->url = xstrdup(url); |
82 | ret->name = ret->url; | 83 | ret->name = ret->url; |
83 | ret->path = NULL; | 84 | ret->path = NULL; |
84 | ret->desc = NULL; | 85 | ret->desc = NULL; |
85 | ret->owner = NULL; | 86 | ret->owner = NULL; |
87 | ret->snapshots = cgit_snapshots; | ||
86 | return ret; | 88 | return ret; |
87 | } | 89 | } |
88 | 90 | ||
89 | void cgit_global_config_cb(const char *name, const char *value) | 91 | void cgit_global_config_cb(const char *name, const char *value) |
90 | { | 92 | { |
91 | if (!strcmp(name, "root-title")) | 93 | if (!strcmp(name, "root-title")) |
@@ -97,12 +99,14 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
97 | else if (!strcmp(name, "logo-link")) | 99 | else if (!strcmp(name, "logo-link")) |
98 | cgit_logo_link = xstrdup(value); | 100 | cgit_logo_link = xstrdup(value); |
99 | else if (!strcmp(name, "virtual-root")) | 101 | else if (!strcmp(name, "virtual-root")) |
100 | cgit_virtual_root = xstrdup(value); | 102 | cgit_virtual_root = xstrdup(value); |
101 | else if (!strcmp(name, "nocache")) | 103 | else if (!strcmp(name, "nocache")) |
102 | cgit_nocache = atoi(value); | 104 | cgit_nocache = atoi(value); |
105 | else if (!strcmp(name, "snapshots")) | ||
106 | cgit_snapshots = atoi(value); | ||
103 | else if (!strcmp(name, "cache-root")) | 107 | else if (!strcmp(name, "cache-root")) |
104 | cgit_cache_root = xstrdup(value); | 108 | cgit_cache_root = xstrdup(value); |
105 | else if (!strcmp(name, "cache-root-ttl")) | 109 | else if (!strcmp(name, "cache-root-ttl")) |
106 | cgit_cache_root_ttl = atoi(value); | 110 | cgit_cache_root_ttl = atoi(value); |
107 | else if (!strcmp(name, "cache-repo-ttl")) | 111 | else if (!strcmp(name, "cache-repo-ttl")) |
108 | cgit_cache_repo_ttl = atoi(value); | 112 | cgit_cache_repo_ttl = atoi(value); |
@@ -119,12 +123,14 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
119 | else if (cgit_repo && !strcmp(name, "repo.path")) | 123 | else if (cgit_repo && !strcmp(name, "repo.path")) |
120 | cgit_repo->path = xstrdup(value); | 124 | cgit_repo->path = xstrdup(value); |
121 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 125 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
122 | cgit_repo->desc = xstrdup(value); | 126 | cgit_repo->desc = xstrdup(value); |
123 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 127 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
124 | cgit_repo->owner = xstrdup(value); | 128 | cgit_repo->owner = xstrdup(value); |
129 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | ||
130 | cgit_repo->snapshots = atoi(value); | ||
125 | } | 131 | } |
126 | 132 | ||
127 | void cgit_repo_config_cb(const char *name, const char *value) | 133 | void cgit_repo_config_cb(const char *name, const char *value) |
128 | { | 134 | { |
129 | if (!strcmp(name, "name")) | 135 | if (!strcmp(name, "name")) |
130 | cgit_repo_name = xstrdup(value); | 136 | cgit_repo_name = xstrdup(value); |
diff --git a/ui-commit.c b/ui-commit.c index de3f2cf..3618800 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -166,17 +166,19 @@ void cgit_print_commit(const char *hex) | |||
166 | "<a href='"); | 166 | "<a href='"); |
167 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); | 167 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); |
168 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 168 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
169 | htmlf("'>%s</a></td></tr>\n", | 169 | htmlf("'>%s</a></td></tr>\n", |
170 | sha1_to_hex(p->item->object.sha1)); | 170 | sha1_to_hex(p->item->object.sha1)); |
171 | } | 171 | } |
172 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); | 172 | if (cgit_repo->snapshots) { |
173 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); | 173 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); |
174 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", | 174 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); |
175 | fmt("id=%s&name=%s", hex, filename))); | 175 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", |
176 | htmlf("'>%s</a></td></tr>", filename); | 176 | fmt("id=%s&name=%s", hex, filename))); |
177 | htmlf("'>%s</a></td></tr>", filename); | ||
178 | } | ||
177 | 179 | ||
178 | html("</table>\n"); | 180 | html("</table>\n"); |
179 | html("<div class='commit-subject'>"); | 181 | html("<div class='commit-subject'>"); |
180 | html_txt(info->subject); | 182 | html_txt(info->subject); |
181 | html("</div>"); | 183 | html("</div>"); |
182 | html("<div class='commit-msg'>"); | 184 | html("<div class='commit-msg'>"); |