From 0bb34ef130f05b865ee2a34d196ea6352590f673 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 5 Jun 2018 12:46:13 +0200 Subject: ui-log: highlight annotated tags in different color Annotated tags have some extra information... Descriptive text or signature. Highlighting annotated tags in a different color show what tag may be worth clicking for extra information. Signed-off-by: Christian Hesse Reviewed-by: John Keeping --- cgit.css | 8 ++++++++ ui-log.c | 6 +++++- 2 files changed, 13 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..b5cd2f6 100644 --- a/ui-log.c +++ b/ui-log.c @@ -65,6 +65,8 @@ void show_commit_decorations(struct commit *commit) return; html(""); while (deco) { + struct object_id peeled; + int is_annotated = 0; strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1); switch(deco->type) { case DECORATION_NONE: @@ -77,7 +79,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) -- cgit 1.4.1 ter'>committer
Commit message (Collapse)Author
2021-01-13Match \ before newline in string as EscapeJune McEnroe
2021-01-13Remove -t flag from ctags commandsJune McEnroe
It's the default/only there for compatibility on the implementations I use.
2021-01-13Match strftime format specifiersJune McEnroe
2021-01-13Switch git.causal.agency to hilex and htagmlJune McEnroe
Still missing a shell lexer in hilex, but well... it's shell.
2021-01-13Try to return make substitutions as single tokensJune McEnroe
2021-01-13Shorten hilex class namesJune McEnroe
2021-01-13Move text "lexer" to hilex.cJune McEnroe
2021-01-13Try to return strings as single tokensJune McEnroe
2021-01-13Match [] as Operator in C lexerJune McEnroe
2021-01-13Fix C lexer to require a digit in a float literalJune McEnroe
Otherwise ".l" is matched as Number.
2021-01-13Support long double in c.shJune McEnroe
2021-01-13Update Terminal.app coloursJune McEnroe
God what is this garbage I only changed one colour.
2021-01-13Increase dark white brightness slightlyJune McEnroe
2021-01-13Add hilex example to htagml manualJune McEnroe
2021-01-12Style causal.agency like bin HTMLJune McEnroe
2021-01-12Avoid matching tag text inside HTML elementsJune McEnroe
2021-01-12Use hilex for up -hJune McEnroe
2021-01-12Use hilex for bin HTMLJune McEnroe
2021-01-12Don't output a pre in hilex by defaultJune McEnroe
2021-01-12Move hilex out of hilex directoryJune McEnroe
2021-01-12Consolidate hilex formatters into hilex.cJune McEnroe
2021-01-12Remove hacky tagging from hilexJune McEnroe
God that makes the lexers so much simpler.
2021-01-12Add htagml -iJune McEnroe
2021-01-12Render tag index in HTMLJune McEnroe
2021-01-12Add htagml -xJune McEnroe
2021-01-12Prevent matching the same tag twiceJune McEnroe
2021-01-12Process htagml file line by lineJune McEnroe
This simplifies some things, adds support for line number tag definitions, and should enable combining htagml with other preprocessors in the future.
2021-01-12Split fields by tab onlyJune McEnroe
Also don't fail hard on non-forward-search definitions.
2021-01-12List both Makefile and html.sh under README.7June McEnroe
2021-01-12Add htagml exampleJune McEnroe
2021-01-12Use mandoc and htagml for bin htmlJune McEnroe
2021-01-12Add htagmlJune McEnroe
2021-01-12Replace causal.agency with a simple mdoc pageJune McEnroe
2021-01-11Publish "Using vi"June McEnroe
2021-01-11Enable diff.colorMovedJune McEnroe
2021-01-10Set less search case-insensitiveJune McEnroe
2021-01-10Set EXINITJune McEnroe
neovim is laggy as hell in my OpenBSD VM, so I switched to vi so I could type without getting frustrated.
2021-01-09Add c -t flag to print expression typeJune McEnroe
Also add missing float case.
2021-01-05Update taglineJune McEnroe