8 files changed, 57 insertions, 29 deletions

diff --git a/cgit.c b/cgit.c
index c86d290..1b85b15 100644
--- a/cgit.c
+++ b/cgit.c
@@ -98,25 +98,25 @@ static void cgit_print_repo_page(struct cacheitem *item)
                                cgit_query_path, 1);
                 break;
         case CMD_TREE:
                 cgit_print_tree(cgit_query_sha1, cgit_query_path);
                 break;
         case CMD_COMMIT:
                 cgit_print_commit(cgit_query_sha1);
                 break;
         case CMD_TAG:
                 cgit_print_tag(cgit_query_sha1);
                 break;
         case CMD_DIFF:
-                cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
+                cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
                 break;
         default:
                 cgit_print_error("Invalid request");
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {
         static char buf[PATH_MAX];
         int stdout2;
 
diff --git a/cgit.css b/cgit.css
index 54bbfcc..f69cc75 100644
--- a/cgit.css
+++ b/cgit.css
@@ -263,28 +263,24 @@ div.commit-msg {
 div.diffstat-header {
         font-weight: bold;
         padding-top: 1.5em;
 }
 
 table.diffstat {
         border-collapse: collapse;
         width: 100%;
         border: solid 1px #aaa;
         background-color: #eee;
 }
 
-table.diffstat tr:hover {
-        background-color: #ccc;
-}
-
 table.diffstat th {
         font-weight: normal;
         text-align: left;
         text-decoration: underline;
         padding: 0.1em 1em 0.1em 0.1em;
         font-size: 100%;
 }
 
 table.diffstat td {
         padding: 0.2em 0.2em 0.1em 0.1em;
         font-size: 100%;
         border: none;
@@ -330,32 +326,37 @@ table.diffstat td.graph td.add {
         background-color: #5c5;
 }
 
 table.diffstat td.graph td.rem {
         background-color: #c55;
 }
 
 div.diffstat-summary {
         color: #888;
         padding-top: 0.5em;
 }
 
+table.diff {
+        width: 100%;
+}
+
 table.diff td {
         font-family: monospace;
         white-space: pre;
 }
 
 table.diff td div.head {
         font-weight: bold;
-        padding-top: 1em;
+        margin-top: 1em;
+        background-color: #eee;
 }
 
 table.diff td div.hunk {
         color: #009;
 }
 
 table.diff td div.add {
         color: green;
 }
 
 table.diff td div.del {
         color: red;
diff --git a/cgit.h b/cgit.h
index e3d9cb8..e96311f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -161,25 +161,25 @@ extern int chk_non_negative(int result, char *msg);
 
 extern int hextoint(char c);
 extern char *trim_end(const char *str, char c);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
-                           filepair_fn fn);
+                           filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_link_open(char *url, char *title, char *class);
@@ -229,21 +229,21 @@ extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
                                       const char *filename,
                                       struct cacheitem *item);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
 extern void cgit_print_tag(char *revname);
-extern void cgit_print_diff(const char *new_hex, const char *old_hex);
+extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
                                 const char *hex, const char *prefix,
                                 const char *filename, int snapshot);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern int cgit_parse_snapshots_mask(const char *str);
 
 #endif /* CGIT_H */
diff --git a/cgitrc b/cgitrc
index 34ea116..796a62c 100644
--- a/cgitrc
+++ b/cgitrc
@@ -32,24 +32,31 @@
 
 ## The "Idle" column on the repository index page can read a timestamp
 ## from the specified agefile (if this file cannot be found, the mtime
 ## of HEAD is used).
 ## The cgit repo on hjemli.net uses the the following command in it's
 ## post-receive hook to update the age-file:
 ##   git-for-each-ref --format="%(committerdate)" --sort=-committerdate \
 ##     --count=1 > $GIT_DIR/info/web/last-modifie
 ##
 #agefile=info/web/last-modified
 
 
+## Git detects renames, but with a limit on the number of files to
+## consider. This option can be used to specify another limit (or -1 to
+## use the default limit).
+##
+#renamelimit=-1
+
+
 ## Specify a root for virtual urls. This makes cgit generate urls like
 ##
 ##    http://localhost/git/repo/log/?h=branch
 ##
 ## instead of
 ##
 ##    http://localhost/cgit/cgit.cgi?url=repo/log&h=branch
 ##
 ## For this to work with apache, a rewrite rule must be added to httpd.conf,
 ## possibly looking something like this:
 ##
 ##    RewriteRule ^/git/(.*)$ /cgit/cgit.cgi?url=$1   [L,QSA]
diff --git a/gen-version.sh b/gen-version.sh
index 739c83e..3a08015 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 
 # Get version-info specified in Makefile
 V=$1
 
 # Use `git describe` to get current version if we're inside a git repo
 if test -d .git
 then
-        V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')
+        V=$(git describe --abbrev=4 HEAD 2>/dev/null)
 fi
 
 new="CGIT_VERSION = $V"
 old=$(cat VERSION 2>/dev/null)
 
 # Exit if VERSION is uptodate
 test "$old" = "$new" && exit 0
 
 # Update VERSION with new version-info
 echo "$new" > VERSION
 cat VERSION
diff --git a/shared.c b/shared.c
index 0fe513f..3d4feea 100644
--- a/shared.c
+++ b/shared.c
@@ -29,24 +29,25 @@ char *cgit_repo_group   = NULL;
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
 int cgit_enable_index_links    =  0;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 int cgit_summary_log           =  0;
+int cgit_renamelimit           = -1;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
 int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
 
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
@@ -173,24 +174,26 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 cgit_cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 cgit_max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 cgit_max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 cgit_max_commit_count = atoi(value);
         else if (!strcmp(name, "summary-log"))
                 cgit_summary_log = atoi(value);
         else if (!strcmp(name, "agefile"))
                 cgit_agefile = xstrdup(value);
+        else if (!strcmp(name, "renamelimit"))
+                cgit_renamelimit = atoi(value);
         else if (!strcmp(name, "repo.group"))
                 cgit_repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
                 cgit_repo = add_repo(value);
         else if (!strcmp(name, "repo.name"))
                 cgit_repo->name = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.path"))
                 cgit_repo->path = trim_end(value, '/');
         else if (cgit_repo && !strcmp(name, "repo.desc"))
                 cgit_repo->desc = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.owner"))
                 cgit_repo->owner = xstrdup(value);
@@ -374,41 +377,49 @@ int cgit_diff_files(const unsigned char *old_sha1,
         diff_params.flags = XDF_NEED_MINIMAL;
         emit_params.ctxlen = 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
         emit_params.find_func = NULL;
         emit_cb.outf = filediff_cb;
         emit_cb.priv = fn;
         xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
         return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
-                    filepair_fn fn)
+                    filepair_fn fn, const char *prefix)
 {
         struct diff_options opt;
         int ret;
+        int prefixlen;
 
         diff_setup(&opt);
         opt.output_format = DIFF_FORMAT_CALLBACK;
         opt.detect_rename = 1;
+        opt.rename_limit = cgit_renamelimit;
         opt.recursive = 1;
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
+        if (prefix) {
+                opt.nr_paths = 1;
+                opt.paths = &prefix;
+                prefixlen = strlen(prefix);
+                opt.pathlens = &prefixlen;
+        }
         diff_setup_done(&opt);
 
         if (old_sha1 && !is_null_sha1(old_sha1))
                 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
         else
                 ret = diff_root_tree_sha1(new_sha1, "", &opt);
         diffcore_std(&opt);
         diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 {
         unsigned char *old_sha1 = NULL;
 
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn);
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
 }
