43 files changed, 2117 insertions, 408 deletions

diff --git a/Makefile b/Makefile
index 304521e..14b4df4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,35 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
+prefix = /usr
+libdir = $(prefix)/lib
+filterdir = $(libdir)/cgit/filters
+docdir = $(prefix)/share/doc/cgit
+htmldir = $(docdir)
+pdfdir = $(docdir)
+mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.3
+GIT_VER = 1.7.4
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
+MAN5_TXT = $(wildcard *.5.txt)
+MAN_TXT  = $(MAN5_TXT)
+DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
+DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
 # 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).
 #
+# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
+# do not support the 'size specifiers' introduced by C99, namely ll, hh,
+# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
+# some C compilers supported these specifiers prior to C99 as an extension.
+#
 
 #-include config.mak
 
@@ -59,7 +79,7 @@ endif
 # Define a pattern rule for automatic dependency building
 #
 %.d: %.c
-        $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+        $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
 
 #
 # Define a pattern rule for silent object building
@@ -68,7 +88,7 @@ endif
         $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread
 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
@@ -90,10 +110,12 @@ 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
 OBJECTS += ui-tree.o
+OBJECTS += vector.o
 
 ifdef NEEDS_LIBICONV
         EXTLIBS += -liconv
@@ -101,7 +123,8 @@ endif
 
 
 .PHONY: all libgit test install uninstall clean force-version get-git \
-        doc man-doc html-doc clean-doc
+        doc clean-doc install-doc install-man install-html install-pdf \
+        uninstall-doc uninstall-man uninstall-html uninstall-pdf
 
 all: cgit
 
@@ -117,23 +140,36 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+GIT_OPTIONS = prefix=/usr
+
 ifdef NO_ICONV
         CFLAGS += -DNO_ICONV
 endif
 ifdef NO_STRCASESTR
         CFLAGS += -DNO_STRCASESTR
 endif
+ifdef NO_C99_FORMAT
+        CFLAGS += -DNO_C99_FORMAT
+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)
 
 cgit.o: VERSION
 
--include $(OBJECTS:.o=.d)
+ifneq "$(MAKECMDGOALS)" "clean"
+  -include $(OBJECTS:.o=.d)
+endif
 
 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
@@ -144,21 +180,58 @@ install: all
         $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
         $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
         $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
+        $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+
+install-doc: install-man install-html install-pdf
+
+install-man: doc-man
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
+        $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
+
+install-html: doc-html
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
+        $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
+
+install-pdf: doc-pdf
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
+        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
         rm -f $(CGIT_DATA_PATH)/cgit.css
         rm -f $(CGIT_DATA_PATH)/cgit.png
 
-doc: man-doc html-doc pdf-doc
+uninstall-doc: uninstall-man uninstall-html uninstall-pdf
+
+uninstall-man:
+        @for i in $(DOC_MAN5); do \
+            rm -fv $(DESTDIR)$(mandir)/man5/$$i; \
+        done
+
+uninstall-html:
+        @for i in $(DOC_HTML); do \
+            rm -fv $(DESTDIR)$(htmldir)/$$i; \
+        done
+
+uninstall-pdf:
+        @for i in $(DOC_PDF); do \
+            rm -fv $(DESTDIR)$(pdfdir)/$$i; \
+        done
+
+doc: doc-man doc-html doc-pdf
+doc-man: doc-man5
+doc-man5: $(DOC_MAN5)
+doc-html: $(DOC_HTML)
+doc-pdf: $(DOC_PDF)
 
-man-doc: cgitrc.5.txt
-        a2x -f manpage cgitrc.5.txt
+%.5 : %.5.txt
+        a2x -f manpage $<
 
-html-doc: cgitrc.5.txt
-        a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+$(DOC_HTML): %.html : %.txt
+        a2x -f xhtml --stylesheet=cgit-doc.css $<
 
-pdf-doc: cgitrc.5.txt
+$(DOC_PDF): %.pdf : %.txt
         a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc
diff --git a/README b/README
index 73ec332..050e21e 100644
--- a/README
+++ b/README
@@ -49,7 +49,7 @@ like this:
 
   <Directory "/var/www/htdocs/cgit/">
       AllowOverride None
-      Options ExecCGI
+      Options +ExecCGI
       Order allow,deny
       Allow from all
   </Directory>
diff --git a/cache.h b/cache.h
index ac9276b..5cfdb4f 100644
--- a/cache.h
+++ b/cache.h
@@ -30,6 +30,7 @@ extern int cache_process(int size, const char *path, const char *key, int ttl,
 extern int cache_ls(const char *path);
 
 /* Print a message to stdout */
+__attribute__((format (printf,1,2)))
 extern void cache_log(const char *format, ...);
 
 extern unsigned long hash_str(const char *str);
diff --git a/cgit.c b/cgit.c
index af9832f..f4dd6ef 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,6 +1,7 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -56,22 +57,29 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->defbranch = xstrdup(value);
         else if (!strcmp(name, "snapshots"))
                 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
+        else if (!strcmp(name, "enable-commit-graph"))
+                repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 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, "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"))
                 repo->module_link= xstrdup(value);
         else if (!strcmp(name, "section"))
                 repo->section = xstrdup(value);
-        else if (!strcmp(name, "readme") && value != NULL) {
-                if (*value == '/')
-                        repo->readme = xstrdup(value);
-                else
-                        repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
-        } else if (ctx.cfg.enable_filter_overrides) {
+        else if (!strcmp(name, "readme") && value != NULL)
+                repo->readme = xstrdup(value);
+        else if (!strcmp(name, "logo") && value != NULL)
+                repo->logo = xstrdup(value);
+        else if (!strcmp(name, "logo-link") && value != NULL)
+                repo->logo_link = xstrdup(value);
+        else if (ctx.cfg.enable_filter_overrides) {
                 if (!strcmp(name, "about-filter"))
                         repo->about_filter = new_filter(value, 0);
                 else if (!strcmp(name, "commit-filter"))
@@ -91,6 +99,8 @@ void config_cb(const char *name, const char *value)
                 ctx.repo->path = trim_end(value, '/');
         else if (ctx.repo && !prefixcmp(name, "repo."))
                 repo_config(ctx.repo, name + 5, value);
+        else if (!strcmp(name, "readme"))
+                ctx.cfg.readme = xstrdup(value);
         else if (!strcmp(name, "root-title"))
                 ctx.cfg.root_title = xstrdup(value);
         else if (!strcmp(name, "root-desc"))
@@ -117,6 +127,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.logo_link = xstrdup(value);
         else if (!strcmp(name, "module-link"))
                 ctx.cfg.module_link = xstrdup(value);
+        else if (!strcmp(name, "strict-export"))
+                ctx.cfg.strict_export = xstrdup(value);
         else if (!strcmp(name, "virtual-root")) {
                 ctx.cfg.virtual_root = trim_end(value, '/');
                 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
@@ -131,12 +143,20 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
         else if (!strcmp(name, "enable-filter-overrides"))
                 ctx.cfg.enable_filter_overrides = atoi(value);
+        else if (!strcmp(name, "enable-gitweb-owner"))
+                ctx.cfg.enable_gitweb_owner = atoi(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
+        else if (!strcmp(name, "enable-commit-graph"))
+                ctx.cfg.enable_commit_graph = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 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-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"))
@@ -144,7 +164,7 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "cache-size"))
                 ctx.cfg.cache_size = atoi(value);
         else if (!strcmp(name, "cache-root"))
-                ctx.cfg.cache_root = xstrdup(value);
+                ctx.cfg.cache_root = xstrdup(expand_macros(value));
         else if (!strcmp(name, "cache-root-ttl"))
                 ctx.cfg.cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
@@ -161,19 +181,32 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.commit_filter = new_filter(value, 0);
         else if (!strcmp(name, "embedded"))
                 ctx.cfg.embedded = atoi(value);
+        else if (!strcmp(name, "max-atom-items"))
+                ctx.cfg.max_atom_items = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 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"))
                 ctx.cfg.max_commit_count = atoi(value);
+        else if (!strcmp(name, "project-list"))
+                ctx.cfg.project_list = xstrdup(expand_macros(value));
         else if (!strcmp(name, "scan-path"))
                 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
-                        process_cached_repolist(value);
+                        process_cached_repolist(expand_macros(value));
+                else if (ctx.cfg.project_list)
+                        scan_projects(expand_macros(value),
+                                      ctx.cfg.project_list, repo_config);
                 else
-                        scan_tree(value, repo_config);
+                        scan_tree(expand_macros(value), repo_config);
+        else if (!strcmp(name, "scan-hidden-path"))
+                ctx.cfg.scan_hidden_path = atoi(value);
+        else if (!strcmp(name, "section-from-path"))
+                ctx.cfg.section_from_path = atoi(value);
         else if (!strcmp(name, "source-filter"))
                 ctx.cfg.source_filter = new_filter(value, 1);
         else if (!strcmp(name, "summary-log"))
@@ -182,10 +215,14 @@ 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"))
                 ctx.cfg.renamelimit = atoi(value);
+        else if (!strcmp(name, "remove-suffix"))
+                ctx.cfg.remove_suffix = atoi(value);
         else if (!strcmp(name, "robots"))
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
@@ -195,7 +232,7 @@ void config_cb(const char *name, const char *value)
         else if (!prefixcmp(name, "mimetype."))
                 add_mimetype(name + 9, value);
         else if (!strcmp(name, "include"))
-                parse_configfile(value, config_cb);
+                parse_configfile(expand_macros(value), config_cb);
 }
 
 static void querystring_cb(const char *name, const char *value)
@@ -209,6 +246,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 +277,14 @@ 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);
+        } else if (!strcmp(name, "all")) {
+                ctx.qry.show_all = atoi(value);
+        } else if (!strcmp(name, "context")) {
+                ctx.qry.context = atoi(value);
+        } else if (!strcmp(name, "ignorews")) {
+                ctx.qry.ignorews = atoi(value);
         }
 }
 
@@ -262,23 +309,30 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.css = "/cgit.css";
         ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
+        ctx->cfg.enable_gitweb_owner = 1;
         ctx->cfg.enable_tree_linenumbers = 1;
         ctx->cfg.max_repo_count = 50;
         ctx->cfg.max_commit_count = 50;
         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.project_list = NULL;
         ctx->cfg.renamelimit = -1;
+        ctx->cfg.remove_suffix = 0;
         ctx->cfg.robots = "index, nofollow";
         ctx->cfg.root_title = "Git repository browser";
         ctx->cfg.root_desc = "a fast webinterface for the git dscm";
+        ctx->cfg.scan_hidden_path = 0;
         ctx->cfg.script_name = CGIT_SCRIPT_NAME;
         ctx->cfg.section = "";
         ctx->cfg.summary_branches = 10;
         ctx->cfg.summary_log = 10;
         ctx->cfg.summary_tags = 10;
+        ctx->cfg.max_atom_items = 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"));
@@ -410,6 +464,12 @@ static void process_request(void *cbdata)
                 return;
         }
 
+        /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
+         * in-project path limit to be made available at ctx->qry.vpath.
+         * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
+         */
+        ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
+
         if (cmd->want_repo && !ctx->repo) {
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
@@ -491,6 +551,8 @@ void print_repo(FILE *f, struct cgit_repo *repo)
                 fprintf(f, "repo.section=%s\n", repo->section);
         if (repo->clone_url)
                 fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
+        fprintf(f, "repo.enable-commit-graph=%d\n",
+                repo->enable_commit_graph);
         fprintf(f, "repo.enable-log-filecount=%d\n",
                 repo->enable_log_filecount);
         fprintf(f, "repo.enable-log-linecount=%d\n",
@@ -541,7 +603,10 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
                 return errno;
         }
         idx = cgit_repolist.count;
-        scan_tree(path, repo_config);
+        if (ctx.cfg.project_list)
+                scan_projects(path, ctx.cfg.project_list, repo_config);
+        else
+                scan_tree(path, repo_config);
         print_repolist(f, &cgit_repolist, idx);
         if (rename(locked_rc, cached_rc))
                 fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
@@ -555,17 +620,25 @@ static void process_cached_repolist(const char *path)
         struct stat st;
         char *cached_rc;
         time_t age;
+        unsigned long hash;
 
-        cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,
-                hash_str(path)));
+        hash = hash_str(path);
+        if (ctx.cfg.project_list)
+                hash += hash_str(ctx.cfg.project_list);
+        cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash));
 
         if (stat(cached_rc, &st)) {
                 /* Nothing is cached, we need to scan without forking. And
                  * if we fail to generate a cached repolist, we need to
                  * invoke scan_tree manually.
                  */
-                if (generate_cached_repolist(path, cached_rc))
-                        scan_tree(path, repo_config);
+                if (generate_cached_repolist(path, cached_rc)) {
+                        if (ctx.cfg.project_list)
+                                scan_projects(path, ctx.cfg.project_list,
+                                              repo_config);
+                        else
+                                scan_tree(path, repo_config);
+                }
                 return;
         }
 
@@ -674,7 +747,7 @@ int main(int argc, const char **argv)
         cgit_repolist.repos = NULL;
 
         cgit_parse_args(argc, argv);
-        parse_configfile(ctx.env.cgit_config, config_cb);
+        parse_configfile(expand_macros(ctx.env.cgit_config), config_cb);
         ctx.repo = NULL;
         http_parse_querystring(ctx.qry.raw, querystring_cb);
 
