aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2018-03-31 14:20:01 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-06-27 18:11:19 +0200
commitc1572bb5ec4540b5008490cf471cc4a5e65ef728 (patch)
tree5f31bf0e4ca63ab94b74a85897d37481474c92a0
parentd85e8a9810cbfbe5cfe80509a7b47cb39483e6ac (diff)
downloadcgit-c1572bb5ec4540b5008490cf471cc4a5e65ef728.tar.gz
cgit-c1572bb5ec4540b5008490cf471cc4a5e65ef728.tar.bz2
cgit-c1572bb5ec4540b5008490cf471cc4a5e65ef728.zip
Add "snapshot-prefix" repo configuration
Allow using a user-specified value for the prefix in snapshot files instead of the repository basename. For example, files downloaded from the linux-stable.git repository should be named linux-$VERSION and not linux-stable-$VERSION, which can be achieved by setting: repo.snapshot-prefix=linux Signed-off-by: John Keeping <john@keeping.me.uk> Reviewed-by: Christian Hesse <mail@eworm.de>
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt7
-rw-r--r--ui-refs.c2
-rw-r--r--ui-shared.c10
-rw-r--r--ui-shared.h1
-rw-r--r--ui-snapshot.c4
7 files changed, 23 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index bd9cb3f..d2f7b9c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -79,6 +79,8 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
item->util = xstrdup(value);
} else if (!strcmp(name, "section"))
repo->section = xstrdup(value);
+ else if (!strcmp(name, "snapshot-prefix"))
+ repo->snapshot_prefix = xstrdup(value);
else if (!strcmp(name, "readme") && value != NULL) {
if (repo->readme.items == ctx.cfg.readme.items)
memset(&repo->readme, 0, sizeof(repo->readme));
diff --git a/cgit.h b/cgit.h
index 005ae63..847cd2e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -88,6 +88,7 @@ struct cgit_repo {
char *clone_url;
char *logo;
char *logo_link;
+ char *snapshot_prefix;
int snapshots;
int enable_commit_graph;
int enable_log_filecount;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4da166c..a9d3d0a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -599,6 +599,13 @@ repo.snapshots::
restricted by the global "snapshots" setting. Default value:
<snapshots>.
+repo.snapshot-prefix::
+ Prefix to use for snapshot links instead of the repository basename.
+ For example, the "linux-stable" repository may wish to set this to
+ "linux" so that snapshots are in the format "linux-3.15.4" instead
+ of "linux-stable-3.15.4". Default value: <empty> meaning to use
+ the repository basename.
+
repo.section::
Override the current section name for this repository. Default value:
none.
diff --git a/ui-refs.c b/ui-refs.c
index 75f2789..50d9d30 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -100,7 +100,7 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
if (!ref || strlen(ref) < 1)
return;
- basename = cgit_repobasename(repo->url);
+ basename = cgit_snapshot_prefix(repo);
if (starts_with(ref, basename))
strbuf_addstr(&filename, ref);
else
diff --git a/ui-shared.c b/ui-shared.c
index e719c1b..d857873 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -152,6 +152,14 @@ const char *cgit_repobasename(const char *reponame)
return rvbuf;
}
+const char *cgit_snapshot_prefix(const struct cgit_repo *repo)
+{
+ if (repo->snapshot_prefix)
+ return repo->snapshot_prefix;
+
+ return cgit_repobasename(repo->url);
+}
+
static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)
{
char *delim = "?";
@@ -1110,7 +1118,7 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *head,
struct strbuf filename = STRBUF_INIT;
size_t prefixlen;
- cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo->url), hex);
+ cgit_compose_snapshot_prefix(&filename, cgit_snapshot_prefix(repo), hex);
prefixlen = filename.len;
for (f = cgit_snapshot_formats; f->suffix; f++) {
if (!(repo->snapshots & f->bit))
diff --git a/ui-shared.h b/ui-shared.h
index b3eb8c5..92a1755 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -78,6 +78,7 @@ extern void cgit_compose_snapshot_prefix(struct strbuf *filename,
const char *base, const char *ref);
extern void cgit_print_snapshot_links(const struct cgit_repo *repo,
const char *head, const char *hex);
+extern const char *cgit_snapshot_prefix(const struct cgit_repo *repo);
extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page);
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 237a75f..b9e2a36 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -154,7 +154,7 @@ static const char *get_ref_from_filename(const struct cgit_repo *repo,
if (get_oid(snapshot.buf, &oid) == 0)
goto out;
- reponame = cgit_repobasename(repo->url);
+ reponame = cgit_snapshot_prefix(repo);
if (starts_with(snapshot.buf, reponame)) {
const char *new_start = snapshot.buf;
new_start += strlen(reponame);
@@ -214,7 +214,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
hex = head;
if (!prefix)
- prefix = xstrdup(cgit_repobasename(ctx.repo->url));
+ prefix = xstrdup(cgit_snapshot_prefix(ctx.repo));
make_snapshot(f, hex, prefix, filename);
free(prefix);