From bd1b281478c8d8ab45f723ac5818d58da4a64dd1 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 14:05:02 +0100 Subject: ui-shared: pass repo object to print_snapshot_links() Both call sites of cgit_print_snapshot_links() use the same values for the snapshot mask and repository name, which are derived from the cgit_repo structure so let's pass in the structure and access the fields directly. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-shared.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index b760a17..b3eb8c5 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -76,8 +76,8 @@ extern void cgit_print_pageheader(void); extern void cgit_print_filemode(unsigned short mode); extern void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base, const char *ref); -extern void cgit_print_snapshot_links(const char *repo, const char *head, - const char *hex, int snapshots); +extern void cgit_print_snapshot_links(const struct cgit_repo *repo, + const char *head, const char *hex); extern void cgit_add_hidden_formfields(int incl_head, int incl_search, const char *page); -- cgit v1.2.3-24-g4f1b From c1572bb5ec4540b5008490cf471cc4a5e65ef728 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 14:20:01 +0100 Subject: 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 Reviewed-by: Christian Hesse --- ui-shared.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ui-shared.h') 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); -- cgit v1.2.3-24-g4f1b From 63da41a915157d27dcf26e4811bd6b5f8a3abb2b Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:02:21 +0100 Subject: ui-shared: remove unused parameter The "head" parameter to cgit_print_snapshot_links() is never used, so remove it. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-shared.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index 92a1755..5c5dc33 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -77,7 +77,7 @@ extern void cgit_print_filemode(unsigned short mode); 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); + 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); -- cgit v1.2.3-24-g4f1b From 82aadcfc51ab9560862b99bfe5833c17f102f0ac Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:03:21 +0100 Subject: ui-shared: rename parameter to cgit_print_snapshot_links() This is expected to be a ref not a hex object ID, so name it more appropriately. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-shared.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index 5c5dc33..d44d7c6 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -77,7 +77,7 @@ extern void cgit_print_filemode(unsigned short mode); 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 *hex); + const char *ref); 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); -- cgit v1.2.3-24-g4f1b From e491eaa5df3055dc419d9d3cb75421e8a8c43944 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:08:59 +0100 Subject: ui-shared: pass separator in to cgit_print_snapshot_links() cgit_print_snapshot_links() is almost identical to print_tag_downloads(), so let's extract the difference to a parameter in preparation for removing print_tag_downloads() in the next commit. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-shared.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index d44d7c6..4d5978b 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -77,7 +77,7 @@ extern void cgit_print_filemode(unsigned short mode); 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 *ref); + const char *ref, const char *separator); 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); -- cgit v1.2.3-24-g4f1b