ui-diff: fix links from diffstat

The links in the diffstat is supposed to work as a filter for the diff,
but this only worked when a single rev was supplied, i.e. the filtered
diff was always against the parent of the specified rev.

With this patch it is now possible to use the diffstat as a 'filter menu'
for urls like http://hjemli.net/git/cgit/diff/?id=v0.7.2&id2=v0.7.1

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/ui-diff.c b/ui-diff.c
index 1c182aa..7ab1e49 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,25 +7,24 @@
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
-static char *curr_rev;
 
 static struct fileinfo {
         char status;
         unsigned char old_sha1[20];
         unsigned char new_sha1[20];
         unsigned short old_mode;
         unsigned short new_mode;
         char *old_path;
         char *new_path;
         unsigned int added;
         unsigned int removed;
 } *items;
@@ -71,26 +70,26 @@ static void print_fileinfo(struct fileinfo *info)
         } else {
                 cgit_print_filemode(info->new_mode);
         }
 
         if (info->old_mode != info->new_mode &&
             !is_null_sha1(info->old_sha1) &&
             !is_null_sha1(info->new_sha1)) {
                 html("<span class='modechange'>[");
                 cgit_print_filemode(info->old_mode);
                 html("]</span>");
         }
         htmlf("</td><td class='%s'>", class);
-        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
-                       NULL, info->new_path);
+        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                       ctx.qry.sha2, info->new_path);
         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);
         html("</td><td class='right'>");
         htmlf("%d", info->added + info->removed);
         html("</td><td class='graph'>");
         htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
         htmlf("<td class='add' style='width: %.1f%%;'/>",
               info->added * 100.0 / max_changes);
         htmlf("<td class='rem' style='width: %.1f%%;'/>",
               info->removed * 100.0 / max_changes);
@@ -136,25 +135,24 @@ static void inspect_filepair(struct diff_filepair *pair)
         total_adds += lines_added;
         total_rems += lines_removed;
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
                          const unsigned char *new_sha1)
 {
         int i;
 
         html("<div class='diffstat-header'>Diffstat</div>");
         html("<table summary='diffstat' class='diffstat'>");
         max_changes = 0;
-        curr_rev = xstrdup(sha1_to_hex(new_sha1));
         cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
         for(i = 0; i<files; i++)
                 print_fileinfo(&items[i]);
         html("</table>");
         html("<div class='diffstat-summary'>");
         htmlf("%d files changed, %d insertions, %d deletions",
               files, total_adds, total_rems);
         html("</div>");
 }
 
 
 /*