ui-log: color line changes

[cgit.git] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 3b2dc06ceef471ecfc1d8bae23589884a681c5bb..b1a6c46be57f18576d3c1a57008029382f2417cb 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -12,8 +12,7 @@
  #include "html.h"
  
  static const char cgit_doctype[] =
-"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
-"  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+"<!DOCTYPE html>\n";
  
  static char *http_date(time_t t)
  {
@@ -702,7 +701,6 @@ void cgit_redirect(const char *url, bool permanent)
         html("Location: ");
         html_url_path(url);
         html("\n\n");
-       exit(0);
  }
  
  static void print_rel_vcs_link(const char *url)
@@ -724,7 +722,7 @@ void cgit_print_docstart(void)
  
         char *host = cgit_hosturl();
         html(cgit_doctype);
-       html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
+       html("<html lang='en'>\n");
         html("<head>\n");
         html("<title>");
         html_txt(ctx.page.title);
@@ -778,7 +776,7 @@ void cgit_print_docend(void)
         if (ctx.cfg.footer)
                 html_include(ctx.cfg.footer);
         else {
-               htmlf("<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
+               htmlf("<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
                         cgit_version);
                 html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601)));
                 html("</div>\n");
@@ -793,13 +791,11 @@ void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
         ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
         ctx.page.status = code;
         ctx.page.statusmsg = msg;
-       cgit_print_http_headers();
-       cgit_print_docstart();
-       cgit_print_pageheader();
+       cgit_print_layout_start();
         va_start(ap, fmt);
         cgit_vprint_error(fmt, ap);
         va_end(ap);
-       cgit_print_docend();
+       cgit_print_layout_end();
  }
  
  void cgit_print_layout_start(void)
@@ -941,14 +937,14 @@ static void print_header(void)
                 cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                 if (ctx.env.authenticated) {
                         html("</td><td class='form'>");
-                       html("<form method='get' action=''>\n");
+                       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);
                         if (ctx.repo->enable_remote_branches)
                                 for_each_remote_ref(print_branch_option, ctx.qry.head);
                         html("</select> ");
-                       html("<input type='submit' name='' value='switch'/>");
+                       html("<input type='submit' value='switch'/>");
                         html("</form>");
                 }
         } else
@@ -1073,18 +1069,34 @@ void cgit_print_filemode(unsigned short mode)
         html_fileperm(mode);
  }
  
+void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
+                                 const char *ref)
+{
+       unsigned char sha1[20];
+
+       /*
+        * Prettify snapshot names by stripping leading "v" or "V" if the tag
+        * 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_sha1(fmt("refs/tags/%s", ref), sha1) == 0 &&
+           (ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]) &&
+           ((get_sha1(fmt("refs/tags/%s", ref + 1), sha1) == 0) +
+            (get_sha1(fmt("refs/tags/v%s", ref + 1), sha1) == 0) +
+            (get_sha1(fmt("refs/tags/V%s", ref + 1), sha1) == 0) == 1))
+               ref++;
+
+       strbuf_addf(filename, "%s-%s", base, ref);
+}
+
  void cgit_print_snapshot_links(const char *repo, const char *head,
                                const char *hex, int snapshots)
  {
         const struct cgit_snapshot_format* f;
         struct strbuf filename = STRBUF_INIT;
         size_t prefixlen;
-       unsigned char sha1[20];
  
-       if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
-           (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
-               hex++;
-       strbuf_addf(&filename, "%s-%s", cgit_repobasename(repo), hex);
+       cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo), hex);
         prefixlen = filename.len;
         for (f = cgit_snapshot_formats; f->suffix; f++) {
                 if (!(snapshots & f->bit))