git: update to v2.46.0

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index c50b3e68568087221bb75ef25268af4d203b9338..6fae72d1beea4c4e1487458b20ba7cd60d06dc27 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "cgit.h"
 #include "ui-shared.h"
 #include "cmd.h"
@@ -662,18 +664,18 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                path[len - 1] = tail;
 }
 
-const struct date_mode *cgit_date_mode(enum date_mode_type type)
+const struct date_mode cgit_date_mode(enum date_mode_type type)
 {
        static struct date_mode mode;
        mode.type = type;
        mode.local = ctx.cfg.local_time;
-       return &mode;
+       return mode;
 }
 
 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 +772,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);
@@ -782,6 +788,10 @@ static int emit_css_link(struct string_list_item *s, void *arg)
 
 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);
@@ -1033,9 +1043,11 @@ static void print_header(void)
                        html("<form method='get'>\n");
                        cgit_add_hidden_formfields(0, 1, ctx.qry.page);
                        html("<select name='h' onchange='this.form.submit();'>\n");
-                       for_each_branch_ref(print_branch_option, ctx.qry.head);
+                       refs_for_each_branch_ref(get_main_ref_store(the_repository),
+                                                print_branch_option, ctx.qry.head);
                        if (ctx.repo->enable_remote_branches)
-                               for_each_remote_ref(print_branch_option, ctx.qry.head);
+                               refs_for_each_remote_ref(get_main_ref_store(the_repository),
+                                                        print_branch_option, ctx.qry.head);
                        html("</select> ");
                        html("<input type='submit' value='switch'/>");
                        html("</form>");
@@ -1180,11 +1192,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);