");
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 2257d6b..eb5f1cd 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,61 @@
#include "cgit.h"
-static void cgit_print_zip(struct cacheitem *item, const char *hex,
- const char *prefix, const char *filename)
+static const struct snapshot_archive_t {
+ const char *suffix;
+ const char *mimetype;
+ write_archive_fn_t write_func;
+} snapshot_archives[] = {
+ { ".zip", "application/x-zip", write_zip_archive },
+ { ".tar.gz", "application/x-gzip", write_tar_archive }
+};
+
+void cgit_print_snapshot(struct cacheitem *item, const char *hex,
+ const char *prefix, const char *filename)
{
- struct archiver_args args;
- struct commit *commit;
- unsigned char sha1[20];
+ int fnl = strlen(filename);
+ int f;
+ for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+ const struct snapshot_archive_t* sat = &snapshot_archives[f];
+ int sl = strlen(sat->suffix);
+ if(fnl
suffix))
+ continue;
- if (get_sha1(hex, sha1)) {
- cgit_print_error(fmt("Bad object id: %s", hex));
- return;
- }
- commit = lookup_commit_reference(sha1);
+ struct archiver_args args;
+ struct commit *commit;
+ unsigned char sha1[20];
+
+ if(get_sha1(hex, sha1)) {
+ cgit_print_error(fmt("Bad object id: %s", hex));
+ return;
+ }
+ commit = lookup_commit_reference(sha1);
+
+ if(!commit) {
+ cgit_print_error(fmt("Not a commit reference: %s", hex));
+ return;;
+ }
- if (!commit) {
- cgit_print_error(fmt("Not a commit reference: %s", hex));
+ memset(&args,0,sizeof(args));
+ args.base = fmt("%s/", prefix);
+ args.tree = commit->tree;
+
+ cgit_print_snapshot_start(sat->mimetype, filename, item);
+ (*sat->write_func)(&args);
return;
}
-
- memset(&args, 0, sizeof(args));
- args.base = fmt("%s/", prefix);
- args.tree = commit->tree;
-
- cgit_print_snapshot_start("application/x-zip", filename, item);
- write_zip_archive(&args);
+ cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
}
-
-void cgit_print_snapshot(struct cacheitem *item, const char *hex,
- const char *format, const char *prefix,
- const char *filename)
+void cgit_print_snapshot_links(const char *repo,const char *hex)
{
- if (!strcmp(format, "zip"))
- cgit_print_zip(item, hex, prefix, filename);
- else
- cgit_print_error(fmt("Unsupported snapshot format: %s",
- format));
+ char *filename;
+ int f;
+ for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+ const struct snapshot_archive_t* sat = &snapshot_archives[f];
+ filename = fmt("%s-%s%s",repo,hex,sat->suffix);
+ htmlf("%s
",
+ cgit_pageurl(repo,"snapshot",
+ fmt("id=%s&name=%s",hex,filename)), filename);
+ }
}
--
cgit 1.4.1-21-gabe81
From 3aae82703bfe70fc273f0611cdc780804df77bb8 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Wed, 18 Jul 2007 14:55:40 +0200
Subject: css: adjust vertical-align of commit info th cells
---
cgit.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/cgit.css b/cgit.css
index 112dac1..43a40a3 100644
--- a/cgit.css
+++ b/cgit.css
@@ -231,6 +231,7 @@ table.commit-info th {
text-align: left;
font-weight: normal;
padding: 0.1em 1em 0.1em 0.1em;
+ vertical-align: top;
}
table.commit-info td {
--
cgit 1.4.1-21-gabe81
From 127f43d4e202ba3e63f72add44238c2686dd97f3 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Fri, 20 Jul 2007 20:56:43 +0200
Subject: added a chk_non_negative check
---
cgit.h | 1 +
shared.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/cgit.h b/cgit.h
index f01f6c9..6937c42 100644
--- a/cgit.h
+++ b/cgit.h
@@ -157,6 +157,7 @@ extern void cgit_querystring_cb(const char *name, const char *value);
extern int chk_zero(int result, char *msg);
extern int chk_positive(int result, char *msg);
+extern int chk_non_negative(int result, char *msg);
extern int hextoint(char c);
extern char *trim_end(const char *str, char c);
diff --git a/shared.c b/shared.c
index 1a5b866..65fc8b2 100644
--- a/shared.c
+++ b/shared.c
@@ -86,6 +86,13 @@ int chk_positive(int result, char *msg)
return result;
}
+int chk_non_negative(int result, char *msg)
+{
+ if (result < 0)
+ die("%s: %s",msg, strerror(errno));
+ return result;
+}
+
struct repoinfo *add_repo(const char *url)
{
struct repoinfo *ret;
--
cgit 1.4.1-21-gabe81
From 4a92cbb7fd1084764dfe9b97a163f1084c790b15 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Fri, 20 Jul 2007 20:58:23 +0200
Subject: compress .tar.gz using gzip as a filter
---
ui-snapshot.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index eb5f1cd..649569f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,13 +8,49 @@
#include "cgit.h"
+static int write_tar_gzip_archive(struct archiver_args *args)
+{
+ int rw[2];
+ pid_t gzpid;
+ int stdout2;
+ int status;
+ int rv;
+
+ stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
+ chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
+ gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
+ if(gzpid==0) {
+ /* child */
+ chk_zero(close(rw[1]), "Closing write end of pipe in child");
+ chk_zero(close(STDIN_FILENO), "Closing STDIN");
+ chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
+ execlp("gzip","gzip",NULL);
+ _exit(-1);
+ }
+ /* parent */
+ chk_zero(close(rw[0]), "Closing read end of pipe");
+ chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
+
+ rv = write_tar_archive(args);
+
+ chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
+ chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
+ chk_zero(close(stdout2), "Closing uncompressed STDOUT");
+ chk_zero(close(rw[1]), "Closing write end of pipe in parent");
+ chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
+ if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
+ cgit_print_error("Failed to compress archive");
+
+ return rv;
+}
+
static const struct snapshot_archive_t {
const char *suffix;
const char *mimetype;
write_archive_fn_t write_func;
} snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive },
- { ".tar.gz", "application/x-gzip", write_tar_archive }
+ { ".tar.gz", "application/x-gzip", write_tar_gzip_archive }
};
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
--
cgit 1.4.1-21-gabe81
From 18a99bdf879953307d6ae6eb56c2117a4c074b0d Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 02:05:34 +0200
Subject: introduced .tar.bz2 snapshots
- reworked write_tar_gzip_archive to handle arbitrary filter as a
write_compressed_tar_archive
- reformatted whitespaces in the said function to adhere to common cgit
standards
- added wrappers around write_compressed_tar_archive for .tar.gz and .tar.bz2
- added a hint for vim to use 8 characters shift width by default
Signed-off-by: Michael Krelin
---
ui-snapshot.c | 73 ++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 42 insertions(+), 31 deletions(-)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 649569f..f623f35 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,49 @@
#include "cgit.h"
-static int write_tar_gzip_archive(struct archiver_args *args)
+static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
{
- int rw[2];
- pid_t gzpid;
- int stdout2;
- int status;
- int rv;
+ int rw[2];
+ pid_t gzpid;
+ int stdout2;
+ int status;
+ int rv;
+
+ stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
+ chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
+ gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
+ if(gzpid==0) {
+ /* child */
+ chk_zero(close(rw[1]), "Closing write end of pipe in child");
+ chk_zero(close(STDIN_FILENO), "Closing STDIN");
+ chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
+ execlp(filter,filter,NULL);
+ _exit(-1);
+ }
+ /* parent */
+ chk_zero(close(rw[0]), "Closing read end of pipe");
+ chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
+
+ rv = write_tar_archive(args);
- stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
- chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
- gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
- if(gzpid==0) {
- /* child */
- chk_zero(close(rw[1]), "Closing write end of pipe in child");
- chk_zero(close(STDIN_FILENO), "Closing STDIN");
- chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
- execlp("gzip","gzip",NULL);
- _exit(-1);
- }
- /* parent */
- chk_zero(close(rw[0]), "Closing read end of pipe");
- chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
-
- rv = write_tar_archive(args);
+ chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
+ chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
+ chk_zero(close(stdout2), "Closing uncompressed STDOUT");
+ chk_zero(close(rw[1]), "Closing write end of pipe in parent");
+ chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
+ if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
+ cgit_print_error("Failed to compress archive");
- chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
- chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
- chk_zero(close(stdout2), "Closing uncompressed STDOUT");
- chk_zero(close(rw[1]), "Closing write end of pipe in parent");
- chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
- if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
- cgit_print_error("Failed to compress archive");
+ return rv;
+}
- return rv;
+static int write_tar_gzip_archive(struct archiver_args *args)
+{
+ return write_compressed_tar_archive(args,"gzip");
+}
+static int write_tar_bzip2_archive(struct archiver_args *args)
+{
+ return write_compressed_tar_archive(args,"bzip2");
}
static const struct snapshot_archive_t {
@@ -50,7 +59,8 @@ static const struct snapshot_archive_t {
write_archive_fn_t write_func;
} snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive },
- { ".tar.gz", "application/x-gzip", write_tar_gzip_archive }
+ { ".tar.gz", "application/x-tar", write_tar_gzip_archive },
+ { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }
};
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
@@ -102,3 +112,4 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
fmt("id=%s&name=%s",hex,filename)), filename);
}
}
+/* vim:set sw=8: */
--
cgit 1.4.1-21-gabe81
From 86ca02231fc42a629c50abebcae3ea9d4d692979 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 02:14:35 +0200
Subject: add plain uncompressed tar snapshort format
time to make available snapshots selectable
Signed-off-by: Michael Krelin
---
ui-snapshot.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index f623f35..84bf8f7 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -60,7 +60,8 @@ static const struct snapshot_archive_t {
} snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive },
{ ".tar.gz", "application/x-tar", write_tar_gzip_archive },
- { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }
+ { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive },
+ { ".tar", "application/x-tar", write_tar_archive }
};
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
--
cgit 1.4.1-21-gabe81
From 0df096f6e146187e55e2203ea1c017442cc2c8c6 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 13:13:40 +0200
Subject: added snapshot filename to the link
- changed cgit_pageurl into cgit_fileurl with the filename parameter
- rewritten cgit_pageurl as a wrapper around cgit_fileurl
Signed-off-by: Michael Krelin
---
cgit.h | 2 ++
ui-shared.c | 17 +++++++++++++----
ui-snapshot.c | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/cgit.h b/cgit.h
index 6937c42..aabf725 100644
--- a/cgit.h
+++ b/cgit.h
@@ -201,6 +201,8 @@ extern int cache_exist(struct cacheitem *item);
extern int cache_expired(struct cacheitem *item);
extern char *cgit_repourl(const char *reponame);
+extern char *cgit_fileurl(const char *reponame, const char *pagename,
+ const char *filename, const char *query);
extern char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query);
diff --git a/ui-shared.c b/ui-shared.c
index d4376ce..1c1415e 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -57,13 +57,13 @@ char *cgit_repourl(const char *reponame)
}
}
-char *cgit_pageurl(const char *reponame, const char *pagename,
- const char *query)
+char *cgit_fileurl(const char *reponame, const char *pagename,
+ const char *filename, const char *query)
{
if (cgit_virtual_root) {
if (query)
- return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
- pagename, query);
+ return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
+ pagename, filename?filename:"", query);
else
return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
pagename);
@@ -75,6 +75,13 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
}
}
+char *cgit_pageurl(const char *reponame, const char *pagename,
+ const char *query)
+{
+ return cgit_fileurl(reponame,pagename,0,query);
+}
+
+
char *cgit_currurl()
{
if (!cgit_virtual_root)
@@ -368,3 +375,5 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
ttl_seconds(item->ttl)));
html("\n");
}
+
+/* vim:set sw=8: */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 84bf8f7..7076b50 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -109,7 +109,7 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
const struct snapshot_archive_t* sat = &snapshot_archives[f];
filename = fmt("%s-%s%s",repo,hex,sat->suffix);
htmlf("%s
",
- cgit_pageurl(repo,"snapshot",
+ cgit_fileurl(repo,"snapshot",filename,
fmt("id=%s&name=%s",hex,filename)), filename);
}
}
--
cgit 1.4.1-21-gabe81
From 1cb8bedf1e0a4aa73bb8ad3f96bfa7eda50919b3 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 15:24:07 +0200
Subject: introduce cgit_repobasename
that shortens reponame stripping any directories and .git suffixes, that is
turning 'dir/repo.git/' or 'dir/repo/.git/' or alikes into mere 'repo'.
Signed-off-by: Michael Krelin
---
cgit.h | 2 ++
ui-shared.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/cgit.h b/cgit.h
index aabf725..1dbf901 100644
--- a/cgit.h
+++ b/cgit.h
@@ -206,6 +206,8 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename,
extern char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query);
+extern const char *cgit_repobasename(const char *reponame);
+
extern void cgit_tree_link(char *name, char *title, char *class, char *head,
char *rev, char *path);
extern void cgit_log_link(char *name, char *title, char *class, char *head,
diff --git a/ui-shared.c b/ui-shared.c
index 1c1415e..3e378a4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -81,6 +81,30 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
return cgit_fileurl(reponame,pagename,0,query);
}
+const char *cgit_repobasename(const char *reponame)
+{
+ /* I assume we don't need to store more than one repo basename */
+ static char rvbuf[1024];
+ int p;
+ const char *rv;
+ strncpy(rvbuf,reponame,sizeof(rvbuf));
+ if(rvbuf[sizeof(rvbuf)-1])
+ die("cgit_repobasename: truncated repository name '%s'", reponame);
+ p = strlen(rvbuf)-1;
+ /* strip trailing slashes */
+ while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+ /* strip trailing .git */
+ if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+ p -= 3; rvbuf[p--] = 0;
+ }
+ /* strip more trailing slashes if any */
+ while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+ /* find last slash in the remaining string */
+ rv = strrchr(rvbuf,'/');
+ if(rv)
+ return ++rv;
+ return rvbuf;
+}
char *cgit_currurl()
{
--
cgit 1.4.1-21-gabe81
From 97c025ae8ecf9764fd6996c81c51c3de4adb837c Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 15:29:55 +0200
Subject: shorten snapshot names to repo basename
Signed-off-by: Michael Krelin
---
cgit.c | 3 ++-
ui-snapshot.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cgit.c b/cgit.c
index a0f88ad..7b55b7b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -69,7 +69,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
cgit_print_snapshot(item, cgit_query_sha1,
- cgit_repo->url, cgit_query_name);
+ cgit_repobasename(cgit_repo->url),
+ cgit_query_name);
return;
}
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 7076b50..053fd48 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -107,7 +107,7 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
int f;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f];
- filename = fmt("%s-%s%s",repo,hex,sat->suffix);
+ filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
htmlf("%s
",
cgit_fileurl(repo,"snapshot",filename,
fmt("id=%s&name=%s",hex,filename)), filename);
--
cgit 1.4.1-21-gabe81
From dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 18:00:53 +0200
Subject: allow selective enabling of snapshots
snapshot configuration parameter now can be a
space/slash/comma/colon/semicolon/pipe-separated list of snaphot suffixes as
listed in ui-snapshot.c
Signed-off-by: Michael Krelin
---
cgit.c | 3 ++-
cgit.h | 6 ++++--
cgitrc | 5 +++--
shared.c | 4 ++--
ui-commit.c | 2 +-
ui-snapshot.c | 43 ++++++++++++++++++++++++++++++++++++-------
6 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/cgit.c b/cgit.c
index 7b55b7b..8795bbc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -70,7 +70,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
cgit_print_snapshot(item, cgit_query_sha1,
cgit_repobasename(cgit_repo->url),
- cgit_query_name);
+ cgit_query_name,
+ cgit_repo->snapshots );
return;
}
diff --git a/cgit.h b/cgit.h
index 1dbf901..ea61be7 100644
--- a/cgit.h
+++ b/cgit.h
@@ -235,7 +235,9 @@ extern void cgit_print_tree(const char *rev, char *path);
extern void cgit_print_commit(char *hex);
extern void cgit_print_diff(const char *new_hex, const char *old_hex);
extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
- const char *prefix, const char *filename);
-extern void cgit_print_snapshot_links(const char *repo, const char *hex);
+ const char *prefix, const char *filename,
+ int snapshot);
+extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots);
+extern int cgit_parse_snapshots_mask(const char *str);
#endif /* CGIT_H */
diff --git a/cgitrc b/cgitrc
index 40877f8..1040997 100644
--- a/cgitrc
+++ b/cgitrc
@@ -8,7 +8,8 @@
#nocache=0
-## Enable/disable snapshots by default. This can be overridden per repo
+## Set allowed snapshot types by default. Can be overridden per repo
+# can be any combination of zip/tar.gz/tar.bz2/tar
#snapshots=0
@@ -113,7 +114,7 @@
#repo.desc=the caching cgi for git
#repo.path=/pub/git/cgit
#repo.owner=Lars Hjemli
-#repo.snapshots=1 # override a sitewide snapshot-setting
+#repo.snapshots=tar.bz2 # override a sitewide snapshot-setting
#repo.enable-log-filecount=0 # override the default filecount setting
#repo.enable-log-linecount=0 # override the default linecount setting
#repo.module-link=/git/%s/commit/?id=%s # override the standard module-link
diff --git a/shared.c b/shared.c
index 65fc8b2..ccbde27 100644
--- a/shared.c
+++ b/shared.c
@@ -155,7 +155,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (!strcmp(name, "nocache"))
cgit_nocache = atoi(value);
else if (!strcmp(name, "snapshots"))
- cgit_snapshots = atoi(value);
+ cgit_snapshots = cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-index-links"))
cgit_enable_index_links = atoi(value);
else if (!strcmp(name, "enable-log-filecount"))
@@ -197,7 +197,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (cgit_repo && !strcmp(name, "repo.defbranch"))
cgit_repo->defbranch = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.snapshots"))
- cgit_repo->snapshots = cgit_snapshots * atoi(value);
+ cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
diff --git a/ui-commit.c b/ui-commit.c
index bf5e6dc..50e9e11 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -196,7 +196,7 @@ void cgit_print_commit(char *hex)
}
if (cgit_repo->snapshots) {
html("| download | ");
- cgit_print_snapshot_links(cgit_query_repo,hex);
+ cgit_print_snapshot_links(cgit_query_repo,hex,cgit_repo->snapshots);
html(" |
|---|
");
}
html("\n");
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 053fd48..d6be55b 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -57,21 +57,25 @@ static const struct snapshot_archive_t {
const char *suffix;
const char *mimetype;
write_archive_fn_t write_func;
+ int bit;
} snapshot_archives[] = {
- { ".zip", "application/x-zip", write_zip_archive },
- { ".tar.gz", "application/x-tar", write_tar_gzip_archive },
- { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive },
- { ".tar", "application/x-tar", write_tar_archive }
+ { ".zip", "application/x-zip", write_zip_archive, 0x1 },
+ { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 },
+ { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 },
+ { ".tar", "application/x-tar", write_tar_archive, 0x8 }
};
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
- const char *prefix, const char *filename)
+ const char *prefix, const char *filename,
+ int snapshots)
{
int fnl = strlen(filename);
int f;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f];
- int sl = strlen(sat->suffix);
+ int sl;
+ if(!(snapshots&sat->bit)) continue;
+ sl = strlen(sat->suffix);
if(fnlsuffix))
continue;
@@ -101,16 +105,41 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
}
-void cgit_print_snapshot_links(const char *repo,const char *hex)
+void cgit_print_snapshot_links(const char *repo,const char *hex,int snapshots)
{
char *filename;
int f;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f];
+ if(!(snapshots&sat->bit)) continue;
filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
htmlf("%s
",
cgit_fileurl(repo,"snapshot",filename,
fmt("id=%s&name=%s",hex,filename)), filename);
}
}
+
+int cgit_parse_snapshots_mask(const char *str)
+{
+ static const char *delim = " \t,:/|;";
+ int f, tl, rv = 0;
+ /* favor legacy setting */
+ if(atoi(str)) return 1;
+ for(;;) {
+ str += strspn(str,delim);
+ tl = strcspn(str,delim);
+ if(!tl)
+ break;
+ for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+ const struct snapshot_archive_t* sat = &snapshot_archives[f];
+ if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) {
+ rv |= sat->bit;
+ break;
+ }
+ }
+ str += tl;
+ }
+ return rv;
+}
+
/* vim:set sw=8: */
--
cgit 1.4.1-21-gabe81
From bbd4a14456789a2114d8bb0f7ba245af3605bb49 Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 19:35:39 +0200
Subject: fix: changed view link to blob in summary.
might not be the best way, but should suffice for now that view command isn't
handled in any way
Signed-off-by: Michael Krelin
---
ui-summary.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui-summary.c b/ui-summary.c
index b4bc6d8..fdee66b 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -60,7 +60,7 @@ static void cgit_print_object_ref(struct object *obj)
page = "tree";
arg = "id";
} else {
- page = "view";
+ page = "blob";
arg = "id";
}
--
cgit 1.4.1-21-gabe81
From d6b01dac856efda565d4085e77826fd9ac83348a Mon Sep 17 00:00:00 2001
From: Michael Krelin
Date: Sat, 21 Jul 2007 19:51:47 +0200
Subject: link raw blob from tree file view
Signed-off-by: Michael Krelin
---
ui-tree.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ui-tree.c b/ui-tree.c
index c5d64ff..75ce449 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -32,6 +32,10 @@ static void print_object(const unsigned char *sha1, char *path)
return;
}
+ html(" blob: %s",sha1_to_hex(sha1));
+
html("\n");
idx = 0;
start = 0;
--
cgit 1.4.1-21-gabe81