diff --git a/cgit.css b/cgit.css
index c47ebc9..1d90057 100644
--- a/cgit.css
+++ b/cgit.css
@@ -64,7 +64,7 @@ table#header td.sub {
 }
 
 table.tabs {
-        /* border-bottom: solid 2px #ccc; */
+        border-bottom: solid 3px #ccc;
         border-collapse: collapse;
         margin-top: 2em;
         margin-bottom: 0px;
@@ -102,10 +102,16 @@ table.tabs td.form select {
         font-size: 90%;
 }
 
+div.path {
+        margin: 0px;
+        padding: 5px 2em 2px 2em;
+        color: #000;
+        background-color: #eee;
+}
+
 div.content {
         margin: 0px;
         padding: 2em;
-        border-top: solid 3px #ccc;
         border-bottom: solid 3px #ccc;
 }
 
@@ -147,6 +153,35 @@ table.list td {
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
+table.list td.commitgraph {
+        font-family: monospace;
+        white-space: pre;
+}
+
+table.list td.commitgraph .column1 {
+        color: #a00;
+}
+
+table.list td.commitgraph .column2 {
+        color: #0a0;
+}
+
+table.list td.commitgraph .column3 {
+        color: #aa0;
+}
+
+table.list td.commitgraph .column4 {
+        color: #00a;
+}
+
+table.list td.commitgraph .column5 {
+        color: #a0a;
+}
+
+table.list td.commitgraph .column6 {
+        color: #0aa;
+}
+
 table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
@@ -155,13 +190,18 @@ table.list td.logsubject {
 table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
-        padding: 1em 0.5em 2em 0.5em;
+        padding: 0 0.5em;
 }
 
 table.list td a {
         color: black;
 }
 
+table.list td a.ls-dir {
+        font-weight: bold;
+        color: #00f;
+}
+
 table.list td a:hover {
         color: #00f;
 }
@@ -253,7 +293,7 @@ table.blob pre {
         padding: 0; margin: 0;
 }
 
-table.blob a.no {
+table.blob a.no, table.ssdiff a.no {
         color: gray;
         text-align: right;
         text-decoration: none;
@@ -315,6 +355,24 @@ div.commit-msg {
         font-family: monospace;
 }
 
+div.notes-header {
+        font-weight: bold;
+        padding-top: 1.5em;
+}
+
+div.notes {
+        white-space: pre;
+        font-family: monospace;
+        border: solid 1px #ee9;
+        background-color: #ffd;
+        padding: 0.3em 2em 0.3em 1em;
+        float: left;
+}
+
+div.notes-footer {
+        clear: left;
+}
+
 div.diffstat-header {
         font-weight: bold;
         padding-top: 1.5em;
@@ -520,7 +578,10 @@ a.deco {
         border: solid 1px #770000;
 }
 
-div.commit-subject a {
+div.commit-subject a.branch-deco,
+div.commit-subject a.tag-deco,
+div.commit-subject a.remote-deco,
+div.commit-subject a.deco {
         margin-left: 1em;
         font-size: 75%;
 }
@@ -601,3 +662,116 @@ 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;
+}
+
+/* Syntax highlighting */
+table.blob .num  { color:#2928ff; }
+table.blob .esc  { color:#ff00ff; }
+table.blob .str  { color:#ff0000; }
+table.blob .dstr { color:#818100; }
+table.blob .slc  { color:#838183; font-style:italic; }
+table.blob .com  { color:#838183; font-style:italic; }
+table.blob .dir  { color:#008200; }
+table.blob .sym  { color:#000000; }
+table.blob .kwa  { color:#000000; font-weight:bold; }
+table.blob .kwb  { color:#830000; }
+table.blob .kwc  { color:#000000; font-weight:bold; }
+table.blob .kwd  { color:#010181; }
diff --git a/cgit.h b/cgit.h
index 6c6c460..b5f00fc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -19,6 +19,8 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
+#include <notes.h>
+#include <graph.h>
 
 
 /*
@@ -69,9 +71,14 @@ struct cgit_repo {
         char *readme;
         char *section;
         char *clone_url;
+        char *logo;
+        char *logo_link;
         int snapshots;
+        int enable_commit_graph;
         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;
@@ -143,6 +150,11 @@ struct cgit_query {
         int nohead;
         char *sort;
         int showmsg;
+        int ssdiff;
+        int show_all;
+        int context;
+        int ignorews;
+        char *vpath;
 };
 
 struct cgit_config {
@@ -159,6 +171,8 @@ struct cgit_config {
         char *logo;
         char *logo_link;
         char *module_link;
+        char *project_list;
+        char *readme;
         char *robots;
         char *root_title;
         char *root_desc;
@@ -166,6 +180,7 @@ struct cgit_config {
         char *script_name;
         char *section;
         char *virtual_root;
+        char *strict_export;
         int cache_size;
         int cache_dynamic_ttl;
         int cache_max_create_time;
@@ -175,25 +190,35 @@ struct cgit_config {
         int cache_static_ttl;
         int embedded;
         int enable_filter_overrides;
+        int enable_gitweb_owner;
         int enable_index_links;
+        int enable_commit_graph;
         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_atom_items;
         int max_repo_count;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
+        int max_blob_size;
         int max_stats;
         int nocache;
         int noplainemail;
         int noheader;
         int renamelimit;
+        int remove_suffix;
+        int scan_hidden_path;
+        int section_from_path;
         int snapshots;
         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;
@@ -268,14 +293,17 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            unsigned long *old_size, unsigned long *new_size,
-                           int *binary, linediff_fn fn);
+                           int *binary, int context, int ignorews,
+                           linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
-                           filepair_fn fn, const char *prefix);
+                           filepair_fn fn, const char *prefix, int ignorews);
 
-extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
+extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
+                             const char *prefix);
 
+__attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
@@ -291,4 +319,6 @@ extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
 
+extern char *expand_macros(const char *txt);
+
 #endif /* CGIT_H */
diff --git a/cgit.png b/cgit.png
index d7f70bc..0bdf5a7 100644
--- a/cgit.png
+++ b/cgit.png
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 0c13485..c3698a6 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -90,11 +90,21 @@ embedded::
         Flag which, when set to "1", will make cgit generate a html fragment
         suitable for embedding in other html pages. Default value: none. See
         also: "noheader".
-        
+
+enable-commit-graph::
+        Flag which, when set to "1", will make cgit print an ASCII-art commit
+        history graph to the left of the commit messages in the repository
+        log page. Default value: "0".
+
 enable-filter-overrides::
         Flag which, when set to "1", allows all filter settings to be
         overridden in repository-specific cgitrc files. Default value: none.
 
+enable-gitweb-owner::
+        If set to "1" and scan-path is enabled, we first check each repository
+        for the git config value "gitweb.owner" to determine the owner.
+        Default value: "1". See also: scan-path.
+
 enable-index-links::
         Flag which, when set to "1", will make cgit generate extra links for
         each repo in the repository index (specifically, to the "summary",
@@ -110,6 +120,17 @@ 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-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".
@@ -161,6 +182,10 @@ logo-link::
         calculated url of the repository index page will be used. Default
         value: none.
 
+max-atom-items::
+        Specifies the number of items to display in atom feeds view. Default
+        value: "10".
+
 max-commit-count::
         Specifies the number of entries to list per page in "log" view. Default
         value: "50".
@@ -177,6 +202,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
@@ -205,6 +234,20 @@ noheader::
         Flag which, when set to "1", will make cgit omit the standard header
         on all pages. Default value: none. See also: "embedded".
 
+project-list::
+        A list of subdirectories inside of scan-path, relative to it, that
+        should loaded as git repositories. This must be defined prior to
+        scan-path. Default value: none. See also: scan-path.
+
+readme::
+        Text which will be used as default value for "repo.readme". Default
+        value: none.
+
+remove-suffix::
+        If set to "1" and scan-path is enabled, if any repositories are found
+        with a suffix of ".git", this suffix will be removed for the url and
+        name. Default value: "0". See also: scan-path.
+
 renamelimit::
         Maximum number of files to consider when detecting renames. The value
          "-1" uses the compiletime value in git (for further info, look at
@@ -231,16 +274,37 @@ root-title::
         Text printed as heading on the repository index page. Default value:
         "Git Repository Browser".
 
+scan-hidden-path::
+        If set to "1" and scan-path is enabled, scan-path will recurse into
+        directories whose name starts with a period ('.'). Otherwise,
+        scan-path will stay away from such directories (considered as
+        "hidden"). Note that this does not apply to the ".git" directory in
+        non-bare repos. This must be defined prior to scan-path.
+        Default value: 0. See also: scan-path.
+
 scan-path::
         A path which will be scanned for repositories. If caching is enabled,
         the result will be cached as a cgitrc include-file in the cache
-        directory. Default value: none. See also: cache-scanrc-ttl.
+        directory. If project-list has been defined prior to scan-path,
+        scan-path loads only the directories listed in the file pointed to by
+        project-list. Default value: none. See also: cache-scanrc-ttl,
+        project-list.
 
 section::
         The name of the current repository section - all repositories defined
         after this option will inherit the current section name. Default value:
         none.
 
+section-from-path::
+        A number which, if specified before scan-path, specifies how many
+        path elements from each repo path to use as a default section name.
+        If negative, cgit will discard the specified number of path elements
+        above the repo directory. Default value: 0.
+
+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
@@ -266,6 +330,13 @@ summary-tags::
         Specifies the number of tags to display in the repository "summary"
         view. Default value: "10".
 
+strict-export::
+        Filename which, if specified, needs to be present within the repository
+        for cgit to allow access to that repository. This can be used to emulate
+        gitweb's EXPORT_OK and STRICT_EXPORT functionality and limit cgit's
+        repositories to match those exported by git-daemon. This option MUST come
+        before 'scan-path'.
+
 virtual-root::
         Url which, if specified, will be used as root for all cgit links. It
         will also cause cgit to generate 'virtual urls', i.e. urls like
@@ -296,6 +367,10 @@ repo.defbranch::
 repo.desc::
         The value to show as repository description. Default value: none.
 
+repo.enable-commit-graph::
+        A flag which can be used to disable the global setting
+        `enable-commit-graph'. Default value: none.
+
 repo.enable-log-filecount::
         A flag which can be used to disable the global setting
         `enable-log-filecount'. Default value: none.
@@ -304,6 +379,23 @@ 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.enable-subject-links::
+        A flag which can be used to override the global setting
+        `enable-subject-links'. Default value: none.
+
+repo.logo::
+        Url which specifies the source of an image which will be used as a logo
+        on this repo's pages. Default value: global logo.
+
+repo.logo-link::
+        Url loaded when clicking on the cgit logo image. If unspecified the
+        calculated url of the repository index page will be used. Default
+        value: global logo-link.
+
 repo.max-stats::
         Override the default maximum statistics period. Valid values are equal
         to the values specified for the global "max-stats" setting. Default
@@ -322,7 +414,9 @@ repo.path::
 
 repo.readme::
         A path (relative to <repo.path>) which specifies a file to include
-        verbatim as the "About" page for this repo. Default value: none.
+        verbatim as the "About" page for this repo. You may also specify a
+        git refspec by head or by hash by prepending the refspec followed by
+        a colon. For example, "master:docs/readme.mkd" Default value: <readme>.
 
 repo.snapshots::
         A mask of allowed snapshot-formats for this repo, restricted by the
@@ -363,7 +457,7 @@ cache-size=1000
 
 
 # Specify some default clone prefixes
-clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
+clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
 
 # Specify the css url
 css=/css/cgit.css
@@ -373,6 +467,10 @@ css=/css/cgit.css
 enable-index-links=1
 
 
+# Enable ASCII art commit history graph on the log pages
+enable-commit-graph=1
+
+
 # Show number of affected files per commit on the log pages
 enable-log-filecount=1
 
@@ -394,14 +492,14 @@ max-stats=quarter
 
 
 # Set the title and heading of the repository index page
-root-title=foobar.com git repositories
+root-title=example.com git repositories
 
 
 # Set a subheading for the repository index page
 root-desc=tracking the foobar development
 
 
-# Include some more info about foobar.com on the index page
+# Include some more info about example.com on the index page
 root-readme=/var/www/htdocs/about.html
 
 
@@ -413,7 +511,7 @@ snapshots=tar.gz tar.bz2 zip
 ## List of common mimetypes
 ##
 
-mimetype.git=image/git
+mimetype.gif=image/gif
 mimetype.html=text/html
 mimetype.jpg=image/jpeg
 mimetype.jpeg=image/jpeg
@@ -435,14 +533,14 @@ mimetype.svg=image/svg+xml
 repo.url=foo
 repo.path=/pub/git/foo.git
 repo.desc=the master foo repository
-repo.owner=fooman@foobar.com
+repo.owner=fooman@example.com
 repo.readme=info/web/about.html
 
 
 repo.url=bar
 repo.path=/pub/git/bar.git
 repo.desc=the bars for your foo
-repo.owner=barman@foobar.com
+repo.owner=barman@example.com
 repo.readme=info/web/about.html
 
 
@@ -499,3 +597,4 @@ will generate the following html element:
 AUTHOR
 ------
 Lars Hjemli <hjemli@gmail.com>
+Jason A. Donenfeld <Jason@zx2c4.com>
diff --git a/cmd.c b/cmd.c
index 766f903..536515b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -33,7 +33,7 @@ static void HEAD_fn(struct cgit_context *ctx)
 
 static void atom_fn(struct cgit_context *ctx)
 {
-        cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
+        cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items);
 }
 
 static void about_fn(struct cgit_context *ctx)
@@ -51,7 +51,7 @@ static void blob_fn(struct cgit_context *ctx)
 
 static void commit_fn(struct cgit_context *ctx)
 {
-        cgit_print_commit(ctx->qry.sha1);
+        cgit_print_commit(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void diff_fn(struct cgit_context *ctx)
@@ -67,7 +67,8 @@ static void info_fn(struct cgit_context *ctx)
 static void log_fn(struct cgit_context *ctx)
 {
         cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
-                       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
+                       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1,
+                       ctx->repo->enable_commit_graph);
 }
 
 static void ls_cache_fn(struct cgit_context *ctx)
@@ -90,7 +91,7 @@ static void repolist_fn(struct cgit_context *ctx)
 
 static void patch_fn(struct cgit_context *ctx)
 {
-        cgit_print_patch(ctx->qry.sha1);
+        cgit_print_patch(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void plain_fn(struct cgit_context *ctx)
@@ -129,31 +130,31 @@ static void tree_fn(struct cgit_context *ctx)
         cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout) \
-        {#name, name##_fn, want_repo, want_layout}
+#define def_cmd(name, want_repo, want_layout, want_vpath) \
+        {#name, name##_fn, want_repo, want_layout, want_vpath}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
         static struct cgit_cmd cmds[] = {
-                def_cmd(HEAD, 1, 0),
-                def_cmd(atom, 1, 0),
-                def_cmd(about, 0, 1),
-                def_cmd(blob, 1, 0),
-                def_cmd(commit, 1, 1),
-                def_cmd(diff, 1, 1),
-                def_cmd(info, 1, 0),
-                def_cmd(log, 1, 1),
-                def_cmd(ls_cache, 0, 0),
-                def_cmd(objects, 1, 0),
-                def_cmd(patch, 1, 0),
-                def_cmd(plain, 1, 0),
-                def_cmd(refs, 1, 1),
-                def_cmd(repolist, 0, 0),
-                def_cmd(snapshot, 1, 0),
-                def_cmd(stats, 1, 1),
-                def_cmd(summary, 1, 1),
-                def_cmd(tag, 1, 1),
-                def_cmd(tree, 1, 1),
+                def_cmd(HEAD, 1, 0, 0),
+                def_cmd(atom, 1, 0, 0),
+                def_cmd(about, 0, 1, 0),
+                def_cmd(blob, 1, 0, 0),
+                def_cmd(commit, 1, 1, 1),
+                def_cmd(diff, 1, 1, 1),
+                def_cmd(info, 1, 0, 0),
+                def_cmd(log, 1, 1, 1),
+                def_cmd(ls_cache, 0, 0, 0),
+                def_cmd(objects, 1, 0, 0),
+                def_cmd(patch, 1, 0, 1),
+                def_cmd(plain, 1, 0, 0),
+                def_cmd(refs, 1, 1, 0),
+                def_cmd(repolist, 0, 0, 0),
+                def_cmd(snapshot, 1, 0, 0),
+                def_cmd(stats, 1, 1, 1),
+                def_cmd(summary, 1, 1, 0),
+                def_cmd(tag, 1, 1, 0),
+                def_cmd(tree, 1, 1, 1),
         };
         int i;
 
diff --git a/cmd.h b/cmd.h
index ec9e691..8dc01bd 100644
--- a/cmd.h
+++ b/cmd.h
@@ -7,7 +7,8 @@ struct cgit_cmd {
         const char *name;
         cgit_cmd_fn fn;
         unsigned int want_repo:1,
-                want_layout:1;
+                want_layout:1,
+                want_vpath:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
index 165a533..110c609 100755
--- a/filters/commit-links.sh
+++ b/filters/commit-links.sh
@@ -1,12 +1,14 @@
 #!/bin/sh
-# This script can be used to generate links in commit messages - the first
-# sed expression generates links to commits referenced by their SHA1, while
-# the second expression generates links to a fictional bugtracker.
+# This script can be used to generate links in commit messages.
 #
 # To use this script, refer to this file with either the commit-filter or the
 # repo.commit-filter options in cgitrc.
 
-sed -re '
-s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g
-s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g
-'
+# This expression generates links to commits referenced by their SHA1.
+regex=$regex'
+s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g'
+# This expression generates links to a fictional bugtracker.
+regex=$regex'
+s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g'
+
+sed -re "$regex"
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 87b50542a08ac6caa083ddc376e674424e37940
+Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f
diff --git a/html.c b/html.c
index 5336596..a60bc13 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", "+", 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,13 +89,13 @@ 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=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (c=='<')
@@ -84,13 +110,13 @@ 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=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (c=='<')
@@ -102,18 +128,18 @@ void html_ntxt(int len, char *txt)
                 t++;
         }
         if (t!=txt)
-                write(htmlfd, txt, t - txt);
+                html_raw(txt, t - txt);
         if (len<0)
                 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=='\"') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (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=='?') {
-                        write(htmlfd, txt, t - txt);
-                        write(htmlfd, fmt("%%%2x", c), 3);
+                const char *e = url_escape_table[c];
+                if (e && c!='+' && c!='&' && c!='+') {
+                        html_raw(txt, t - txt);
+                        html_raw(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=='?') {
-                        write(htmlfd, txt, t - txt);
-                        write(htmlfd, fmt("%%%2x", c), 3);
+                const char *e = url_escape_table[c];
+                if (e) {
+                        html_raw(txt, t - txt);
+                        html_raw(e, strlen(e));
                         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);
@@ -221,7 +249,7 @@ int html_include(const char *filename)
                 return -1;
         }
         while((len = fread(buf, 1, 4096, f)) > 0)
-                write(htmlfd, buf, len);
+                html_raw(buf, len);
         fclose(f);
         return 0;
 }
@@ -258,14 +286,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 a55d4b2..1135fb8 100644
--- a/html.h
+++ b/html.h
@@ -5,20 +5,23 @@ extern int htmlfd;
 
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
+
+__attribute__((format (printf,1,2)))
 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/scan-tree.c b/scan-tree.c
index ebfd41e..627af1b 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,3 +1,12 @@
+/* scan-tree.c
+ * 
+ * Copyright (C) 2008-2009 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
 #include "cgit.h"
 #include "configfile.h"
 #include "html.h"
@@ -38,17 +47,33 @@ static int is_git_dir(const char *path)
 
 struct cgit_repo *repo;
 repo_config_fn config_fn;
+char *owner;
 
 static void repo_config(const char *name, const char *value)
 {
         config_fn(repo, name, value);
 }
 
+static int git_owner_config(const char *key, const char *value, void *cb)
+{
+        if (!strcmp(key, "gitweb.owner"))
+                owner = xstrdup(value);
+        return 0;
+}
+
+static char *xstrrchr(char *s, char *from, int c)
+{
+        while (from >= s && *from != c)
+                from--;
+        return from < s ? NULL : from;
+}
+
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
         struct stat st;
         struct passwd *pwd;
-        char *p;
+        char *rel, *p, *slash;
+        int n;
         size_t size;
 
         if (stat(path, &st)) {
@@ -56,34 +81,74 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                         path, strerror(errno), errno);
                 return;
         }
-        if ((pwd = getpwuid(st.st_uid)) == NULL) {
-                fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
-                        path, strerror(errno), errno);
+
+        if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st))
                 return;
-        }
+
+        if (!stat(fmt("%s/noweb", path), &st))
+                return;
+
+        owner = NULL;
+        if (ctx.cfg.enable_gitweb_owner)
+                git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
         if (base == path)
-                p = fmt("%s", path);
+                rel = xstrdup(fmt("%s", path));
         else
-                p = fmt("%s", path + strlen(base) + 1);
+                rel = xstrdup(fmt("%s", path + strlen(base) + 1));
 
-        if (!strcmp(p + strlen(p) - 5, "/.git"))
-                p[strlen(p) - 5] = '\0';
+        if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+                rel[strlen(rel) - 5] = '\0';
 
-        repo = cgit_add_repo(xstrdup(p));
+        repo = cgit_add_repo(rel);
+        if (ctx.cfg.remove_suffix)
+                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
+                        *p = '\0';
         repo->name = repo->url;
         repo->path = xstrdup(path);
-        p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL;
-        if (p)
-                *p = '\0';
-        repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : "");
+        while (!owner) {
+                if ((pwd = getpwuid(st.st_uid)) == NULL) {
+                        fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
+                                path, strerror(errno), errno);
+                        break;
+                }
+                if (pwd->pw_gecos)
+                        if ((p = strchr(pwd->pw_gecos, ',')))
+                                *p = '\0';
+                owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
+        }
+        repo->owner = owner;
 
         p = fmt("%s/description", path);
         if (!stat(p, &st))
                 readfile(p, &repo->desc, &size);
 
-        p = fmt("%s/README.html", path);
-        if (!stat(p, &st))
-                repo->readme = xstrdup(p);
+        if (!repo->readme) {
+                p = fmt("%s/README.html", path);
+                if (!stat(p, &st))
+                        repo->readme = "README.html";
+        }
+        if (ctx.cfg.section_from_path) {
+                n  = ctx.cfg.section_from_path;
+                if (n > 0) {
+                        slash = rel;
+                        while (slash && n && (slash = strchr(slash, '/')))
+                                n--;
+                } else {
+                        slash = rel + strlen(rel);
+                        while (slash && n && (slash = xstrrchr(rel, slash, '/')))
+                                n++;
+                }
+                if (slash && !n) {
+                        *slash = '\0';
+                        repo->section = xstrdup(rel);
+                        *slash = '/';
+                        if (!prefixcmp(repo->name, repo->section)) {
+                                repo->name += strlen(repo->section);
+                                if (*repo->name == '/')
+                                        repo->name++;
+                        }
+                }
+        }
 
         p = fmt("%s/cgitrc", path);
         if (!stat(p, &st)) {
@@ -94,24 +159,23 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
-        DIR *dir;
+        DIR *dir = opendir(path);
         struct dirent *ent;
         char *buf;
         struct stat st;
 
+        if (!dir) {
+                fprintf(stderr, "Error opening directory %s: %s (%d)\n",
+                        path, strerror(errno), errno);
+                return;
+        }
         if (is_git_dir(path)) {
                 add_repo(base, path, fn);
-                return;
+                goto end;
         }
         if (is_git_dir(fmt("%s/.git", path))) {
                 add_repo(base, fmt("%s/.git", path), fn);
-                return;
-        }
-        dir = opendir(path);
-        if (!dir) {
-                fprintf(stderr, "Error opening directory %s: %s (%d)\n",
-                        path, strerror(errno), errno);
-                return;
+                goto end;
         }
         while((ent = readdir(dir)) != NULL) {
                 if (ent->d_name[0] == '.') {
@@ -119,6 +183,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                                 continue;
                         if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                 continue;
+                        if (!ctx.cfg.scan_hidden_path)
+                                continue;
                 }
                 buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                 if (!buf) {
@@ -137,9 +203,38 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                         scan_path(base, buf, fn);
                 free(buf);
         }
+end:
         closedir(dir);
 }
 
+#define lastc(s) s[strlen(s) - 1]
+
+void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)
+{
+        char line[MAX_PATH * 2], *z;
+        FILE *projects;
+        int err;
+        
+        projects = fopen(projectsfile, "r");
+        if (!projects) {
+                fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",
+                        projectsfile, strerror(errno), errno);
+        }
+        while (fgets(line, sizeof(line), projects) != NULL) {
+                for (z = &lastc(line);
+                     strlen(line) && strchr("\n\r", *z);
+                     z = &lastc(line))
+                        *z = '\0';
+                if (strlen(line))
+                        scan_path(path, fmt("%s/%s", path, line), fn);
+        }
+        if ((err = ferror(projects))) {
+                fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n",
+                        projectsfile, strerror(err), err);
+        }
+        fclose(projects);
+}
+
 void scan_tree(const char *path, repo_config_fn fn)
 {
         scan_path(path, path, fn);
diff --git a/scan-tree.h b/scan-tree.h
index 11539f4..1afbd4b 100644
--- a/scan-tree.h
+++ b/scan-tree.h
@@ -1,3 +1,2 @@
-
-
+extern void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn);
 extern void scan_tree(const char *path, repo_config_fn fn);
diff --git a/shared.c b/shared.c
index 6adf2b6..7ec2e19 100644
--- a/shared.c
+++ b/shared.c
@@ -10,7 +10,6 @@
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
-int cgit_cmd;
 
 int chk_zero(int result, char *msg)
 {
@@ -57,11 +56,14 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->section = ctx.cfg.section;
         ret->defbranch = "master";
         ret->snapshots = ctx.cfg.snapshots;
+        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
         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;
+        ret->readme = ctx.cfg.readme;
         ret->mtime = -1;
         ret->about_filter = ctx.cfg.about_filter;
         ret->commit_filter = ctx.cfg.commit_filter;
@@ -262,7 +264,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 
 int cgit_diff_files(const unsigned char *old_sha1,
                     const unsigned char *new_sha1, unsigned long *old_size,
-                    unsigned long *new_size, int *binary, linediff_fn fn)
+                    unsigned long *new_size, int *binary, int context,
+                    int ignorews, linediff_fn fn)
 {
         mmfile_t file1, file2;
         xpparam_t diff_params;
@@ -289,7 +292,9 @@ int cgit_diff_files(const unsigned char *old_sha1,
         memset(&emit_params, 0, sizeof(emit_params));
         memset(&emit_cb, 0, sizeof(emit_cb));
         diff_params.flags = XDF_NEED_MINIMAL;
-        emit_params.ctxlen = 3;
+        if (ignorews)
+                diff_params.flags |= XDF_IGNORE_WHITESPACE;
+        emit_params.ctxlen = context > 0 ? context : 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
         emit_cb.outf = filediff_cb;
         emit_cb.priv = fn;
@@ -303,7 +308,7 @@ 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, const char *prefix)
+                    filepair_fn fn, const char *prefix, int ignorews)
 {
         struct diff_options opt;
         int ret;
@@ -314,6 +319,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
         opt.detect_rename = 1;
         opt.rename_limit = ctx.cfg.renamelimit;
         DIFF_OPT_SET(&opt, RECURSIVE);
+        if (ignorews)
+                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
         if (prefix) {
@@ -332,13 +339,14 @@ void cgit_diff_tree(const unsigned char *old_sha1,
         diff_flush(&opt);
 }
 
-void cgit_diff_commit(struct commit *commit, filepair_fn fn)
+void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {
         unsigned char *old_sha1 = NULL;
 
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+                       ctx.qry.ignorews);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
@@ -430,3 +438,74 @@ int readfile(const char *path, char **buf, size_t *size)
         close(fd);
         return (*size == st.st_size ? 0 : e);
 }
+
+int is_token_char(char c)
+{
+        return isalnum(c) || c == '_';
+}
+
+/* Replace name with getenv(name), return pointer to zero-terminating char
+ */
+char *expand_macro(char *name, int maxlength)
+{
+        char *value;
+        int len;
+
+        len = 0;
+        value = getenv(name);
+        if (value) {
+                len = strlen(value);
+                if (len > maxlength)
+                        len = maxlength;
+                strncpy(name, value, len);
+        }
+        return name + len;
+}
+
+#define EXPBUFSIZE (1024 * 8)
+
+/* Replace all tokens prefixed by '$' in the specified text with the
+ * value of the named environment variable.
+ * NB: the return value is a static buffer, i.e. it must be strdup'd
+ * by the caller.
+ */
+char *expand_macros(const char *txt)
+{
+        static char result[EXPBUFSIZE];
+        char *p, *start;
+        int len;
+
+        p = result;
+        start = NULL;
+        while (p < result + EXPBUFSIZE - 1 && txt && *txt) {
+                *p = *txt;
+                if (start) {
+                        if (!is_token_char(*txt)) {
+                                if (p - start > 0) {
+                                        *p = '\0';
+                                        len = result + EXPBUFSIZE - start - 1;
+                                        p = expand_macro(start, len) - 1;
+                                }
+                                start = NULL;
+                                txt--;
+                        }
+                        p++;
+                        txt++;
+                        continue;
+                }
+                if (*txt == '$') {
+                        start = p;
+                        txt++;
+                        continue;
+                }
+                p++;
+                txt++;
+        }
+        *p = '\0';
+        if (start && p - start > 0) {
+                len = result + EXPBUFSIZE - start - 1;
+                p = expand_macro(start, len);
+                *p = '\0';
+        }
+        return result;
+}
diff --git a/ui-atom.c b/ui-atom.c
index 881872c..b218456 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -24,7 +24,7 @@ void add_entry(struct commit *commit, char *host)
         html_txt(info->subject);
         html("</title>\n");
         html("<updated>");
-        cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
+        cgit_print_date(info->committer_date, FMT_ATOMDATE, 0);
         html("</updated>\n");
         html("<author>\n");
         if (info->author) {
@@ -85,7 +85,9 @@ void cgit_print_atom(char *tip, char *path, int max_count)
         struct rev_info rev;
         int argc = 2;
 
-        if (!tip)
+        if (ctx.qry.show_all)
+                argv[1] = "--all";
+        else if (!tip)
                 argv[1] = ctx.qry.head;
 
         if (path) {
@@ -109,6 +111,14 @@ void cgit_print_atom(char *tip, char *path, int max_count)
         html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
         html("<title>");
         html_txt(ctx.repo->name);
+        if (path) {
+                html("/");
+                html_txt(path);
+        }
+        if (tip && !ctx.qry.show_all) {
+                html(", branch ");
+                html_txt(tip);
+        }
         html("</title>\n");
         html("<subtitle>");
         html_txt(ctx.repo->desc);
diff --git a/ui-blob.c b/ui-blob.c
index 89330ce..ec435e1 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,6 +1,7 @@
 /* ui-blob.c: show blob content
  *
  * Copyright (C) 2008 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -12,6 +13,7 @@
 
 static char *match_path;
 static unsigned char *matched_sha1;
+static int found_path;
 
 static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
         const char *pathname, unsigned mode, int stage, void *cbdata) {
@@ -19,12 +21,43 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
                 || strcmp(match_path+baselen,pathname) )
                 return READ_TREE_RECURSIVE;
         memmove(matched_sha1,sha1,20);
+        found_path = 1;
         return 0;
 }
 
-void cgit_print_blob(const char *hex, char *path, const char *head)
+int cgit_print_file(char *path, const char *head)
 {
+        unsigned char sha1[20];
+        enum object_type type;
+        char *buf;
+        unsigned long size;
+        struct commit *commit;
+        const char *paths[] = {path, NULL};
+        if (get_sha1(head, sha1))
+                return -1;
+        type = sha1_object_info(sha1, &size);
+        if(type == OBJ_COMMIT && path) {
+                commit = lookup_commit_reference(sha1);
+                match_path = path;
+                matched_sha1 = sha1;
+                found_path = 0;
+                read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+                if (!found_path)
+                        return -1;
+                type = sha1_object_info(sha1, &size);
+        }
+        if (type == OBJ_BAD)
+                return -1;
+        buf = read_sha1_file(sha1, &type, &size);
+        if (!buf)
+                return -1;
+        buf[size] = '\0';
+        html_raw(buf, size);
+        return 0;
+}
 
+void cgit_print_blob(const char *hex, char *path, const char *head)
+{
         unsigned char sha1[20];
         enum object_type type;
         char *buf;
@@ -75,5 +108,5 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
         }
         ctx.page.filename = path;
         cgit_print_http_headers(&ctx);
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
 }
diff --git a/ui-blob.h b/ui-blob.h
index dad275a..d7e7d45 100644
--- a/ui-blob.h
+++ b/ui-blob.h
@@ -1,6 +1,7 @@
 #ifndef UI_BLOB_H
 #define UI_BLOB_H
 
+extern int cgit_print_file(char *path, const char *head);
 extern void cgit_print_blob(const char *hex, char *path, const char *head);
 
 #endif /* UI_BLOB_H */
diff --git a/ui-commit.c b/ui-commit.c
index f5b0ae5..2b4f677 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -12,13 +12,14 @@
 #include "ui-diff.h"
 #include "ui-log.h"
 
-void cgit_print_commit(char *hex)
+void cgit_print_commit(char *hex, const char *prefix)
 {
         struct commit *commit, *parent;
-        struct commitinfo *info;
+        struct commitinfo *info, *parent_info;
         struct commit_list *p;
+        struct strbuf notes = STRBUF_INIT;
         unsigned char sha1[20];
-        char *tmp;
+        char *tmp, *tmp2;
         int parents = 0;
 
         if (!hex)
@@ -35,6 +36,8 @@ void cgit_print_commit(char *hex)
         }
         info = cgit_parse_commit(commit);
 
+        format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
+
         load_ref_decorations(DECORATE_FULL_REFS);
 
         html("<table summary='commit info' class='commit-info'>\n");
@@ -58,14 +61,23 @@ void cgit_print_commit(char *hex)
         html("</td></tr>\n");
         html("<tr><th>commit</th><td colspan='2' class='sha1'>");
         tmp = sha1_to_hex(commit->object.sha1);
-        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
         html(" (");
-        cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+        cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
+        html(") (");
+        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+                cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
+        else
+                cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
         html(")</td></tr>\n");
         html("<tr><th>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
+        if (prefix) {
+                html(" /");
+                cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
+        }
         html("</td></tr>\n");
         for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
@@ -77,11 +89,15 @@ 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));
+                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, prefix, 0);
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-                               sha1_to_hex(p->item->object.sha1), NULL);
+                               sha1_to_hex(p->item->object.sha1), prefix, 0);
                 html(")</td></tr>");
                 parents++;
         }
@@ -107,12 +123,24 @@ void cgit_print_commit(char *hex)
         if (ctx.repo->commit_filter)
                 cgit_close_filter(ctx.repo->commit_filter);
         html("</div>");
+        if (notes.len != 0) {
+                html("<div class='notes-header'>Notes</div>");
+                html("<div class='notes'>");
+                if (ctx.repo->commit_filter)
+                        cgit_open_filter(ctx.repo->commit_filter);
+                html_txt(notes.buf);
+                if (ctx.repo->commit_filter)
+                        cgit_close_filter(ctx.repo->commit_filter);
+                html("</div>");
+                html("<div class='notes-footer'></div>");
+        }
         if (parents < 3) {
                 if (parents)
                         tmp = sha1_to_hex(commit->parents->item->object.sha1);
                 else
                         tmp = NULL;
-                cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+                cgit_print_diff(ctx.qry.sha1, tmp, prefix);
         }
+        strbuf_release(&notes);
         cgit_free_commitinfo(info);
 }
diff --git a/ui-commit.h b/ui-commit.h
index 40bcb31..8198b4b 100644
--- a/ui-commit.h
+++ b/ui-commit.h
@@ -1,6 +1,6 @@
 #ifndef UI_COMMIT_H
 #define UI_COMMIT_H
 
-extern void cgit_print_commit(char *hex);
+extern void cgit_print_commit(char *hex, const char *prefix);
 
 #endif /* UI_COMMIT_H */
diff --git a/ui-diff.c b/ui-diff.c
index 2196745..a53425d 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-ssdiff.h"
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
@@ -32,6 +33,18 @@ static struct fileinfo {
         int binary:1;
 } *items;
 
+static int use_ssdiff = 0;
+static struct diff_filepair *current_filepair;
+
+struct diff_filespec *cgit_get_current_old_file(void)
+{
+        return current_filepair->one;
+}
+
+struct diff_filespec *cgit_get_current_new_file(void)
+{
+        return current_filepair->two;
+}
 
 static void print_fileinfo(struct fileinfo *info)
 {
@@ -83,14 +96,14 @@ static void print_fileinfo(struct fileinfo *info)
         }
         htmlf("</td><td class='%s'>", class);
         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, info->new_path);
+                       ctx.qry.sha2, info->new_path, 0);
         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'>");
         if (info->binary) {
-                htmlf("bin</td><td class='graph'>%d -> %d bytes",
+                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
                       info->old_size, info->new_size);
                 return;
         }
@@ -125,7 +138,7 @@ static void inspect_filepair(struct diff_filepair *pair)
         lines_added = 0;
         lines_removed = 0;
         cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
-                        &binary, count_diff_lines);
+                        &binary, 0, ctx.qry.ignorews, count_diff_lines);
         if (files >= slots) {
                 if (slots == 0)
                         slots = 4;
@@ -152,17 +165,33 @@ static void inspect_filepair(struct diff_filepair *pair)
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
-                         const unsigned char *new_sha1)
+                         const unsigned char *new_sha1, const char *prefix)
 {
-        int i;
+        int i, save_context = ctx.qry.context;
 
         html("<div class='diffstat-header'>");
         cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, NULL);
+                       ctx.qry.sha2, NULL, 0);
+        if (prefix)
+                htmlf(" (limited to '%s')", prefix);
+        html(" (");
+        ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+        cgit_self_link("more", NULL, NULL, &ctx);
+        html("/");
+        ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
+        cgit_self_link("less", NULL, NULL, &ctx);
+        ctx.qry.context = save_context;
+        html(" context)");
+        html(" (");
+        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+        cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
+        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+        html(" whitespace changes)");
         html("</div>");
         html("<table summary='diffstat' class='diffstat'>");
         max_changes = 0;
-        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
+        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+                       ctx.qry.ignorews);
         for(i = 0; i<files; i++)
                 print_fileinfo(&items[i]);
         html("</table>");
@@ -246,26 +275,56 @@ static void header(unsigned char *sha1, char *path1, int mode1,
         html("</div>");
 }
 
+static void print_ssdiff_link()
+{
+        if (!strcmp(ctx.qry.page, "diff")) {
+                if (use_ssdiff)
+                        cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
+                                       ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
+                else
+                        cgit_diff_link("Side-by-side diff", NULL, NULL,
+                                       ctx.qry.head, ctx.qry.sha1,
+                                       ctx.qry.sha2, ctx.qry.path, 1);
+        }
+}
+
 static void filepair_cb(struct diff_filepair *pair)
 {
         unsigned long old_size = 0;
         unsigned long new_size = 0;
         int binary = 0;
+        linediff_fn print_line_fn = print_line;
 
+        current_filepair = pair;
+        if (use_ssdiff) {
+                cgit_ssdiff_header_begin();
+                print_line_fn = cgit_ssdiff_line_cb;
+        }
         header(pair->one->sha1, pair->one->path, pair->one->mode,
                pair->two->sha1, pair->two->path, pair->two->mode);
+        if (use_ssdiff)
+                cgit_ssdiff_header_end();
         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);
+                        print_line_fn(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);
+                        print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+                if (use_ssdiff)
+                        cgit_ssdiff_footer();
                 return;
         }
-        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 
-                            &new_size, &binary, print_line))
+        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+                            &new_size, &binary, ctx.qry.context,
+                            ctx.qry.ignorews, print_line_fn))
                 cgit_print_error("Error running diff");
-        if (binary)
-                html("Binary files differ");
+        if (binary) {
+                if (use_ssdiff)
+                        html("<tr><td colspan='4'>Binary files differ</td></tr>");
+                else
+                        html("Binary files differ");
+        }
+        if (use_ssdiff)
+                cgit_ssdiff_footer();
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
@@ -303,11 +362,22 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                 if (!commit2 || parse_commit(commit2))
                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
         }
-        cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
 
-        html("<table summary='diff' class='diff'>");
-        html("<tr><td>");
-        cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
-        html("</td></tr>");
+        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+                use_ssdiff = 1;
+
+        print_ssdiff_link();
+        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
+
+        if (use_ssdiff) {
+                html("<table summary='ssdiff' class='ssdiff'>");
+        } else {
+                html("<table summary='diff' class='diff'>");
+                html("<tr><td>");
+        }
+        cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
+                       ctx.qry.ignorews);
+        if (!use_ssdiff)
+                html("</td></tr>");
         html("</table>");
 }
diff --git a/ui-diff.h b/ui-diff.h
index 70b2926..12d0c62 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -7,4 +7,10 @@ extern void cgit_print_diffstat(const unsigned char *old_sha1,
 extern void cgit_print_diff(const char *new_hex, const char *old_hex,
                             const char *prefix);
 
+extern struct diff_filespec *cgit_get_current_old_file(void);
+extern struct diff_filespec *cgit_get_current_new_file(void);
+
+extern unsigned char old_rev_sha1[20];
+extern unsigned char new_rev_sha1[20];
+
 #endif /* UI_DIFF_H */
diff --git a/ui-log.c b/ui-log.c
index f3132c9..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -9,9 +9,25 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "vector.h"
 
 int files, add_lines, rem_lines;
 
+/*
+ * The list of available column colors in the commit graph.
+ */
+static const char *column_colors_html[] = {
+        "<span class='column1'>",
+        "<span class='column2'>",
+        "<span class='column3'>",
+        "<span class='column4'>",
+        "<span class='column5'>",
+        "<span class='column6'>",
+        "</span>",
+};
+
+#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
+
 void count_lines(char *line, int size)
 {
         if (size <= 0)
@@ -33,7 +49,8 @@ void inspect_files(struct diff_filepair *pair)
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                                &new_size, &binary, count_lines);
+                                &new_size, &binary, 0, ctx.qry.ignorews,
+                                count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)
@@ -46,8 +63,9 @@ void show_commit_decorations(struct commit *commit)
         while (deco) {
                 if (!prefixcmp(deco->name, "refs/heads/")) {
                         strncpy(buf, deco->name + 11, sizeof(buf) - 1);
-                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
-                                0, NULL, NULL, ctx.qry.showmsg);
+                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
+                                      ctx.qry.vpath, 0, NULL, NULL,
+                                      ctx.qry.showmsg);
                 }
                 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
                         strncpy(buf, deco->name + 15, sizeof(buf) - 1);
@@ -60,44 +78,112 @@ void show_commit_decorations(struct commit *commit)
                 else if (!prefixcmp(deco->name, "refs/remotes/")) {
                         strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                         cgit_log_link(buf, NULL, "remote-deco", NULL,
-                                sha1_to_hex(commit->object.sha1), NULL,
-                                0, NULL, NULL, ctx.qry.showmsg);
+                                      sha1_to_hex(commit->object.sha1),
+                                      ctx.qry.vpath, 0, NULL, NULL,
+                                      ctx.qry.showmsg);
                 }
                 else {
                         strncpy(buf, deco->name, sizeof(buf) - 1);
                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
-                                sha1_to_hex(commit->object.sha1));
+                                         sha1_to_hex(commit->object.sha1),
+                                         ctx.qry.vpath, 0);
                 }
                 deco = deco->next;
         }
 }
 
-void print_commit(struct commit *commit)
+void print_commit(struct commit *commit, struct rev_info *revs)
 {
         struct commitinfo *info;
         char *tmp;
-        int cols = 2;
+        int cols = revs->graph ? 3 : 2;
+        struct strbuf graphbuf = STRBUF_INIT;
+        struct strbuf msgbuf = STRBUF_INIT;
+
+        if (ctx.repo->enable_log_filecount) {
+                cols++;
+                if (ctx.repo->enable_log_linecount)
+                        cols++;
+        }
+
+        if (revs->graph) {
+                /* Advance graph until current commit */
+                while (!graph_next_line(revs->graph, &graphbuf)) {
+                        /* Print graph segment in otherwise empty table row */
+                        html("<tr class='nohover'><td class='commitgraph'>");
+                        html(graphbuf.buf);
+                        htmlf("</td><td colspan='%d' /></tr>\n", cols);
+                        strbuf_setlen(&graphbuf, 0);
+                }
+                /* Current commit's graph segment is now ready in graphbuf */
+        }
 
         info = cgit_parse_commit(commit);
-        htmlf("<tr%s><td>",
-                ctx.qry.showmsg ? " class='logheader'" : "");
-        tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-        tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
-        html_link_open(tmp, NULL, NULL);
-        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
-        html_link_close();
-        htmlf("</td><td%s>",
-                ctx.qry.showmsg ? " class='logsubject'" : "");
+        htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
+
+        if (revs->graph) {
+                /* Print graph segment for current commit */
+                html("<td class='commitgraph'>");
+                html(graphbuf.buf);
+                html("</td>");
+                strbuf_setlen(&graphbuf, 0);
+        }
+        else {
+                html("<td>");
+                tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+                tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
+                html_link_open(tmp, NULL, NULL);
+                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+                html_link_close();
+                html("</td>");
+        }
+
+        htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
+        if (ctx.qry.showmsg) {
+                /* line-wrap long commit subjects instead of truncating them */
+                size_t subject_len = strlen(info->subject);
+
+                if (subject_len > ctx.cfg.max_msg_len &&
+                    ctx.cfg.max_msg_len >= 15) {
+                        /* symbol for signaling line-wrap (in PAGE_ENCODING) */
+                        const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
+                        int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+                        /* Rewind i to preceding space character */
+                        while (i > 0 && !isspace(info->subject[i]))
+                                --i;
+                        if (!i) /* Oops, zero spaces. Reset i */
+                                i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+                        /* add remainder starting at i to msgbuf */
+                        strbuf_add(&msgbuf, info->subject + i, subject_len - i);
+                        strbuf_trim(&msgbuf);
+                        strbuf_add(&msgbuf, "\n\n", 2);
+
+                        /* Place wrap_symbol at position i in info->subject */
+                        strcpy(info->subject + i, wrap_symbol);
+                }
+        }
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
-                         sha1_to_hex(commit->object.sha1));
+                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
         show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
+
+        if (revs->graph) {
+                html("</td><td>");
+                tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+                tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
+                html_link_open(tmp, NULL, NULL);
+                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+                html_link_close();
+        }
+
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
-                cgit_diff_commit(commit, inspect_files);
+                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
@@ -106,17 +192,61 @@ void print_commit(struct commit *commit)
                 }
         }
         html("</td></tr>\n");
-        if (ctx.qry.showmsg) {
-                if (ctx.repo->enable_log_filecount) {
-                        cols++;
-                        if (ctx.repo->enable_log_linecount)
-                                cols++;
+
+        if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
+                html("<tr class='nohover'>");
+
+                if (ctx.qry.showmsg) {
+                        /* Concatenate commit message + notes in msgbuf */
+                        if (info->msg && *(info->msg)) {
+                                strbuf_addstr(&msgbuf, info->msg);
+                                strbuf_addch(&msgbuf, '\n');
+                        }
+                        format_note(NULL, commit->object.sha1, &msgbuf,
+                                    PAGE_ENCODING,
+                                    NOTES_SHOW_HEADER | NOTES_INDENT);
+                        strbuf_addch(&msgbuf, '\n');
+                        strbuf_ltrim(&msgbuf);
+                }
+
+                if (revs->graph) {
+                        int lines = 0;
+
+                        /* Calculate graph padding */
+                        if (ctx.qry.showmsg) {
+                                /* Count #lines in commit message + notes */
+                                const char *p = msgbuf.buf;
+                                lines = 1;
+                                while ((p = strchr(p, '\n'))) {
+                                        p++;
+                                        lines++;
+                                }
+                        }
+
+                        /* Print graph padding */
+                        html("<td class='commitgraph'>");
+                        while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
+                                if (graphbuf.len)
+                                        html("\n");
+                                strbuf_setlen(&graphbuf, 0);
+                                graph_next_line(revs->graph, &graphbuf);
+                                html(graphbuf.buf);
+                                lines--;
+                        }
+                        html("</td>\n");
                 }
-                htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
-                        cols);
-                html_txt(info->msg);
+                else
+                        html("<td/>"); /* Empty 'Age' column */
+
+                /* Print msgbuf into remainder of table row */
+                htmlf("<td colspan='%d'%s>\n", cols,
+                        ctx.qry.showmsg ? " class='logmsg'" : "");
+                html_txt(msgbuf.buf);
                 html("</td></tr>\n");
         }
+
+        strbuf_release(&msgbuf);
+        strbuf_release(&graphbuf);
         cgit_free_commitinfo(info);
 }
 
@@ -132,35 +262,94 @@ static const char *disambiguate_ref(const char *ref)
         return ref;
 }
 
+static char *next_token(char **src)
+{
+        char *result;
+
+        if (!src || !*src)
+                return NULL;
+        while (isspace(**src))
+                (*src)++;
+        if (!**src)
+                return NULL;
+        result = *src;
+        while (**src) {
+                if (isspace(**src)) {
+                        **src = '\0';
+                        (*src)++;
+                        break;
+                }
+                (*src)++;
+        }
+        return result;
+}
+
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
-                    char *path, int pager)
+                    char *path, int pager, int commit_graph)
 {
         struct rev_info rev;
         struct commit *commit;
-        const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
-        int argc = 2;
+        struct vector vec = VECTOR_INIT(char *);
         int i, columns = 3;
+        char *arg;
+
+        /* First argv is NULL */
+        vector_push(&vec, NULL, 0);
 
         if (!tip)
                 tip = ctx.qry.head;
+        tip = disambiguate_ref(tip);
+        vector_push(&vec, &tip, 0);
 
-        argv[1] = disambiguate_ref(tip);
-
-        if (grep && pattern && (!strcmp(grep, "grep") ||
-                                !strcmp(grep, "author") ||
-                                !strcmp(grep, "committer")))
-                argv[argc++] = fmt("--%s=%s", grep, pattern);
+        if (grep && pattern && *pattern) {
+                pattern = xstrdup(pattern);
+                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
+                    !strcmp(grep, "committer")) {
+                        arg = fmt("--%s=%s", grep, pattern);
+                        vector_push(&vec, &arg, 0);
+                }
+                if (!strcmp(grep, "range")) {
+                        /* Split the pattern at whitespace and add each token
+                         * as a revision expression. Do not accept other
+                         * rev-list options. Also, replace the previously
+                         * pushed tip (it's no longer relevant).
+                         */
+                        vec.count--;
+                        while ((arg = next_token(&pattern))) {
+                                if (*arg == '-') {
+                                        fprintf(stderr, "Bad range expr: %s\n",
+                                                arg);
+                                        break;
+                                }
+                                vector_push(&vec, &arg, 0);
+                        }
+                }
+        }
+        if (commit_graph) {
+                static const char *graph_arg = "--graph";
+                static const char *color_arg = "--color";
+                vector_push(&vec, &graph_arg, 0);
+                vector_push(&vec, &color_arg, 0);
+                graph_set_column_colors(column_colors_html,
+                                        COLUMN_COLORS_HTML_MAX);
+        }
 
         if (path) {
-                argv[argc++] = "--";
-                argv[argc++] = path;
+                arg = "--";
+                vector_push(&vec, &arg, 0);
+                vector_push(&vec, &path, 0);
         }
+
+        /* Make sure the vector is NULL-terminated */
+        vector_push(&vec, NULL, 0);
+        vec.count--;
+
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
-        setup_revisions(argc, argv, &rev, NULL);
+        setup_revisions(vec.count, vec.data, &rev, NULL);
         load_ref_decorations(DECORATE_FULL_REFS);
         rev.show_decorations = 1;
         rev.grep_filter.regflags |= REG_ICASE;
@@ -170,17 +359,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         if (pager)
                 html("<table class='list nowrap'>");
 
-        html("<tr class='nohover'><th class='left'>Age</th>"
-              "<th class='left'>Commit message");
+        html("<tr class='nohover'>");
+        if (commit_graph)
+                html("<th></th>");
+        else
+                html("<th class='left'>Age</th>");
+        html("<th class='left'>Commit message");
         if (pager) {
                 html(" (");
                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                               NULL, ctx.qry.head, ctx.qry.sha1,
-                              ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
+                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                 html(")");
         }
         html("</th><th class='left'>Author</th>");
+        if (commit_graph)
+                html("<th class='left'>Age</th>");
         if (ctx.repo->enable_log_filecount) {
                 html("<th class='left'>Files</th>");
                 columns++;
@@ -202,33 +397,32 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
-                print_commit(commit);
+                print_commit(commit, &rev);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         if (pager) {
-                htmlf("</table><div class='pager'>",
-                     columns);
+                html("</table><div class='pager'>");
                 if (ofs > 0) {
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.path,
+                                      ctx.qry.sha1, ctx.qry.vpath,
                                       ofs - cnt, ctx.qry.grep,
                                       ctx.qry.search, ctx.qry.showmsg);
                         html("&nbsp;");
                 }
                 if ((commit = get_revision(&rev)) != NULL) {
                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.path,
+                                      ctx.qry.sha1, ctx.qry.vpath,
                                       ofs + cnt, ctx.qry.grep,
                                       ctx.qry.search, ctx.qry.showmsg);
                 }
                 html("</div>");
         } else if ((commit = get_revision(&rev)) != NULL) {
                 html("<tr class='nohover'><td colspan='3'>");
-                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
-                              NULL, NULL, ctx.qry.showmsg);
+                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
+                              ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
                 html("</td></tr>\n");
         }
 }
diff --git a/ui-log.h b/ui-log.h
index 6034055..d0cb779 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -2,7 +2,8 @@
 #define UI_LOG_H
 
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
-                           char *pattern, char *path, int pager);
+                           char *pattern, char *path, int pager,
+                           int commit_graph);
 extern void show_commit_decorations(struct commit *commit);
 
 #endif /* UI_LOG_H */
diff --git a/ui-patch.c b/ui-patch.c
index 2a8f7a5..ca008f3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -71,13 +71,13 @@ static void filepair_cb(struct diff_filepair *pair)
                 return;
         }
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                            &new_size, &binary, print_line))
+                            &new_size, &binary, 0, 0, print_line))
                 html("Error running diff");
         if (binary)
                 html("Binary files differ\n");
 }
 
-void cgit_print_patch(char *hex)
+void cgit_print_patch(char *hex, const char *prefix)
 {
         struct commit *commit;
         struct commitinfo *info;
@@ -122,7 +122,9 @@ void cgit_print_patch(char *hex)
                         html("\n");
         }
         html("---\n");
-        cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
+        if (prefix)
+                htmlf("(limited to '%s')\n\n", prefix);
+        cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
diff --git a/ui-patch.h b/ui-patch.h
index 9f68212..1641cea 100644
--- a/ui-patch.h
+++ b/ui-patch.h
@@ -1,6 +1,6 @@
 #ifndef UI_PATCH_H
 #define UI_PATCH_H
 
-extern void cgit_print_patch(char *hex);
+extern void cgit_print_patch(char *hex, const char *prefix);
 
 #endif /* UI_PATCH_H */
diff --git a/ui-plain.c b/ui-plain.c
index 5569a7c..1b2b672 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,8 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 
-char *curr_rev;
-char *match_path;
+int match_baselen;
 int match;
 
 static void print_object(const unsigned char *sha1, const char *path)
@@ -53,17 +52,63 @@ static void print_object(const unsigned char *sha1, const char *path)
         match = 1;
 }
 
+static void print_dir(const unsigned char *sha1, const char *path,
+                      const char *base)
+{
+        char *fullpath;
+        if (path[0] || base[0])
+                fullpath = fmt("/%s%s/", base, path);
+        else
+                fullpath = "/";
+        ctx.page.etag = sha1_to_hex(sha1);
+        cgit_print_http_headers(&ctx);
+        htmlf("<html><head><title>%s</title></head>\n<body>\n"
+              " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
+        if (path[0] || base[0])
+              html("  <li><a href=\"../\">../</a></li>\n");
+        match = 2;
+}
+
+static void print_dir_entry(const unsigned char *sha1, const char *path,
+                            unsigned mode)
+{
+        const char *sep = "";
+        if (S_ISDIR(mode))
+                sep = "/";
+        htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
+        match = 2;
+}
+
+static void print_dir_tail(void)
+{
+        html(" </ul>\n</body></html>\n");
+}
+
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                      const char *pathname, unsigned mode, int stage,
                      void *cbdata)
 {
-        if (S_ISDIR(mode))
+        if (baselen == match_baselen) {
+                if (S_ISREG(mode))
+                        print_object(sha1, pathname);
+                else if (S_ISDIR(mode)) {
+                        print_dir(sha1, pathname, base);
+                        return READ_TREE_RECURSIVE;
+                }
+        }
+        else if (baselen > match_baselen)
+                print_dir_entry(sha1, pathname, mode);
+        else if (S_ISDIR(mode))
                 return READ_TREE_RECURSIVE;
 
-        if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
-            !strcmp(pathname, match_path + baselen))
-                print_object(sha1, pathname);
+        return 0;
+}
 
+static int basedir_len(const char *path)
+{
+        char *p = strrchr(path, '/');
+        if (p)
+                return p - path + 1;
         return 0;
 }
 
@@ -77,7 +122,6 @@ void cgit_print_plain(struct cgit_context *ctx)
         if (!rev)
                 rev = ctx->qry.head;
 
-        curr_rev = xstrdup(rev);
         if (get_sha1(rev, sha1)) {
                 html_status(404, "Not found", 0);
                 return;
@@ -87,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx)
                 html_status(404, "Not found", 0);
                 return;
         }
-        match_path = ctx->qry.path;
+        if (!paths[0]) {
+                paths[0] = "";
+                match_baselen = -1;
+                print_dir(commit->tree->object.sha1, "", "");
+        }
+        else
+                match_baselen = basedir_len(paths[0]);
         read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
         if (!match)
                 html_status(404, "Not found", 0);
+        else if (match == 2)
+                print_dir_tail();
 }
diff --git a/ui-refs.c b/ui-refs.c
index 6571cc4..caddfbc 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -76,7 +76,7 @@ static int print_branch(struct refinfo *ref)
         html("</td><td>");
 
         if (ref->object->type == OBJ_COMMIT) {
-                cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+                cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td colspan='2'>");
@@ -189,6 +189,8 @@ void cgit_print_branches(int maxcount)
         list.refs = NULL;
         list.alloc = list.count = 0;
         for_each_branch_ref(cgit_refs_cb, &list);
+        if (ctx.repo->enable_remote_branches)
+                for_each_remote_ref(cgit_refs_cb, &list);
 
         if (maxcount == 0 || maxcount > list.count)
                 maxcount = list.count;
diff --git a/ui-repolist.c b/ui-repolist.c
index 0a0b6ca..2c98668 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,12 +6,6 @@
  *   (see COPYING for full license text)
  */
 
-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
diff --git a/ui-shared.c b/ui-shared.c
index d1b020b..5aa9119 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -27,7 +27,7 @@ static char *http_date(time_t t)
                    tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-void cgit_print_error(char *msg)
+void cgit_print_error(const char *msg)
 {
         html("<div class='error'>");
         html_txt(msg);
@@ -133,7 +133,7 @@ char *cgit_currurl()
                 return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(char *page, char *search, int ofs)
+static void site_url(const char *page, const char *search, int ofs)
 {
         char *delim = "?";
 
@@ -160,8 +160,8 @@ static void site_url(char *page, char *search, int ofs)
         }
 }
 
-static void site_link(char *page, char *name, char *title, char *class,
-                      char *search, int ofs)
+static void site_link(const char *page, const char *name, const char *title,
+                      const char *class, const char *search, int ofs)
 {
         html("<a");
         if (title) {
@@ -181,14 +181,14 @@ static void site_link(char *page, char *name, char *title, char *class,
         html("</a>");
 }
 
-void cgit_index_link(char *name, char *title, char *class, char *pattern,
-                     int ofs)
+void cgit_index_link(const char *name, const char *title, const char *class,
+                     const char *pattern, int ofs)
 {
         site_link(NULL, name, title, class, pattern, ofs);
 }
 
-static char *repolink(char *title, char *class, char *page, char *head,
-                      char *path)
+static char *repolink(const char *title, const char *class, const char *page,
+                      const char *head, const char *path)
 {
         char *delim = "?";
 
@@ -240,8 +240,9 @@ static char *repolink(char *title, char *class, char *page, char *head,
         return fmt("%s", delim);
 }
 
-static void reporevlink(char *page, char *name, char *title, char *class,
-                        char *head, char *rev, char *path)
+static void reporevlink(const char *page, const char *name, const char *title,
+                        const char *class, const char *head, const char *rev,
+                        const char *path)
 {
         char *delim;
 
@@ -256,32 +257,33 @@ static void reporevlink(char *page, char *name, char *title, char *class,
         html("</a>");
 }
 
-void cgit_summary_link(char *name, char *title, char *class, char *head)
+void cgit_summary_link(const char *name, const char *title, const char *class,
+                       const char *head)
 {
         reporevlink(NULL, name, title, class, head, NULL, NULL);
 }
 
-void cgit_tag_link(char *name, char *title, char *class, char *head,
-                   char *rev)
+void cgit_tag_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev)
 {
         reporevlink("tag", name, title, class, head, rev, NULL);
 }
 
-void cgit_tree_link(char *name, char *title, char *class, char *head,
-                    char *rev, char *path)
+void cgit_tree_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
 {
         reporevlink("tree", name, title, class, head, rev, path);
 }
 
-void cgit_plain_link(char *name, char *title, char *class, char *head,
-                     char *rev, char *path)
+void cgit_plain_link(const char *name, const char *title, const char *class,
+                     const char *head, const char *rev, const char *path)
 {
         reporevlink("plain", name, title, class, head, rev, path);
 }
 
-void cgit_log_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path, int ofs, char *grep, char *pattern,
-                   int showmsg)
+void cgit_log_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const char *path,
+                   int ofs, const char *grep, const char *pattern, int showmsg)
 {
         char *delim;
 
@@ -316,8 +318,9 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
         html("</a>");
 }
 
-void cgit_commit_link(char *name, char *title, char *class, char *head,
-                      char *rev)
+void cgit_commit_link(char *name, const char *title, const char *class,
+                      const char *head, const char *rev, const char *path,
+                      int toggle_ssdiff)
 {
         if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                 name[ctx.cfg.max_msg_len] = '\0';
@@ -325,23 +328,53 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                 name[ctx.cfg.max_msg_len - 2] = '.';
                 name[ctx.cfg.max_msg_len - 3] = '.';
         }
-        reporevlink("commit", name, title, class, head, rev, NULL);
+
+        char *delim;
+
+        delim = repolink(title, class, "commit", head, path);
+        if (rev && strcmp(rev, ctx.qry.head)) {
+                html(delim);
+                html("id=");
+                html_url_arg(rev);
+                delim = "&amp;";
+        }
+        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+                html(delim);
+                html("ss=1");
+                delim = "&amp;";
+        }
+        if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+                html(delim);
+                html("context=");
+                htmlf("%d", ctx.qry.context);
+                delim = "&amp;";
+        }
+        if (ctx.qry.ignorews) {
+                html(delim);
+                html("ignorews=1");
+                delim = "&amp;";
+        }
+        html("'>");
+        html_txt(name);
+        html("</a>");
 }
 
-void cgit_refs_link(char *name, char *title, char *class, char *head,
-                    char *rev, char *path)
+void cgit_refs_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
 {
         reporevlink("refs", name, title, class, head, rev, path);
 }
 
-void cgit_snapshot_link(char *name, char *title, char *class, char *head,
-                        char *rev, char *archivename)
+void cgit_snapshot_link(const char *name, const char *title, const char *class,
+                        const char *head, const char *rev,
+                        const char *archivename)
 {
         reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
-void cgit_diff_link(char *name, char *title, char *class, char *head,
-                    char *new_rev, char *old_rev, char *path)
+void cgit_diff_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *new_rev, const char *old_rev,
+                    const char *path, int toggle_ssdiff)
 {
         char *delim;
 
@@ -356,24 +389,99 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                 html(delim);
                 html("id2=");
                 html_url_arg(old_rev);
+                delim = "&amp;";
+        }
+        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+                html(delim);
+                html("ss=1");
+                delim = "&amp;";
+        }
+        if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+                html(delim);
+                html("context=");
+                htmlf("%d", ctx.qry.context);
+                delim = "&amp;";
+        }
+        if (ctx.qry.ignorews) {
+                html(delim);
+                html("ignorews=1");
+                delim = "&amp;";
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
-void cgit_patch_link(char *name, char *title, char *class, char *head,
-                     char *rev)
+void cgit_patch_link(const char *name, const char *title, const char *class,
+                     const char *head, const char *rev, const char *path)
 {
-        reporevlink("patch", name, title, class, head, rev, NULL);
+        reporevlink("patch", name, title, class, head, rev, path);
 }
 
-void cgit_stats_link(char *name, char *title, char *class, char *head,
-                     char *path)
+void cgit_stats_link(const char *name, const char *title, const char *class,
+                     const char *head, const char *path)
 {
         reporevlink("stats", name, title, class, head, NULL, path);
 }
 
+void cgit_self_link(char *name, const char *title, const char *class,
+                    struct cgit_context *ctx)
+{
+        if (!strcmp(ctx->qry.page, "repolist"))
+                return cgit_index_link(name, title, class, ctx->qry.search,
+                                       ctx->qry.ofs);
+        else if (!strcmp(ctx->qry.page, "summary"))
+                return cgit_summary_link(name, title, class, ctx->qry.head);
+        else if (!strcmp(ctx->qry.page, "tag"))
+                return cgit_tag_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+        else if (!strcmp(ctx->qry.page, "tree"))
+                return cgit_tree_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "plain"))
+                return cgit_plain_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "log"))
+                return cgit_log_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path, ctx->qry.ofs,
+                                      ctx->qry.grep, ctx->qry.search,
+                                      ctx->qry.showmsg);
+        else if (!strcmp(ctx->qry.page, "commit"))
+                return cgit_commit_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path, 0);
+        else if (!strcmp(ctx->qry.page, "patch"))
+                return cgit_patch_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "refs"))
+                return cgit_refs_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "snapshot"))
+                return cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "diff"))
+                return cgit_diff_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.sha1, ctx->qry.sha2,
+                                      ctx->qry.path, 0);
+        else if (!strcmp(ctx->qry.page, "stats"))
+                return cgit_stats_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.path);
+
+        /* Don't known how to make link for this page */
+        repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+        html("><!-- cgit_self_link() doesn't know how to make link for page '");
+        html_txt(ctx->qry.page);
+        html("' -->");
+        html_txt(name);
+        html("</a>");
+}
+
 void cgit_object_link(struct object *obj)
 {
         char *page, *shortrev, *fullrev, *name;
@@ -383,7 +491,7 @@ void cgit_object_link(struct object *obj)
         shortrev[10] = '\0';
         if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-                                 ctx.qry.head, fullrev);
+                                 ctx.qry.head, fullrev, NULL, 0);
                 return;
         } else if (obj->type == OBJ_TREE)
                 page = "tree";
@@ -395,7 +503,7 @@ void cgit_object_link(struct object *obj)
         reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
-void cgit_print_date(time_t secs, char *format, int local_time)
+void cgit_print_date(time_t secs, const char *format, int local_time)
 {
         char buf[64];
         struct tm *time;
@@ -410,7 +518,7 @@ void cgit_print_date(time_t secs, char *format, int local_time)
         html_txt(buf);
 }
 
-void cgit_print_age(time_t t, time_t max_relative, char *format)
+void cgit_print_age(time_t t, time_t max_relative, const char *format)
 {
         time_t now, secs;
 
@@ -509,7 +617,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
                 html("<link rel='alternate' title='Atom feed' href='");
                 html(cgit_httpscheme());
                 html_attr(cgit_hosturl());
-                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
+                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
                                        fmt("h=%s", ctx->qry.head)));
                 html("' type='application/atom+xml'/>\n");
         }
@@ -589,14 +697,15 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
         return 0;
 }
 
-void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search,
+                                const char *page)
 {
         char *url;
 
         if (!ctx.cfg.virtual_root) {
                 url = fmt("%s/%s", ctx.qry.repo, page);
-                if (ctx.qry.path)
-                        url = fmt("%s/%s", url, ctx.qry.path);
+                if (ctx.qry.vpath)
+                        url = fmt("%s/%s", url, ctx.qry.vpath);
                 html_hidden("url", url);
         }
 
@@ -619,26 +728,55 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
         }
 }
 
-const char *fallback_cmd = "repolist";
+static const char *hc(struct cgit_context *ctx, const char *page)
+{
+        return strcmp(ctx->qry.page, page) ? NULL : "active";
+}
 
-char *hc(struct cgit_cmd *cmd, const char *page)
+static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 {
-        return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
+        char *old_path = ctx->qry.path;
+        char *p = path, *q, *end = path + strlen(path);
+
+        ctx->qry.path = NULL;
+        cgit_self_link("root", NULL, NULL, ctx);
+        ctx->qry.path = p = path;
+        while (p < end) {
+                if (!(q = strchr(p, '/')))
+                        q = end;
+                *q = '\0';
+                html_txt("/");
+                cgit_self_link(p, NULL, NULL, ctx);
+                if (q < end)
+                        *q = '/';
+                p = q + 1;
+        }
+        ctx->qry.path = old_path;
 }
 
 static void print_header(struct cgit_context *ctx)
 {
+        char *logo = NULL, *logo_link = NULL;
+
         html("<table id='header'>\n");
         html("<tr>\n");
 
-        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+        if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+                logo = ctx->repo->logo;
+        else
+                logo = ctx->cfg.logo;
+        if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+                logo_link = ctx->repo->logo_link;
+        else
+                logo_link = ctx->cfg.logo_link;
+        if (logo && *logo) {
                 html("<td class='logo' rowspan='2'><a href='");
-                if (ctx->cfg.logo_link)
-                        html_attr(ctx->cfg.logo_link);
+                if (logo_link && *logo_link)
+                        html_attr(logo_link);
                 else
                         html_attr(cgit_rooturl());
                 html("'><img src='");
-                html_attr(ctx->cfg.logo);
+                html_attr(logo);
                 html("' alt='cgit logo'/></a></td>\n");
         }
 
@@ -675,47 +813,44 @@ static void print_header(struct cgit_context *ctx)
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
-        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
-        if (!cmd && ctx->repo)
-                fallback_cmd = "summary";
-
         html("<div id='cgit'>");
         if (!ctx->cfg.noheader)
                 print_header(ctx);
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {
-                cgit_summary_link("summary", NULL, hc(cmd, "summary"),
+                cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                   ctx->qry.head);
-                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
+                cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                                ctx->qry.sha1, NULL);
-                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
-                              NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
-                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
-                               ctx->qry.sha1, NULL);
-                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
-                                 ctx->qry.head, ctx->qry.sha1);
-                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
-                               ctx->qry.sha1, ctx->qry.sha2, NULL);
+                cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
+                              NULL, ctx->qry.vpath, 0, NULL, NULL,
+                              ctx->qry.showmsg);
+                cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
+                               ctx->qry.sha1, ctx->qry.vpath);
+                cgit_commit_link("commit", NULL, hc(ctx, "commit"),
+                                 ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
+                cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
+                               ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
                 if (ctx->repo->max_stats)
-                        cgit_stats_link("stats", NULL, hc(cmd, "stats"),
-                                        ctx->qry.head, NULL);
+                        cgit_stats_link("stats", NULL, hc(ctx, "stats"),
+                                        ctx->qry.head, ctx->qry.vpath);
                 if (ctx->repo->readme)
                         reporevlink("about", "about", NULL,
-                                    hc(cmd, "about"), ctx->qry.head, NULL,
+                                    hc(ctx, "about"), ctx->qry.head, NULL,
                                     NULL);
                 html("</td><td class='form'>");
                 html("<form class='right' method='get' action='");
                 if (ctx->cfg.virtual_root)
                         html_url_path(cgit_fileurl(ctx->qry.repo, "log",
-                                                   ctx->qry.path, NULL));
+                                                   ctx->qry.vpath, NULL));
                 html("'>\n");
                 cgit_add_hidden_formfields(1, 0, "log");
                 html("<select name='qt'>\n");
                 html_option("grep", "log msg", ctx->qry.grep);
                 html_option("author", "author", ctx->qry.grep);
                 html_option("committer", "committer", ctx->qry.grep);
+                html_option("range", "range", ctx->qry.grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' size='10' name='q' value='");
                 html_attr(ctx->qry.search);
@@ -723,9 +858,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html("<input type='submit' value='search'/>\n");
                 html("</form>\n");
         } else {
-                site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+                site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                 if (ctx->cfg.root_readme)
-                        site_link("about", "about", NULL, hc(cmd, "about"),
+                        site_link("about", "about", NULL, hc(ctx, "about"),
                                   NULL, 0);
                 html("</td><td class='form'>");
                 html("<form method='get' action='");
@@ -738,6 +873,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html("</form>");
         }
         html("</td></tr></table>\n");
+        if (ctx->qry.vpath) {
+                html("<div class='path'>");
+                html("path: ");
+                cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+                html("</div>");
+        }
         html("<div class='content'>");
 }
 
@@ -760,13 +901,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                                const char *hex, int snapshots)
 {
         const struct cgit_snapshot_format* f;
+        char *prefix;
         char *filename;
+        unsigned char sha1[20];
 
+        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
+            (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
+                hex++;
+        prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
         for (f = cgit_snapshot_formats; f->suffix; f++) {
                 if (!(snapshots & f->bit))
                         continue;
-                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                               f->suffix);
+                filename = fmt("%s%s", prefix, f->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                 html("<br/>");
         }
diff --git a/ui-shared.h b/ui-shared.h
index b12aa89..3cc1258 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -10,35 +10,50 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename,
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
-extern void cgit_index_link(char *name, char *title, char *class,
-                            char *pattern, int ofs);
-extern void cgit_summary_link(char *name, char *title, char *class, char *head);
-extern void cgit_tag_link(char *name, char *title, char *class, char *head,
-                          char *rev);
-extern void cgit_tree_link(char *name, char *title, char *class, char *head,
-                           char *rev, char *path);
-extern void cgit_plain_link(char *name, char *title, char *class, char *head,
-                            char *rev, char *path);
-extern void cgit_log_link(char *name, char *title, char *class, char *head,
-                          char *rev, char *path, int ofs, char *grep,
-                          char *pattern, int showmsg);
-extern void cgit_commit_link(char *name, char *title, char *class, char *head,
-                             char *rev);
-extern void cgit_patch_link(char *name, char *title, char *class, char *head,
-                            char *rev);
-extern void cgit_refs_link(char *name, char *title, char *class, char *head,
-                           char *rev, char *path);
-extern void cgit_snapshot_link(char *name, char *title, char *class,
-                               char *head, char *rev, char *archivename);
-extern void cgit_diff_link(char *name, char *title, char *class, char *head,
-                           char *new_rev, char *old_rev, char *path);
-extern void cgit_stats_link(char *name, char *title, char *class, char *head,
-                            char *path);
+extern void cgit_index_link(const char *name, const char *title,
+                            const char *class, const char *pattern, int ofs);
+extern void cgit_summary_link(const char *name, const char *title,
+                              const char *class, const char *head);
+extern void cgit_tag_link(const char *name, const char *title,
+                          const char *class, const char *head,
+                          const char *rev);
+extern void cgit_tree_link(const char *name, const char *title,
+                           const char *class, const char *head,
+                           const char *rev, const char *path);
+extern void cgit_plain_link(const char *name, const char *title,
+                            const char *class, const char *head,
+                            const char *rev, const char *path);
+extern void cgit_log_link(const char *name, const char *title,
+                          const char *class, const char *head, const char *rev,
+                          const char *path, int ofs, const char *grep,
+                          const char *pattern, int showmsg);
+extern void cgit_commit_link(char *name, const char *title,
+                             const char *class, const char *head,
+                             const char *rev, const char *path,
+                             int toggle_ssdiff);
+extern void cgit_patch_link(const char *name, const char *title,
+                            const char *class, const char *head,
+                            const char *rev, const char *path);
+extern void cgit_refs_link(const char *name, const char *title,
+                           const char *class, const char *head,
+                           const char *rev, const char *path);
+extern void cgit_snapshot_link(const char *name, const char *title,
+                               const char *class, const char *head,
+                               const char *rev, const char *archivename);
+extern void cgit_diff_link(const char *name, const char *title,
+                           const char *class, const char *head,
+                           const char *new_rev, const char *old_rev,
+                           const char *path, int toggle_ssdiff);
+extern void cgit_stats_link(const char *name, const char *title,
+                            const char *class, const char *head,
+                            const char *path);
+extern void cgit_self_link(char *name, const char *title,
+                           const char *class, struct cgit_context *ctx);
 extern void cgit_object_link(struct object *obj);
 
-extern void cgit_print_error(char *msg);
-extern void cgit_print_date(time_t secs, char *format, int local_time);
-extern void cgit_print_age(time_t t, time_t max_relative, char *format);
+extern void cgit_print_error(const char *msg);
+extern void cgit_print_date(time_t secs, const char *format, int local_time);
+extern void cgit_print_age(time_t t, time_t max_relative, const char *format);
 extern void cgit_print_http_headers(struct cgit_context *ctx);
 extern void cgit_print_docstart(struct cgit_context *ctx);
 extern void cgit_print_docend();
@@ -47,5 +62,5 @@ extern void cgit_print_filemode(unsigned short mode);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
-                                       char *page);
+                                       const char *page);
 #endif /* UI_SHARED_H */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index dbb5564..6e3412c 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -35,11 +35,17 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
         return write_compressed_tar_archive(args,"bzip2");
 }
 
+static int write_tar_xz_archive(struct archiver_args *args)
+{
+        return write_compressed_tar_archive(args,"xz");
+}
+
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
-        { ".zip", "application/x-zip", write_zip_archive, 0x1 },
-        { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
-        { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
-        { ".tar", "application/x-tar", write_tar_archive, 0x8 },
+        { ".zip", "application/x-zip", write_zip_archive, 0x01 },
+        { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
+        { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
+        { ".tar", "application/x-tar", write_tar_archive, 0x08 },
+        { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
         {}
 };
 
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
new file mode 100644
index 0000000..2481585
--- /dev/null
+++ b/ui-ssdiff.c
@@ -0,0 +1,383 @@
+#include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
+#include "ui-diff.h"
+
+extern int use_ssdiff;
+
+static int current_old_line, current_new_line;
+
+struct deferred_lines {
+        int line_no;
+        char *line;
+        struct deferred_lines *next;
+};
+
+static struct deferred_lines *deferred_old, *deferred_old_last;
+static struct deferred_lines *deferred_new, *deferred_new_last;
+
+static char *longest_common_subsequence(char *A, char *B)
+{
+        int i, j, ri;
+        int m = strlen(A);
+        int n = strlen(B);
+        int L[m + 1][n + 1];
+        int tmp1, tmp2;
+        int lcs_length;
+        char *result;
+
+        for (i = m; i >= 0; i--) {
+                for (j = n; j >= 0; j--) {
+                        if (A[i] == '\0' || B[j] == '\0') {
+                                L[i][j] = 0;
+                        } else if (A[i] == B[j]) {
+                                L[i][j] = 1 + L[i + 1][j + 1];
+                        } else {
+                                tmp1 = L[i + 1][j];
+                                tmp2 = L[i][j + 1];
+                                L[i][j] = (tmp1 > tmp2 ? tmp1 : tmp2);
+                        }
+                }
+        }
+
+        lcs_length = L[0][0];
+        result = xmalloc(lcs_length + 2);
+        memset(result, 0, sizeof(*result) * (lcs_length + 2));
+
+        ri = 0;
+        i = 0;
+        j = 0;
+        while (i < m && j < n) {
+                if (A[i] == B[j]) {
+                        result[ri] = A[i];
+                        ri += 1;
+                        i += 1;
+                        j += 1;
+                } else if (L[i + 1][j] >= L[i][j + 1]) {
+                        i += 1;
+                } else {
+                        j += 1;
+                }
+        }
+        return result;
+}
+
+static int line_from_hunk(char *line, char type)
+{
+        char *buf1, *buf2;
+        int len;
+
+        buf1 = strchr(line, type);
+        if (buf1 == NULL)
+                return 0;
+        buf1 += 1;
+        buf2 = strchr(buf1, ',');
+        if (buf2 == NULL)
+                return 0;
+        len = buf2 - buf1;
+        buf2 = xmalloc(len + 1);
+        strncpy(buf2, buf1, len);
+        buf2[len] = '\0';
+        int res = atoi(buf2);
+        free(buf2);
+        return res;
+}
+
+static char *replace_tabs(char *line)
+{
+        char *prev_buf = line;
+        char *cur_buf;
+        int linelen = strlen(line);
+        int n_tabs = 0;
+        int i;
+        char *result;
+        char *spaces = "        ";
+
+        if (linelen == 0) {
+                result = xmalloc(1);
+                result[0] = '\0';
+                return result;
+        }
+
+        for (i = 0; i < linelen; i++)
+                if (line[i] == '\t')
+                        n_tabs += 1;
+        result = xmalloc(linelen + n_tabs * 8 + 1);
+        result[0] = '\0';
+
+        while (1) {
+                cur_buf = strchr(prev_buf, '\t');
+                if (!cur_buf) {
+                        strcat(result, prev_buf);
+                        break;
+                } else {
+                        strcat(result, " ");
+                        strncat(result, spaces, 8 - (strlen(result) % 8));
+                        strncat(result, prev_buf, cur_buf - prev_buf);
+                }
+                prev_buf = cur_buf + 1;
+        }
+        return result;
+}
+
+static int calc_deferred_lines(struct deferred_lines *start)
+{
+        struct deferred_lines *item = start;
+        int result = 0;
+        while (item) {
+                result += 1;
+                item = item->next;
+        }
+        return result;
+}
+
+static void deferred_old_add(char *line, int line_no)
+{
+        struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
+        item->line = xstrdup(line);
+        item->line_no = line_no;
+        item->next = NULL;
+        if (deferred_old) {
+                deferred_old_last->next = item;
+                deferred_old_last = item;
+        } else {
+                deferred_old = deferred_old_last = item;
+        }
+}
+
+static void deferred_new_add(char *line, int line_no)
+{
+        struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
+        item->line = xstrdup(line);
+        item->line_no = line_no;
+        item->next = NULL;
+        if (deferred_new) {
+                deferred_new_last->next = item;
+                deferred_new_last = item;
+        } else {
+                deferred_new = deferred_new_last = item;
+        }
+}
+
+static void print_part_with_lcs(char *class, char *line, char *lcs)
+{
+        int line_len = strlen(line);
+        int i, j;
+        char c[2] = " ";
+        int same = 1;
+
+        j = 0;
+        for (i = 0; i < line_len; i++) {
+                c[0] = line[i];
+                if (same) {
+                        if (line[i] == lcs[j])
+                                j += 1;
+                        else {
+                                same = 0;
+                                htmlf("<span class='%s'>", class);
+                        }
+                } else if (line[i] == lcs[j]) {
+                        same = 1;
+                        htmlf("</span>");
+                        j += 1;
+                }
+                html_txt(c);
+        }
+}
+
+static void print_ssdiff_line(char *class,
+                              int old_line_no,
+                              char *old_line,
+                              int new_line_no,
+                              char *new_line, int individual_chars)
+{
+        char *lcs = NULL;
+
+        if (old_line)
+                old_line = replace_tabs(old_line + 1);
+        if (new_line)
+                new_line = replace_tabs(new_line + 1);
+        if (individual_chars && old_line && new_line)
+                lcs = longest_common_subsequence(old_line, new_line);
+        html("<tr>\n");
+        if (old_line_no > 0) {
+                struct diff_filespec *old_file = cgit_get_current_old_file();
+                char *lineno_str = fmt("n%d", old_line_no);
+                char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+                html("<td class='lineno'><a class='no' href='");
+                html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
+                htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+                html("</td>");
+                htmlf("<td class='%s'>", class);
+        } else if (old_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
+        else
+                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
+        if (old_line) {
+                if (lcs)
+                        print_part_with_lcs("del", old_line, lcs);
+                else
+                        html_txt(old_line);
+        }
+
+        html("</td>\n");
+        if (new_line_no > 0) {
+                struct diff_filespec *new_file = cgit_get_current_new_file();
+                char *lineno_str = fmt("n%d", new_line_no);
+                char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+                html("<td class='lineno'><a class='no' href='");
+                html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
+                htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+                html("</td>");
+                htmlf("<td class='%s'>", class);
+        } else if (new_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
+        else
+                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
+        if (new_line) {
+                if (lcs)
+                        print_part_with_lcs("add", new_line, lcs);
+                else
+                        html_txt(new_line);
+        }
+
+        html("</td></tr>");
+        if (lcs)
+                free(lcs);
+        if (new_line)
+                free(new_line);
+        if (old_line)
+                free(old_line);
+}
+
+static void print_deferred_old_lines()
+{
+        struct deferred_lines *iter_old, *tmp;
+        iter_old = deferred_old;
+        while (iter_old) {
+                print_ssdiff_line("del", iter_old->line_no,
+                                  iter_old->line, -1, NULL, 0);
+                tmp = iter_old->next;
+                free(iter_old);
+                iter_old = tmp;
+        }
+}
+
+static void print_deferred_new_lines()
+{
+        struct deferred_lines *iter_new, *tmp;
+        iter_new = deferred_new;
+        while (iter_new) {
+                print_ssdiff_line("add", -1, NULL,
+                                  iter_new->line_no, iter_new->line, 0);
+                tmp = iter_new->next;
+                free(iter_new);
+                iter_new = tmp;
+        }
+}
+
+static void print_deferred_changed_lines()
+{
+        struct deferred_lines *iter_old, *iter_new, *tmp;
+        int n_old_lines = calc_deferred_lines(deferred_old);
+        int n_new_lines = calc_deferred_lines(deferred_new);
+        int individual_chars = (n_old_lines == n_new_lines ? 1 : 0);
+
+        iter_old = deferred_old;
+        iter_new = deferred_new;
+        while (iter_old || iter_new) {
+                if (iter_old && iter_new)
+                        print_ssdiff_line("changed", iter_old->line_no,
+                                          iter_old->line,
+                                          iter_new->line_no, iter_new->line,
+                                          individual_chars);
+                else if (iter_old)
+                        print_ssdiff_line("changed", iter_old->line_no,
+                                          iter_old->line, -1, NULL, 0);
+                else if (iter_new)
+                        print_ssdiff_line("changed", -1, NULL,
+                                          iter_new->line_no, iter_new->line, 0);
+                if (iter_old) {
+                        tmp = iter_old->next;
+                        free(iter_old);
+                        iter_old = tmp;
+                }
+
+                if (iter_new) {
+                        tmp = iter_new->next;
+                        free(iter_new);
+                        iter_new = tmp;
+                }
+        }
+}
+
+void cgit_ssdiff_print_deferred_lines()
+{
+        if (!deferred_old && !deferred_new)
+                return;
+        if (deferred_old && !deferred_new)
+                print_deferred_old_lines();
+        else if (!deferred_old && deferred_new)
+                print_deferred_new_lines();
+        else
+                print_deferred_changed_lines();
+        deferred_old = deferred_old_last = NULL;
+        deferred_new = deferred_new_last = NULL;
+}
+
+/*
+ * print a single line returned from xdiff
+ */
+void cgit_ssdiff_line_cb(char *line, int len)
+{
+        char c = line[len - 1];
+        line[len - 1] = '\0';
+        if (line[0] == '@') {
+                current_old_line = line_from_hunk(line, '-');
+                current_new_line = line_from_hunk(line, '+');
+        }
+
+        if (line[0] == ' ') {
+                if (deferred_old || deferred_new)
+                        cgit_ssdiff_print_deferred_lines();
+                print_ssdiff_line("ctx", current_old_line, line,
+                                  current_new_line, line, 0);
+                current_old_line += 1;
+                current_new_line += 1;
+        } else if (line[0] == '+') {
+                deferred_new_add(line, current_new_line);
+                current_new_line += 1;
+        } else if (line[0] == '-') {
+                deferred_old_add(line, current_old_line);
+                current_old_line += 1;
+        } else if (line[0] == '@') {
+                html("<tr><td colspan='4' class='hunk'>");
+                html_txt(line);
+                html("</td></tr>");
+        } else {
+                html("<tr><td colspan='4' class='ctx'>");
+                html_txt(line);
+                html("</td></tr>");
+        }
+        line[len - 1] = c;
+}
+
+void cgit_ssdiff_header_begin()
+{
+        current_old_line = -1;
+        current_new_line = -1;
+        html("<tr><td class='space' colspan='4'><div></div></td></tr>");
+        html("<tr><td class='head' colspan='4'>");
+}
+
+void cgit_ssdiff_header_end()
+{
+        html("</td><tr>");
+}
+
+void cgit_ssdiff_footer()
+{
+        if (deferred_old || deferred_new)
+                cgit_ssdiff_print_deferred_lines();
+        html("<tr><td class='foot' colspan='4'></td></tr>");
+}
diff --git a/ui-ssdiff.h b/ui-ssdiff.h
new file mode 100644
index 0000000..64b4b12
--- /dev/null
+++ b/ui-ssdiff.h
@@ -0,0 +1,13 @@
+#ifndef UI_SSDIFF_H
+#define UI_SSDIFF_H
+
+extern void cgit_ssdiff_print_deferred_lines();
+
+extern void cgit_ssdiff_line_cb(char *line, int len);
+
+extern void cgit_ssdiff_header_begin();
+extern void cgit_ssdiff_header_end();
+
+extern void cgit_ssdiff_footer();
+
+#endif /* UI_SSDIFF_H */
diff --git a/ui-stats.c b/ui-stats.c
index 50c2540..2a0c174 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,10 +1,14 @@
-#include <string-list.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-stats.h"
 
+#ifdef NO_C99_FORMAT
+#define SZ_FMT "%u"
+#else
+#define SZ_FMT "%zu"
+#endif
+
 #define MONTHS 6
 
 struct authorstat {
@@ -283,10 +287,10 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
                         if (date)
                                 subtotal += (size_t)date->util;
                 }
-                htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
+                htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);
                 total += subtotal;
         }
-        htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
+        htmlf("<td class='%s'>%ld</td></tr>", rightclass, total);
 }
 
 void print_authors(struct string_list *authors, int top,
@@ -335,16 +339,16 @@ void print_authors(struct string_list *authors, int top,
                         if (!date)
                                 html("<td>0</td>");
                         else {
-                                htmlf("<td>%d</td>", date->util);
+                                htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
                                 total += (size_t)date->util;
                         }
                 }
-                htmlf("<td class='sum'>%d</td></tr>", total);
+                htmlf("<td class='sum'>%ld</td></tr>", total);
         }
 
         if (top < authors->nr)
                 print_combined_authorrow(authors, top, authors->nr - 1,
-                        "Others (%d)", "left", "", "sum", period);
+                        "Others (%ld)", "left", "", "sum", period);
 
         print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
                 "total", "sum", "sum", period);
@@ -367,7 +371,7 @@ void cgit_show_stats(struct cgit_context *ctx)
 
         i = cgit_find_stats_period(code, &period);
         if (!i) {
-                cgit_print_error(fmt("Unknown statistics type: %c", code));
+                cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
                 return;
         }
         if (i > ctx->repo->max_stats) {
diff --git a/ui-summary.c b/ui-summary.c
index a2c018e..5be2545 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,6 +1,7 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -10,6 +11,7 @@
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
+#include "ui-blob.h"
 
 int urls = 0;
 
@@ -57,7 +59,7 @@ void cgit_print_summary()
         if (ctx.cfg.summary_log > 0) {
                 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                 cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
-                               NULL, NULL, 0);
+                               NULL, NULL, 0, 0);
         }
         if (ctx.repo->clone_url)
                 print_urls(ctx.repo->clone_url, NULL);
@@ -68,24 +70,54 @@ void cgit_print_summary()
 
 void cgit_print_repo_readme(char *path)
 {
-        char *slash, *tmp;
+        char *slash, *tmp, *colon, *ref;
 
-        if (!ctx.repo->readme)
+        if (!ctx.repo->readme || !(*ctx.repo->readme))
                 return;
 
+        ref = NULL;
+
+        /* Check if the readme is tracked in the git repo. */
+        colon = strchr(ctx.repo->readme, ':');
+        if (colon && strlen(colon) > 1) {
+                *colon = '\0';
+                ref = ctx.repo->readme;
+                ctx.repo->readme = colon + 1;
+                if (!(*ctx.repo->readme))
+                        return;
+        }
+
+        /* Prepend repo path to relative readme path unless tracked. */
+        if (!ref && *ctx.repo->readme != '/')
+                ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
+                                               ctx.repo->readme));
+
+        /* If a subpath is specified for the about page, make it relative
+         * to the directory containing the configured readme.
+         */
         if (path) {
                 slash = strrchr(ctx.repo->readme, '/');
-                if (!slash)
-                        return;
+                if (!slash) {
+                        if (!colon)
+                                return;
+                        slash = colon;
+                }
                 tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
                 strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
                 strcpy(tmp + (slash - ctx.repo->readme + 1), path);
         } else
                 tmp = ctx.repo->readme;
+
+        /* Print the calculated readme, either from the git repo or from the
+         * filesystem, while applying the about-filter.
+         */
         html("<div id='summary'>");
         if (ctx.repo->about_filter)
                 cgit_open_filter(ctx.repo->about_filter);
-        html_include(tmp);
+        if (ref)
+                cgit_print_file(tmp, ref);
+        else
+                html_include(tmp);
         if (ctx.repo->about_filter)
                 cgit_close_filter(ctx.repo->about_filter);
         html("</div>");
diff --git a/ui-tag.c b/ui-tag.c
index c2d72af..39e4cb8 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -30,6 +30,14 @@ static void print_tag_content(char *buf)
         }
 }
 
+void print_download_links(char *revname)
+{
+        html("<tr><th>download</th><td class='sha1'>");
+        cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
+                                  revname, ctx.repo->snapshots);
+        html("</td></tr>");
+}
+
 void cgit_print_tag(char *revname)
 {
         unsigned char sha1[20];
@@ -56,16 +64,16 @@ void cgit_print_tag(char *revname)
                         return;
                 }
                 html("<table class='commit-info'>\n");
-                htmlf("<tr><td>Tag name</td><td>");
+                htmlf("<tr><td>tag name</td><td>");
                 html_txt(revname);
                 htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
                 if (info->tagger_date > 0) {
-                        html("<tr><td>Tag date</td><td>");
+                        html("<tr><td>tag date</td><td>");
                         cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
                         html("</td></tr>\n");
                 }
                 if (info->tagger) {
-                        html("<tr><td>Tagged by</td><td>");
+                        html("<tr><td>tagged by</td><td>");
                         html_txt(info->tagger);
                         if (info->tagger_email && !ctx.cfg.noplainemail) {
                                 html(" ");
@@ -73,19 +81,23 @@ void cgit_print_tag(char *revname)
                         }
                         html("</td></tr>\n");
                 }
-                html("<tr><td>Tagged object</td><td>");
+                html("<tr><td>tagged object</td><td class='sha1'>");
                 cgit_object_link(tag->tagged);
                 html("</td></tr>\n");
+                if (ctx.repo->snapshots)
+                        print_download_links(revname);
                 html("</table>\n");
                 print_tag_content(info->msg);
         } else {
                 html("<table class='commit-info'>\n");
-                htmlf("<tr><td>Tag name</td><td>");
+                htmlf("<tr><td>tag name</td><td>");
                 html_txt(revname);
                 html("</td></tr>\n");
-                html("<tr><td>Tagged object</td><td>");
+                html("<tr><td>Tagged object</td><td class='sha1'>");
                 cgit_object_link(obj);
                 html("</td></tr>\n");
+                if (ctx.repo->snapshots)
+                        print_download_links(revname);
                 html("</table>\n");
         }
         return;
diff --git a/ui-tree.c b/ui-tree.c
index a164767..0b1b531 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -46,7 +46,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                 html("<td class='lines'><pre><code>");
                 ctx.repo->source_filter->argv[1] = xstrdup(name);
                 cgit_open_filter(ctx.repo->source_filter);
-                write(STDOUT_FILENO, buf, size);
+                html_raw(buf, size);
                 cgit_close_filter(ctx.repo->source_filter);
                 html("</code></pre></td></tr></table>\n");
                 return;
@@ -67,7 +67,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
         html("<table summary='blob content' class='bin-blob'>\n");
         html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
         for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
-                htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
+                htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);
                 for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                         htmlf("%*s%02x",
                               idx == 16 ? 4 : 1, "",
@@ -102,10 +102,16 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
                 return;
         }
 
-        html(" (");
+        htmlf("blob: %s (", sha1_to_hex(sha1));
         cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                         curr_rev, path);
-        htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+        html(")\n");
+
+        if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+                htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>",
+                                size / 1024, ctx.cfg.max_blob_size);
+                return;
+        }
 
         if (buffer_is_binary(buf, size))
                 print_binary_buffer(buf, size);
@@ -169,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;
@@ -217,17 +225,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 {
         static int state;
         static char buffer[PATH_MAX];
-        char *url;
 
         if (state == 0) {
                 memcpy(buffer, base, baselen);
                 strcpy(buffer+baselen, pathname);
-                url = cgit_pageurl(ctx.qry.repo, "tree",
-                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
-                html("/");
-                cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
-                               curr_rev, buffer);
-
                 if (strcmp(match_path, buffer))
                         return READ_TREE_RECURSIVE;
 
@@ -270,10 +271,6 @@ void cgit_print_tree(const char *rev, char *path)
                 return;
         }
 
-        html("path: <a href='");
-        html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
-        html("'>root</a>");
-
         if (path == NULL) {
                 ls_tree(commit->tree->object.sha1, NULL);
                 return;
diff --git a/vector.c b/vector.c
new file mode 100644
index 0000000..0863908
--- /dev/null
+++ b/vector.c
@@ -0,0 +1,38 @@
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include "vector.h"
+
+static int grow(struct vector *vec, int gently)
+{
+        size_t new_alloc;
+        void *new_data;
+
+        new_alloc = vec->alloc * 3 / 2;
+        if (!new_alloc)
+                new_alloc = 8;
+        new_data = realloc(vec->data, new_alloc * vec->size);
+        if (!new_data) {
+                if (gently)
+                        return ENOMEM;
+                perror("vector.c:grow()");
+                exit(1);
+        }
+        vec->data = new_data;
+        vec->alloc = new_alloc;
+        return 0;
+}
+
+int vector_push(struct vector *vec, const void *data, int gently)
+{
+        int rc;
+
+        if (vec->count == vec->alloc && (rc = grow(vec, gently)))
+                return rc;
+        if (data)
+                memmove(vec->data + vec->count * vec->size, data, vec->size);
+        else
+                memset(vec->data + vec->count * vec->size, 0, vec->size);
+        vec->count++;
+        return 0;
+}
diff --git a/vector.h b/vector.h
new file mode 100644
index 0000000..c64eb1f
--- /dev/null
+++ b/vector.h
@@ -0,0 +1,17 @@
+#ifndef CGIT_VECTOR_H
+#define CGIT_VECTOR_H
+
+#include <stdlib.h>
+
+struct vector {
+        size_t size;
+        size_t count;
+        size_t alloc;
+        void *data;
+};
+
+#define VECTOR_INIT(type) {sizeof(type), 0, 0, NULL}
+
+int vector_push(struct vector *vec, const void *data, int gently);
+
+#endif /* CGIT_VECTOR_H */