21 files changed, 745 insertions, 88 deletions

diff --git a/Makefile b/Makefile
index 7b9ac5f..0a5055b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ 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
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
+# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
+# implementation (slower).
+#
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
 
@@ -68,7 +71,7 @@ endif
         $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz
 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
@@ -90,6 +93,7 @@ OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
+OBJECTS += ui-ssdiff.o
 OBJECTS += ui-stats.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
@@ -123,6 +127,12 @@ endif
 ifdef NO_STRCASESTR
         CFLAGS += -DNO_STRCASESTR
 endif
+ifdef NO_OPENSSL
+        CFLAGS += -DNO_OPENSSL
+        GIT_OPTIONS += NO_OPENSSL=1
+else
+        EXTLIBS += -lcrypto
+endif
 
 cgit: $(OBJECTS) libgit
         $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
@@ -132,8 +142,8 @@ cgit.o: VERSION
 -include $(OBJECTS:.o=.d)
 
 libgit:
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
 
 test: all
         $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
diff --git a/cgit.c b/cgit.c
index 6c7e811..9305d0a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -60,6 +60,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 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, "max-stats"))
                 repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "module-link"))
@@ -137,6 +139,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 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-tree-linenumbers"))
                 ctx.cfg.enable_tree_linenumbers = atoi(value);
         else if (!strcmp(name, "max-stats"))
@@ -165,6 +169,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 ctx.cfg.max_repodesc_len = atoi(value);
+        else if (!strcmp(name, "max-blob-size"))
+                ctx.cfg.max_blob_size = atoi(value);
         else if (!strcmp(name, "max-repo-count"))
                 ctx.cfg.max_repo_count = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
@@ -182,6 +188,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.summary_branches = atoi(value);
         else if (!strcmp(name, "summary-tags"))
                 ctx.cfg.summary_tags = atoi(value);
+        else if (!strcmp(name, "side-by-side-diffs"))
+                ctx.cfg.ssdiff = atoi(value);
         else if (!strcmp(name, "agefile"))
                 ctx.cfg.agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
@@ -209,6 +217,8 @@ static void querystring_cb(const char *name, const char *value)
         } else if (!strcmp(name, "p")) {
                 ctx.qry.page = xstrdup(value);
         } else if (!strcmp(name, "url")) {
+                if (*value == '/')
+                        value++;
                 ctx.qry.url = xstrdup(value);
                 cgit_parse_url(value);
         } else if (!strcmp(name, "qt")) {
@@ -238,6 +248,8 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.showmsg = atoi(value);
         } else if (!strcmp(name, "period")) {
                 ctx.qry.period = xstrdup(value);
+        } else if (!strcmp(name, "ss")) {
+                ctx.qry.ssdiff = atoi(value);
         }
 }
 
@@ -268,6 +280,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.max_lock_attempts = 5;
         ctx->cfg.max_msg_len = 80;
         ctx->cfg.max_repodesc_len = 80;
+        ctx->cfg.max_blob_size = 0;
         ctx->cfg.max_stats = 0;
         ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
         ctx->cfg.renamelimit = -1;
@@ -279,6 +292,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.summary_branches = 10;
         ctx->cfg.summary_log = 10;
         ctx->cfg.summary_tags = 10;
+        ctx->cfg.ssdiff = 0;
         ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
         ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
         ctx->env.https = xstrdupn(getenv("HTTPS"));
diff --git a/cgit.css b/cgit.css
index c47ebc9..0cb894a 100644
--- a/cgit.css
+++ b/cgit.css
@@ -162,6 +162,11 @@ table.list td a {
         color: black;
 }
 
+table.list td a.ls-dir {
+        font-weight: bold;
+        color: #00f;
+}
+
 table.list td a:hover {
         color: #00f;
 }
@@ -601,3 +606,102 @@ table.hgraph div.bar {
         background-color: #eee;
         height: 1em;
 }
