crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "snapshot-prefix" repo configuration

Browse Source 
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>
This commit is contained in:
John Keeping 2018-03-31 14:20:01 +01:00 committed by Jason A. Donenfeld
parent d85e8a9810
commit c1572bb5ec
7 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgit.c
View File

@ -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));

1
cgit.h
View File

@ -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;

7
cgitrc.5.txt
View File

@ -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.

2
ui-refs.c
View File

@ -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

10
ui-shared.c
View File

@ -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))

1
ui-shared.h
View File

@ -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);

4
ui-snapshot.c
View File

@ -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);