Merge branch 'ml/plain-improvements-part1'

diff --git a/Makefile b/Makefile
index d39a30ebb77584fa573537da55eb7915dc547143..0a5055b1a6617abd8382ec283095b355c183e1d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.4.3
+GIT_VER = 1.7.0
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 

diff --git a/cgit.c b/cgit.c
index e46c00a48e9e97f78a38d41b87b1a98f088e941f..6ccf4aaf43bf9ca1b250991a0e5a3cdeb1d95fb4 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -62,6 +62,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
        else if (!strcmp(name, "enable-remote-branches"))
                repo->enable_remote_branches = atoi(value);
+       else if (!strcmp(name, "enable-subject-links"))
+               repo->enable_subject_links = atoi(value);
        else if (!strcmp(name, "max-stats"))
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
@@ -141,6 +143,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_log_linecount = atoi(value);
        else if (!strcmp(name, "enable-remote-branches"))
                ctx.cfg.enable_remote_branches = atoi(value);
+       else if (!strcmp(name, "enable-subject-links"))
+               ctx.cfg.enable_subject_links = atoi(value);
        else if (!strcmp(name, "enable-tree-linenumbers"))
                ctx.cfg.enable_tree_linenumbers = atoi(value);
        else if (!strcmp(name, "max-stats"))
