git: update to v2.41.0

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 7c7a5375cec594485290ee82b676f27c5c8d38e6..eef2aa87cfc9474e7a5b2b2ad68027d445b25518 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -673,7 +673,7 @@ const struct date_mode *cgit_date_mode(enum date_mode_type type)
 static void print_rel_date(time_t t, int tz, double value,
        const char *class, const char *suffix)
 {
-       htmlf("<span class='%s' title='", class);
+       htmlf("<span class='%s' data-ut='%" PRIu64 "' title='", class, (uint64_t)t);
        html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
        htmlf("'>%.0f %s</span>", value, suffix);
 }
@@ -770,6 +770,10 @@ static void print_rel_vcs_link(const char *url)
 
 static int emit_css_link(struct string_list_item *s, void *arg)
 {
+       /* Do not emit anything if css= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
        html("<link rel='stylesheet' type='text/css' href='");
        if (s)
                html_attr(s->string);
@@ -780,6 +784,22 @@ static int emit_css_link(struct string_list_item *s, void *arg)
        return 0;
 }
 
+static int emit_js_link(struct string_list_item *s, void *arg)
+{
+       /* Do not emit anything if js= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
+       html("<script type='text/javascript' src='");
+       if (s)
+               html_attr(s->string);
+       else
+               html_attr((const char *)arg);
+       html("'></script>\n");
+
+       return 0;
+}
+
 void cgit_print_docstart(void)
 {
        char *host = cgit_hosturl();
@@ -805,6 +825,11 @@ void cgit_print_docstart(void)
        else
                emit_css_link(NULL, "/cgit.css");
 
+       if (ctx.cfg.js.items)
+               for_each_string_list(&ctx.cfg.js, emit_js_link, NULL);
+       else
+               emit_js_link(NULL, "/cgit.js");
+
        if (ctx.cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx.cfg.favicon);
@@ -1163,11 +1188,11 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
         * name starts with {v,V}[0-9] and the prettify mapping is injective,
         * i.e. each stripped tag can be inverted without ambiguities.
         */
-       if (get_oid(fmt("refs/tags/%s", ref), &oid) == 0 &&
+       if (repo_get_oid(the_repository, fmt("refs/tags/%s", ref), &oid) == 0 &&
            (ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]) &&
-           ((get_oid(fmt("refs/tags/%s", ref + 1), &oid) == 0) +
-            (get_oid(fmt("refs/tags/v%s", ref + 1), &oid) == 0) +
-            (get_oid(fmt("refs/tags/V%s", ref + 1), &oid) == 0) == 1))
+           ((repo_get_oid(the_repository, fmt("refs/tags/%s", ref + 1), &oid) == 0) +
+            (repo_get_oid(the_repository, fmt("refs/tags/v%s", ref + 1), &oid) == 0) +
+            (repo_get_oid(the_repository, fmt("refs/tags/V%s", ref + 1), &oid) == 0) == 1))
                ref++;
 
        strbuf_addf(filename, "%s-%s", base, ref);