diff --git a/ui-commit.c b/ui-commit.c
index 90e09ed..4ac8955 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -66,26 +66,26 @@ void print_fileinfo(struct fileinfo *info)
         } else {
                 html_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'>[");
                 html_filemode(info->old_mode);
                 html("]</span>");
         }
         htmlf("</td><td class='%s'>", class);
-        cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
-                       info->new_path);
+        cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+                       NULL, 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 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);
diff --git a/ui-diff.c b/ui-diff.c
index 0be845f..ac9a3fa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,23 +1,26 @@
 /* ui-diff.c: show diff between two blobs
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
+
 /*
  * print a single line returned from xdiff
  */
 static void print_line(char *line, int len)
 {
         char *class = "ctx";
         char c = line[len-1];
 
         if (line[0] == '+')
                 class = "add";
         else if (line[0] == '-')
                 class = "del";
@@ -58,83 +61,89 @@ static void header(unsigned char *sha1, char *path1, int mode1,
         if (!subproject) {
                 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
                 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
                 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
                 free(abbrev1);
                 free(abbrev2);
                 if (mode1 != 0 && mode2 != 0) {
                         htmlf(" %.6o", mode1);
                         if (mode2 != mode1)
                                 htmlf("..%.6o", mode2);
                 }
                 html("<br/>--- a/");
+                if (mode1 != 0)
+                        cgit_tree_link(path1, NULL, NULL, cgit_query_head,
+                                       sha1_to_hex(old_rev_sha1), path1);
+                else
                 html_txt(path1);
                 html("<br/>+++ b/");
+                if (mode2 != 0)
+                        cgit_tree_link(path2, NULL, NULL, cgit_query_head,
+                                       sha1_to_hex(new_rev_sha1), path2);
+                else
                 html_txt(path2);
         }
         html("</div>");
 }
 
 static void filepair_cb(struct diff_filepair *pair)
 {
         header(pair->one->sha1, pair->one->path, pair->one->mode,
                pair->two->sha1, pair->two->path, pair->two->mode);
         if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
                 if (S_ISGITLINK(pair->one->mode))
                         print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                 if (S_ISGITLINK(pair->two->mode))
                         print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                 return;
         }
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 cgit_print_error("Error running diff");
 }
 
