Merge branch 'stable'

* stable:
  Skip unknown header fields when parsing tags and commits

diff --git a/cgit.c b/cgit.c
index c86d290bce3477125409b3b75cc0d552618b5589..1b85b1518818e47b2780f87e8a47081c05a38668 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -107,7 +107,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
                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");

diff --git a/cgit.css b/cgit.css
index 65ff5c3a85ee0dc4ec1134a0c1a1fbe099a09197..b8c3d810268e1769182cd040fc21f0969e84af8d 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -272,10 +272,6 @@ table.diffstat {
        background-color: #eee;
 }
 
-table.diffstat tr:hover {
-       background-color: #ccc;
-}
-
 table.diffstat th {
        font-weight: normal;
        text-align: left;
@@ -339,6 +335,10 @@ div.diffstat-summary {
        padding-top: 0.5em;
 }
 
+table.diff {
+       width: 100%;
+}
+
 table.diff td {
        font-family: monospace;
        white-space: pre;
@@ -346,7 +346,8 @@ table.diff td {
 
 table.diff td div.head {
        font-weight: bold;
-       padding-top: 1em;
+       margin-top: 1em;
+       background-color: #eee;
 }
 
 table.diff td div.hunk {

diff --git a/cgit.h b/cgit.h
index e3d9cb875171de19c098e79f8b19231e37aba5b2..e96311fbda39fbc6bd03e52d73349a652a7e5e83 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -170,7 +170,7 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
 
 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);
 
@@ -238,7 +238,7 @@ 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);

diff --git a/cgitrc b/cgitrc
index 34ea116b398a8dfa33d7f780f6fd4159b839b346..796a62c58afa5d435a32d6fcbe809cafe875a35d 100644 (file)
--- a/cgitrc
+++ b/cgitrc
@@ -41,6 +41,13 @@
 #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

diff --git a/gen-version.sh b/gen-version.sh
index 739c83e9956a5b5ef1d821503a349055fc2a5193..3a080157cf4e871d8e4f63d01855d8eeaf36f943 100755 (executable)
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -6,7 +6,7 @@ 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"

diff --git a/shared.c b/shared.c
index 0fe513f4f24efc7796d3627e7743e952e323ed35..3d4feeac2e415db10405f7f81eac3658f1d17b5b 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -38,6 +38,7 @@ 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;
@@ -182,6 +183,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                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"))
@@ -383,17 +386,25 @@ int cgit_diff_files(const unsigned char *old_sha1,
 
 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))
@@ -410,5 +421,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
        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 90e09edb99e3e5df331f22ada90ad7be2391b386..4ac8955379b12f17fbb2c47cd5bea5299353dce2 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,8 +75,8 @@ void print_fileinfo(struct fileinfo *info)
                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",

diff --git a/ui-diff.c b/ui-diff.c
index 0be845fa41241656e936c2cab4704663c61fa66f..ac9a3faf6f97f735777ec8ec554a23e4c67ecac9 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,9 @@
 #include "cgit.h"
 
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
+
 /*
  * print a single line returned from xdiff
  */
@@ -67,9 +70,17 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                                htmlf("..%.6o", mode2);
                }
                html("<br/>--- a/");
-               html_txt(path1);
+               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/");
-               html_txt(path2);
+               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>");
 }
@@ -89,17 +100,16 @@ static void filepair_cb(struct diff_filepair *pair)
                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;
@@ -110,31 +120,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
                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>");
 }