+
+table.ssdiff {
+        width: 100%;
+}
+
+table.ssdiff td {
+        font-size: 75%;
+        font-family: monospace;
+        white-space: pre;
+        padding: 1px 4px 1px 4px;
+        border-left: solid 1px #aaa;
+        border-right: solid 1px #aaa;
+}
+
+table.ssdiff td.add {
+        color: black;
+        background: #cfc;
+        min-width: 50%;
+}
+
+table.ssdiff td.add_dark {
+        color: black;
+        background: #aca;
+        min-width: 50%;
+}
+
+table.ssdiff span.add {
+        background: #cfc;
+        font-weight: bold;
+}
+
+table.ssdiff td.del {
+        color: black;
+        background: #fcc;
+        min-width: 50%;
+}
+
+table.ssdiff td.del_dark {
+        color: black;
+        background: #caa;
+        min-width: 50%;
+}
+
+table.ssdiff span.del {
+        background: #fcc;
+        font-weight: bold;
+}
+
+table.ssdiff td.changed {
+        color: black;
+        background: #ffc;
+        min-width: 50%;
+}
+
+table.ssdiff td.changed_dark {
+        color: black;
+        background: #cca;
+        min-width: 50%;
+}
+
+table.ssdiff td.lineno {
+        color: black;
+        background: #eee;
+        text-align: right;
+        width: 3em;
+        min-width: 3em;
+}
+
+table.ssdiff td.hunk {
+        color: #black;
+        background: #ccf;
+        border-top: solid 1px #aaa;
+        border-bottom: solid 1px #aaa;
+}
+
+table.ssdiff td.head {
+        border-top: solid 1px #aaa;
+        border-bottom: solid 1px #aaa;
+}
+
+table.ssdiff td.head div.head {
+        font-weight: bold;
+        color: black;
+}
+
+table.ssdiff td.foot {
+        border-top: solid 1px #aaa;
+        border-left: none;
+        border-right: none;
+        border-bottom: none;
+}
+
+table.ssdiff td.space {
+        border: none;
+}
+
+table.ssdiff td.space div {
+        min-height: 3em;
+}
\ No newline at end of file
diff --git a/cgit.h b/cgit.h
index 6c6c460..cd4af72 100644
--- a/cgit.h
+++ b/cgit.h
@@ -72,6 +72,7 @@ struct cgit_repo {
         int snapshots;
         int enable_log_filecount;
         int enable_log_linecount;
+        int enable_remote_branches;
         int max_stats;
         time_t mtime;
         struct cgit_filter *about_filter;
@@ -143,6 +144,7 @@ struct cgit_query {
         int nohead;
         char *sort;
         int showmsg;
+        int ssdiff;
 };
 
 struct cgit_config {
@@ -178,6 +180,7 @@ struct cgit_config {
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
+        int enable_remote_branches;
         int enable_tree_linenumbers;
         int local_time;
         int max_repo_count;
@@ -185,6 +188,7 @@ struct cgit_config {
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
+        int max_blob_size;
         int max_stats;
         int nocache;
         int noplainemail;
@@ -194,6 +198,7 @@ struct cgit_config {
         int summary_branches;
         int summary_log;
         int summary_tags;
+        int ssdiff;
         struct string_list mimetypes;
         struct cgit_filter *about_filter;
         struct cgit_filter *commit_filter;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 0c13485..d74d9e7 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -110,6 +110,11 @@ enable-log-linecount::
         and removed lines for each commit on the repository log page. Default
         value: "0".
 
+enable-remote-branches::
+        Flag which, when set to "1", will make cgit display remote branches
+        in the summary and refs views. Default value: "0". See also:
+        "repo.enable-remote-branches".
+
 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".
@@ -177,6 +182,10 @@ max-repodesc-length::
         Specifies the maximum number of repo description characters to display
         on the repository index page. Default value: "80".
 
+max-blob-size::
+        Specifies the maximum size of a blob to display HTML for in KBytes.
+        Default value: "0" (limit disabled).
+
 max-stats::
         Set the default maximum statistics period. Valid values are "week",
         "month", "quarter" and "year". If unspecified, statistics are
@@ -241,6 +250,10 @@ section::
         after this option will inherit the current section name. Default value:
         none.
 
+side-by-side-diffs::
+        If set to "1" shows side-by-side diffs instead of unidiffs per
+        default. Default value: "0".
+
 snapshots::
         Text which specifies the default set of snapshot formats generated by
         cgit. The value is a space-separated list of zero or more of the
@@ -304,6 +317,10 @@ repo.enable-log-linecount::
         A flag which can be used to disable the global setting
         `enable-log-linecount'. Default value: none.
 
+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.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/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 999ad0c..6b1c576 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -3,6 +3,10 @@
 # tree-view by refering to this file with the source-filter or repo.source-
 # filter options in cgitrc.
 #
+# This script requires a shell supporting the ${var##pattern} syntax.
+# It is supported by at least dash and bash, however busybox environments
+# might have to use an external call to sed instead.
+#
 # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
 # highlighting, so you'll probably want something like the following included
 # in your css file (generated by highlight 2.4.8 and adapted for cgit):
@@ -20,20 +24,11 @@
 # table.blob .kwc  { color:#000000; font-weight:bold; }
 # table.blob .kwd  { color:#010181; }
 
-case "$1" in
-        *.c)
-                highlight -f -I -X -S c
-                ;;
-        *.h)
-                highlight -f -I -X -S c
-                ;;
-        *.sh)
-                highlight -f -I -X -S sh
-                ;;
-        *.css)
-                highlight -f -I -X -S css
-                ;;
-        *)
-                highlight -f -I -X -S txt
-                ;;
-esac
+# store filename and extension in local vars
+BASENAME="$1"
+EXTENSION="${BASENAME##*.}"
+
+# map Makefile and Makefile.* to .mk
+[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
+
+exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
diff --git a/git b/git
-Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c
+Subproject e923eaeb901ff056421b9007adcbbce271caa7b
diff --git a/html.c b/html.c
index 66ba65d..337baeb 100644
--- 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("'/>");