summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorChristian Hesse2018-06-05 12:46:13 +0200
committerJason A. Donenfeld2018-06-27 18:01:29 +0200
commit0bb34ef130f05b865ee2a34d196ea6352590f673 (patch)
treea3e3246b933af347dc8c4fef52db31df3db44d84
parente65ea965a07c7d48d269b2d2278d0101f7ac2b48 (diff)
downloadcgit-0bb34ef130f05b865ee2a34d196ea6352590f673.tar
cgit-0bb34ef130f05b865ee2a34d196ea6352590f673.tar.gz
cgit-0bb34ef130f05b865ee2a34d196ea6352590f673.zip
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 <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cgit.css8
-rw-r--r--ui-log.c6
2 files changed, 13 insertions, 1 deletions
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("<span class='decoration'>");
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)
>206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252