-void cgit_print_diff(const char *new_rev, const char *old_rev)
+void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 {
-        unsigned char sha1[20], sha2[20];
         enum object_type type;
         unsigned long size;
         struct commit *commit, *commit2;
 
         if (!new_rev)
                 new_rev = cgit_query_head;
-        get_sha1(new_rev, sha1);
-        type = sha1_object_info(sha1, &size);
+        get_sha1(new_rev, new_rev_sha1);
+        type = sha1_object_info(new_rev_sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s", new_rev));
                 return;
         }
         if (type != OBJ_COMMIT) {
                 cgit_print_error(fmt("Unhandled object type: %s",
                                      typename(type)));
                 return;
         }
 
-        commit = lookup_commit_reference(sha1);
+        commit = lookup_commit_reference(new_rev_sha1);
         if (!commit || parse_commit(commit))
-                cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
+                cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 
         if (old_rev)
-                get_sha1(old_rev, sha2);
+                get_sha1(old_rev, old_rev_sha1);
         else if (commit->parents && commit->parents->item)
-                hashcpy(sha2, commit->parents->item->object.sha1);
+                hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
         else
-                hashclr(sha2);
+                hashclr(old_rev_sha1);
 
-        if (!is_null_sha1(sha2)) {
-                type = sha1_object_info(sha2, &size);
+        if (!is_null_sha1(old_rev_sha1)) {
+                type = sha1_object_info(old_rev_sha1, &size);
                 if (type == OBJ_BAD) {
-                        cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2)));
+                        cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
                         return;
                 }
-                commit2 = lookup_commit_reference(sha2);
+                commit2 = lookup_commit_reference(old_rev_sha1);
                 if (!commit2 || parse_commit(commit2))
-                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
+                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
         }
-
         html("<table class='diff'>");
         html("<tr><td>");
-        cgit_diff_tree(sha2, sha1, filepair_cb);
+        cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
         html("</td></tr>");
         html("</table>");
 }