From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 1/1] ui-log: highlight annotated tags in different color
Date: Tue, 5 Jun 2018 12:03:53 +0100 [thread overview]
Message-ID: <20180605110353.GA1922@john.keeping.me.uk> (raw)
In-Reply-To: <20180605104752.6813-1-list@eworm.de>
On Tue, Jun 05, 2018 at 12:47:52PM +0200, Christian Hesse wrote:
> Signed-off-by: Christian Hesse <mail at eworm.de>
Can you say a little about why this is desirable as a feature?
> ---
> cgit.css | 8 ++++++++
> ui-log.c | 7 ++++++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/cgit.css b/cgit.css
> index 217a05a..05c4530 100644
> --- a/cgit.css
> +++ b/cgit.css
> @@ -685,6 +685,14 @@ div#cgit a.tag-deco {
> border: solid 1px #777700;
> }
>
> +div#cgit a.tag-annotated-deco {
> + color: #000;
> + margin: 0px 0.5em;
> + padding: 0px 0.25em;
> + background-color: #ffcc88;
> + border: solid 1px #777700;
> +}
> +
> div#cgit a.remote-deco {
> color: #000;
> margin: 0px 0.5em;
> diff --git a/ui-log.c b/ui-log.c
> index 8e36fba..b8344a8 100644
> --- a/ui-log.c
> +++ b/ui-log.c
> @@ -56,8 +56,10 @@ static void inspect_files(struct diff_filepair *pair)
>
> void show_commit_decorations(struct commit *commit)
> {
> + struct object_id peeled;
> const struct name_decoration *deco;
> static char buf[1024];
> + int is_annotated;
The two new declarations could be moved ...
> buf[sizeof(buf) - 1] = 0;
> deco = get_name_decoration(&commit->object);
> @@ -65,6 +67,7 @@ void show_commit_decorations(struct commit *commit)
> return;
> html("<span class='decoration'>");
> while (deco) {
> + is_annotated = 0;
... here, which will make it more obvious that is_annotated is being
initialized correctly (it took me a minute to spot this and I initially
worried that is_annotated was used without initialization if peel_ref
fails).
> strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
> switch(deco->type) {
> case DECORATION_NONE:
> @@ -77,7 +80,9 @@ void show_commit_decorations(struct commit *commit)
> ctx.qry.showmsg, 0);
> break;
> case DECORATION_REF_TAG:
> - cgit_tag_link(buf, NULL, "tag-deco", buf);
> + if (!peel_ref(deco->name, &peeled))
> + is_annotated = !oidcmp(&commit->object.oid, &peeled);
> + cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
> break;
> case DECORATION_REF_REMOTE:
> if (!ctx.repo->enable_remote_branches)
next prev parent reply other threads:[~2018-06-05 11:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 10:47 list
2018-06-05 11:03 ` john [this message]
2018-06-05 11:37 ` list
2018-06-05 11:40 ` [PATCH v2 " list
2018-06-05 14:26 ` john
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=20180605110353.GA1922@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).