Merge branch 'stable'

diff --combined ui-diff.c
index 868ceec23b813f8dbd39b9eda8249131caa308e3,383a5347c2dbcb1ca9ae2bea53539a68d3ca94a3..d97a8012cfffc4d10986c27d3f3a6f7bfa4019fd
--- 1/ui-diff.c
--- 2/ui-diff.c
+++ b/ui-diff.c
@@@ -97,10 -97,12 +97,12 @@@ static void print_fileinfo(struct filei
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, info->new_path, 0);
-       if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
-               htmlf(" (%s from %s)",
-                     info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
-                     info->old_path);
+       if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
+               htmlf(" (%s from ",
+                     info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
+               html_txt(info->old_path);
+               html(")");
+       }
        html("</td><td class='right'>");
        if (info->binary) {
                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
@@@ -167,7 -169,7 +169,7 @@@ static void inspect_filepair(struct dif
  void cgit_print_diffstat(const unsigned char *old_sha1,
                         const unsigned char *new_sha1, const char *prefix)
  {
 -      int i, save_context = ctx.qry.context;
 +      int i;
  
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
@@@ -177,6 -179,19 +179,6 @@@
                html_txt(prefix);
                html("')");
        }
 -      html(" (");
 -      ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
 -      cgit_self_link("more", NULL, NULL, &ctx);
 -      html("/");
 -      ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
 -      cgit_self_link("less", NULL, NULL, &ctx);
 -      ctx.qry.context = save_context;
 -      html(" context)");
 -      html(" (");
 -      ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
 -      cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
 -      ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
 -      html(" whitespace changes)");
        html("</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
@@@ -265,6 -280,19 +267,6 @@@ static void header(unsigned char *sha1
        html("</div>");
  }
  
 -static void print_ssdiff_link()
 -{
 -      if (!strcmp(ctx.qry.page, "diff")) {
 -              if (use_ssdiff)
 -                      cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
 -                                     ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
 -              else
 -                      cgit_diff_link("Side-by-side diff", NULL, NULL,
 -                                     ctx.qry.head, ctx.qry.sha1,
 -                                     ctx.qry.sha2, ctx.qry.path, 1);
 -      }
 -}
 -
  static void filepair_cb(struct diff_filepair *pair)
  {
        unsigned long old_size = 0;
@@@ -304,56 -332,7 +306,56 @@@
                cgit_ssdiff_footer();
  }
  
 -void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 +void cgit_print_diff_ctrls()
 +{
 +      int i, curr;
 +
 +      html("<div class='cgit-panel'>");
 +      html("<b>diff options</b>");
 +      html("<form method='get' action='.'>");
 +      cgit_add_hidden_formfields(1, 0, ctx.qry.page);
 +      html("<table>");
 +      html("<tr><td colspan='2'/></tr>");
 +      html("<tr>");
 +      html("<td class='label'>context:</td>");
 +      html("<td class='ctrl'>");
 +      html("<select name='context' onchange='this.form.submit();'>");
 +      curr = ctx.qry.context;
 +      if (!curr)
 +              curr = 3;
 +      for (i = 1; i <= 10; i++)
 +              html_intoption(i, fmt("%d", i), curr);
 +      for (i = 15; i <= 40; i += 5)
 +              html_intoption(i, fmt("%d", i), curr);
 +      html("</select>");
 +      html("</td>");
 +      html("</tr><tr>");
 +      html("<td class='label'>space:</td>");
 +      html("<td class='ctrl'>");
 +      html("<select name='ignorews' onchange='this.form.submit();'>");
 +      html_intoption(0, "include", ctx.qry.ignorews);
 +      html_intoption(1, "ignore", ctx.qry.ignorews);
 +      html("</select>");
 +      html("</td>");
 +      html("</tr><tr>");
 +      html("<td class='label'>mode:</td>");
 +      html("<td class='ctrl'>");
 +      html("<select name='ss' onchange='this.form.submit();'>");
 +      curr = ctx.qry.ssdiff;
 +      if (!curr && ctx.cfg.ssdiff)
 +              curr = 1;
 +      html_intoption(0, "unified", curr);
 +      html_intoption(1, "ssdiff", curr);
 +      html("</select></td></tr>");
 +      html("<tr><td/><td class='ctrl'>");
 +      html("<noscript><input type='submit' value='reload'/></noscript>");
 +      html("</td></tr></table>");
 +      html("</form>");
 +      html("</div>");
 +}
 +
 +void cgit_print_diff(const char *new_rev, const char *old_rev,
 +                   const char *prefix, int show_ctrls)
  {
        enum object_type type;
        unsigned long size;
@@@ -396,9 -375,7 +398,9 @@@
        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
                use_ssdiff = 1;
  
 -      print_ssdiff_link();
 +      if (show_ctrls)
 +              cgit_print_diff_ctrls();
 +
        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
  
        if (use_ssdiff) {