aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-02-08 22:47:56 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-02-08 22:47:56 (JST)
commitac70cb4795c90db02917db63d169b0fadfe9fb99 (patch)
treebf7a5c4c8c2789cda2dd511f0a180df279a0b389
parentab2ab95f09994560f62fd631f07d3b6e3577aa6e (diff)
downloadcgit-ac70cb4795c90db02917db63d169b0fadfe9fb99.zip
cgit-ac70cb4795c90db02917db63d169b0fadfe9fb99.tar.gz
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.c3
-rw-r--r--cgit.h2
-rw-r--r--cgitrc5
-rw-r--r--shared.c6
-rw-r--r--ui-commit.c12
5 files changed, 22 insertions, 6 deletions
diff --git a/cgit.c b/cgit.c
index 2795ecc..7b7afba 100644
--- a/cgit.c
+++ b/cgit.c
@@ -79,7 +79,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
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;
diff --git a/cgit.h b/cgit.h
index 03c2fdb..6e95673 100644
--- a/cgit.h
+++ b/cgit.h
@@ -21,6 +21,7 @@ struct repoinfo {
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
26struct repolist { 27struct repolist {
@@ -61,6 +62,7 @@ extern char *cgit_virtual_root;
61extern char *cgit_cache_root; 62extern char *cgit_cache_root;
62 63
63extern int cgit_nocache; 64extern int cgit_nocache;
65extern int cgit_snapshots;
64extern int cgit_max_lock_attempts; 66extern int cgit_max_lock_attempts;
65extern int cgit_cache_root_ttl; 67extern int cgit_cache_root_ttl;
66extern int cgit_cache_repo_ttl; 68extern int cgit_cache_repo_ttl;
diff --git a/cgitrc b/cgitrc
index d45f9c2..3bae642 100644
--- a/cgitrc
+++ b/cgitrc
@@ -8,6 +8,10 @@
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
@@ -77,3 +81,4 @@
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
diff --git a/shared.c b/shared.c
index 5757d0c..531d8c0 100644
--- a/shared.c
+++ b/shared.c
@@ -20,6 +20,7 @@ char *cgit_virtual_root = NULL;
20char *cgit_cache_root = "/var/cache/cgit"; 20char *cgit_cache_root = "/var/cache/cgit";
21 21
22int cgit_nocache = 0; 22int cgit_nocache = 0;
23int cgit_snapshots = 0;
23int cgit_max_lock_attempts = 5; 24int cgit_max_lock_attempts = 5;
24int cgit_cache_root_ttl = 5; 25int cgit_cache_root_ttl = 5;
25int cgit_cache_repo_ttl = 5; 26int cgit_cache_repo_ttl = 5;
@@ -83,6 +84,7 @@ struct repoinfo *add_repo(const char *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
@@ -100,6 +102,8 @@ void cgit_global_config_cb(const char *name, const char *value)
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"))
@@ -122,6 +126,8 @@ void cgit_global_config_cb(const char *name, const char *value)
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
127void cgit_repo_config_cb(const char *name, const char *value) 133void cgit_repo_config_cb(const char *name, const char *value)
diff --git a/ui-commit.c b/ui-commit.c
index de3f2cf..3618800 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -169,11 +169,13 @@ void cgit_print_commit(const char *hex)
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'>");