List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [RFC/PATCH 4/7] ui-shared: use the same snapshot logic as ui-refs
Date: Sat, 31 Mar 2018 16:35:51 +0100	[thread overview]
Message-ID: <d3e0bd2fa96a3b0c4d7d9bb7fe4a3114186be1f4.1522510150.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1522510150.git.john@keeping.me.uk>

Make snapshot links in the commit UI use the same prefix algorithm as
those in the summary UI, so that refs starting with the snapshot prefix
are used as-is rather than composed with the prefix repeated.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-shared.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui-shared.c b/ui-shared.c
index 0375006..588f0bf 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1114,9 +1114,15 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref)
 {
 	const struct cgit_snapshot_format* f;
 	struct strbuf filename = STRBUF_INIT;
+	const char *basename;
 	size_t prefixlen;
 
-	cgit_compose_snapshot_prefix(&filename, cgit_snapshot_prefix(repo), ref);
+	basename = cgit_snapshot_prefix(repo);
+	if (starts_with(ref, basename))
+		strbuf_addstr(&filename, ref);
+	else
+		cgit_compose_snapshot_prefix(&filename, basename, ref);
+
 	prefixlen = filename.len;
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
 		if (!(repo->snapshots & f->bit))
-- 
2.16.3



  parent reply	other threads:[~2018-03-31 15:35 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-31 15:35 [RFC/PATCH 0/7] Snapshot signatures john
2018-03-31 15:35 ` [RFC/PATCH 1/7] ui-refs: remove unnecessary sanity check john
2018-03-31 15:35 ` [RFC/PATCH 2/7] ui-shared: remove unused parameter john
2018-03-31 15:35 ` [RFC/PATCH 3/7] ui-shared: rename parameter to cgit_print_snapshot_links() john
2018-03-31 15:35 ` john [this message]
2018-03-31 15:35 ` [RFC/PATCH 5/7] ui-shared: pass separator in " john
2018-03-31 15:35 ` [RFC/PATCH 6/7] ui-refs: use shared function to print tag downloads john
2018-03-31 15:35 ` [RFC/PATCH 7/7] snapshot: support archive signatures john
2018-04-02 21:22 ` [RFC/PATCH 0/7] Snapshot signatures konstantin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d3e0bd2fa96a3b0c4d7d9bb7fe4a3114186be1f4.1522510150.git.john@keeping.me.uk \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).