@@ -260,7 +264,7 @@ char *xstrdupn(const char *str)
 
 static void prepare_context(struct cgit_context *ctx)
 {
-       memset(ctx, 0, sizeof(ctx));
+       memset(ctx, 0, sizeof(*ctx));
        ctx->cfg.agefile = "info/web/last-modified";
        ctx->cfg.nocache = 0;
        ctx->cfg.cache_size = 0;

diff --git a/cgit.h b/cgit.h
index cd4af7247b7c00dd9562917d2df94472d2e1317e..9b1e3f8ca7862857a0fa800dc6fda5becbe614c9 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -73,6 +73,7 @@ struct cgit_repo {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -181,6 +182,7 @@ struct cgit_config {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;
        int max_repo_count;

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index d74d9e7eec85582be2548319aa415d5ff97ea7a9..fcd4308d603a89c6823618531da4e76eedb5a7c3 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -115,6 +115,12 @@ enable-remote-branches::
        in the summary and refs views. Default value: "0". See also:
        "repo.enable-remote-branches".
 
+enable-subject-links::
+       Flag which, when set to "1", will make cgit use the subject of the
+       parent commit as link text when generating links to parent commits
+       in commit view. Default value: "0". See also:
+       "repo.enable-subject-links".
+
 enable-tree-linenumbers::
        Flag which, when set to "1", will make cgit generate linenumber links
        for plaintext blobs printed in the tree view. Default value: "1".
@@ -321,6 +327,10 @@ repo.enable-remote-branches::
        Flag which, when set to "1", will make cgit display remote branches
        in the summary and refs views. Default value: <enable-remote-branches>.
 
+repo.enable-subject-links::
+       A flag which can be used to override the global setting
+       `enable-subject-links'. Default value: none.
+
 repo.max-stats::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default

diff --git a/git b/git
index 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4..e923eaeb901ff056421b9007adcbbce271caa7b6 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4
+Subproject commit e923eaeb901ff056421b9007adcbbce271caa7b6

diff --git a/html.c b/html.c
index 66ba65dcf6245d6e7d78ccd3d8ac1f57376fb7d8..337baebea5c8c9540f2b4dcf2ee4895e9e5cdd74 100644 (file)
--- a/html.c
+++ b/html.c
@@ -13,6 +13,32 @@
 #include <string.h>
 #include <errno.h>
 
+/* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */
+static const char* url_escape_table[256] = {
+       "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
+       "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
+       "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
+       "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+       "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
+       "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b",
+       "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85",
+       "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
+       "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99",
+       "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3",
+       "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad",
+       "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
+       "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1",
+       "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb",
+       "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5",
+       "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
+       "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9",
+       "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3",
+       "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd",
+       "%fe", "%ff"
+};
+
 int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
@@ -63,9 +89,9 @@ void html_status(int code, const char *msg, int more_headers)
                html("\n");
 }
 
-void html_txt(char *txt)
+void html_txt(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
@@ -84,9 +110,9 @@ void html_txt(char *txt)
                html(txt);
 }
 
-void html_ntxt(int len, char *txt)
+void html_ntxt(int len, const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t && len--){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
@@ -107,9 +133,9 @@ void html_ntxt(int len, char *txt)
                html("...");
 }
 
-void html_attr(char *txt)
+void html_attr(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='\'' || c=='\"') {
@@ -130,14 +156,15 @@ void html_attr(char *txt)
                html(txt);
 }
 
-void html_url_path(char *txt)
+void html_url_path(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='"' || c=='#' || c=='\'' || c=='?') {
+               const char *e = url_escape_table[c];
+               if (e && c!='+' && c!='&' && c!='+') {
                        write(htmlfd, txt, t - txt);
-                       write(htmlfd, fmt("%%%2x", c), 3);
+                       write(htmlfd, e, 3);
                        txt = t+1;
                }
                t++;
@@ -146,14 +173,15 @@ void html_url_path(char *txt)
                html(txt);
 }
 
-void html_url_arg(char *txt)
+void html_url_arg(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+               const char *e = url_escape_table[c];
+               if (e) {
                        write(htmlfd, txt, t - txt);
-                       write(htmlfd, fmt("%%%2x", c), 3);
+                       write(htmlfd, e, 3);
                        txt = t+1;
                }
                t++;
@@ -162,7 +190,7 @@ void html_url_arg(char *txt)
                html(txt);
 }
 
-void html_hidden(char *name, char *value)
+void html_hidden(const char *name, const char *value)
 {
        html("<input type='hidden' name='");
        html_attr(name);
@@ -171,7 +199,7 @@ void html_hidden(char *name, char *value)
        html("'/>");
 }
 
-void html_option(char *value, char *text, char *selected_value)
+void html_option(const char *value, const char *text, const char *selected_value)
 {
        html("<option value='");
        html_attr(value);
@@ -183,7 +211,7 @@ void html_option(char *value, char *text, char *selected_value)
        html("</option>\n");
 }
 
-void html_link_open(char *url, char *title, char *class)
+void html_link_open(const char *url, const char *title, const char *class)
 {
        html("<a href='");
        html_attr(url);
@@ -257,14 +285,14 @@ char *convert_query_hexchar(char *txt)
        }
 }
 
-int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
+int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
 {
-       char *t, *value = NULL, c;
+       char *t, *txt, *value = NULL, c;
 
-       if (!txt)
+       if (!txt_)
                return 0;
 
-       t = txt = strdup(txt);
+       t = txt = strdup(txt_);
        if (t == NULL) {
                printf("Out of memory\n");
                exit(1);

diff --git a/html.h b/html.h
index a55d4b2d3563d56f6e7a56d5ae70b68cb1496727..16d55ec9a29449f518d6df6ddccc8cd9da55bbd8 100644 (file)
--- a/html.h
+++ b/html.h
@@ -7,18 +7,18 @@ extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_status(int code, const char *msg, int more_headers);
-extern void html_txt(char *txt);
-extern void html_ntxt(int len, char *txt);
-extern void html_attr(char *txt);
-extern void html_url_path(char *txt);
-extern void html_url_arg(char *txt);
-extern void html_hidden(char *name, char *value);
-extern void html_option(char *value, char *text, char *selected_value);
-extern void html_link_open(char *url, char *title, char *class);
+extern void html_txt(const char *txt);
+extern void html_ntxt(int len, const char *txt);
+extern void html_attr(const char *txt);
+extern void html_url_path(const char *txt);
+extern void html_url_arg(const char *txt);
+extern void html_hidden(const char *name, const char *value);
+extern void html_option(const char *value, const char *text, const char *selected_value);
+extern void html_link_open(const char *url, const char *title, const char *class);
 extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
 extern int html_include(const char *filename);
 
-extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
+extern int http_parse_querystring(const char *txt, void (*fn)(const char *name, const char *value));
 
 #endif /* HTML_H */

diff --git a/shared.c b/shared.c
index 5f4679335e0f063cadc57b79953f2c078cff11a3..8b3a0457748a3f3ef30b48c8d1aecffa4a2c6b66 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -60,6 +60,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
+       ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = NULL;
@@ -279,6 +280,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
        if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
            (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
                *binary = 1;
+               if (file1.size)
+                       free(file1.ptr);
+               if (file2.size)
+                       free(file2.ptr);
                return 0;
        }
 
@@ -291,6 +296,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
+       if (file1.size)
+               free(file1.ptr);
+       if (file2.size)
+               free(file2.ptr);
        return 0;
 }
 

diff --git a/ui-commit.c b/ui-commit.c
index b5e3c0159ba78ec080ee3f5cde8d2253c6cd8cbf..41313b9d7d08fb6b5fa17f4d3bfa73db04ba50e2 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -15,10 +15,10 @@
 void cgit_print_commit(char *hex)
 {
        struct commit *commit, *parent;
-       struct commitinfo *info;
+       struct commitinfo *info, *parent_info;
        struct commit_list *p;
        unsigned char sha1[20];
-       char *tmp;
+       char *tmp, *tmp2;
        int parents = 0;
 
        if (!hex)
@@ -82,8 +82,12 @@ void cgit_print_commit(char *hex)
                }
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
-               cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-                                ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
+               tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
+               if (ctx.repo->enable_subject_links) {
+                       parent_info = cgit_parse_commit(parent);
+                       tmp2 = parent_info->subject;
+               }
+               cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                               sha1_to_hex(p->item->object.sha1), NULL, 0);

diff --git a/ui-shared.c b/ui-shared.c
index 08ea003c2da84378189303ebe99c8fe30216dcc3..8827fff4b19ed6b231a09f6870d4c2615deea82a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -246,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
 
        delim = repolink(title, class, page, head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
@@ -363,7 +363,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
-       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
+       if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(new_rev);

diff --git a/ui-tree.c b/ui-tree.c
index 94aff8f5d176df3aa544bb63e4146c19f66a0447..0ee38f289a5a21e5385cd1289aa234c33bab30d6 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -175,6 +175,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath);
+       cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+                       fullpath);
        html("</td></tr>\n");
        free(name);
        return 0;