22 files changed, 929 insertions, 614 deletions

diff --git a/.gitignore b/.gitignore
index c4c9ac3..5664962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Files I don't care to see in git-status/commit
 cgit
+VERSION
 *.o
 *~
diff --git a/.gitmodules b/.gitmodules
index 51dd1ef..1daea94 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,3 @@
-# This file maps a submodule path to an url from where the submodule
-# can be obtained. The script "submodules.sh" finds the url in this file
-# when invoked with -i to clone the submodules.
-
-git             git://git.kernel.org/pub/scm/git/git.git
+[submodule "git"]
+        url = git://git.kernel.org/pub/scm/git/git.git
+        path = git
diff --git a/Makefile b/Makefile
index 57f80f8..fcbe3e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,87 +1,71 @@
-CGIT_VERSION = 0.5
-
-prefix = /var/www/htdocs/cgit
-
-SHA1_HEADER = <openssl/sha.h>
-CACHE_ROOT = /var/cache/cgit
-CGIT_CONFIG = /etc/cgitrc
+CGIT_VERSION = v0.5
 CGIT_SCRIPT_NAME = cgit.cgi
+CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_CONFIG = /etc/cgitrc
+CACHE_ROOT = /var/cache/cgit
+SHA1_HEADER = <openssl/sha.h>
+GIT_VER = 1.5.2
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
+
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
-        ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o ui-blob.o
+        ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
+        ui-snapshot.o ui-blob.o ui-tag.o
+
+
+.PHONY: all git install clean distclean force-version get-git
 
-CFLAGS += -Wall
+all: cgit git
 
-ifdef DEBUG
-        CFLAGS += -g
-endif
+VERSION: force-version
+        @./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION
 
-CFLAGS += -Igit
+
+CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 
 
-#
-# If make is run on a nongit platform, get the git sources as a tarball.
-#
-GITVER = $(shell git version 2>/dev/null || echo nogit)
-ifeq ($(GITVER),nogit)
-GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
-INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
-else
-INITGIT = ./submodules.sh -i
-endif
-
-
-#
-# basic build rules
-#
-all: cgit
-
-cgit: cgit.c cgit.h $(OBJECTS)
+cgit: cgit.c $(OBJECTS)
         $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): cgit.h git/libgit.a
+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
-git/libgit.a:
-        $(INITGIT)
-        $(MAKE) -C git
+git/xdiff/lib.a: | git
 
-#
-# phony targets
-#
-install: all clean-cache
-        mkdir -p $(prefix)
-        install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
-        install cgit.css $(prefix)/cgit.css
+git/libgit.a: | git
 
-clean-cgit:
-        rm -f cgit *.o
+git:
+        cd git && $(MAKE) xdiff/lib.a
+        cd git && $(MAKE) libgit.a
 
-distclean-cgit: clean-cgit
-        git clean -d -x
-
-clean-sub:
-        $(MAKE) -C git clean
-
-distclean-sub: clean-sub
-        $(shell cd git && git clean -d -x)
-
-clean-cache:
+install: all
+        mkdir -p $(CGIT_SCRIPT_PATH)
+        install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css
         rm -rf $(CACHE_ROOT)/*
 
-clean: clean-cgit clean-sub
+uninstall:
+        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        rm -f $(CGIT_SCRIPT_PATH)/cgit.css
+        rm -rf $(CACHE_ROOT)
+
+clean:
+        rm -f cgit VERSION *.o
+        cd git && $(MAKE) clean
 
-distclean: distclean-cgit distclean-sub
+distclean: clean
+        git clean -d -x
+        cd git && git clean -d -x
 
-.PHONY: all install clean clean-cgit clean-sub clean-cache \
-        distclean distclean-cgit distclean-sub
+get-git:
+        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cgit.c b/cgit.c
index 34e590e..c86d290 100644
--- a/cgit.c
+++ b/cgit.c
@@ -8,9 +8,6 @@
 
 #include "cgit.h"
 
-const char cgit_version[] = CGIT_VERSION;
-
-
 static int cgit_prepare_cache(struct cacheitem *item)
 {
         if (!cgit_repo && cgit_query_repo) {
@@ -29,13 +26,15 @@ static int cgit_prepare_cache(struct cacheitem *item)
         }
 
         if (!cgit_cmd) {
-                item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url)));
+                item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
+                                         cache_safe_filename(cgit_repo->url),
+                                         cache_safe_filename(cgit_querystring)));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url), cgit_query_page,
-                           cache_safe_filename(cgit_querystring)));
+                                         cache_safe_filename(cgit_repo->url),
+                                         cgit_query_page,
+                                         cache_safe_filename(cgit_querystring)));
                 if (cgit_query_has_symref)
                         item->ttl = cgit_cache_dynamic_ttl;
                 else if (cgit_query_has_sha1)
@@ -69,8 +68,10 @@ static void cgit_print_repo_page(struct cacheitem *item)
         setenv("GIT_DIR", cgit_repo->path, 1);
 
         if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
-                cgit_print_snapshot(item, cgit_query_sha1, "zip",
-                                    cgit_repo->url, cgit_query_name);
+                cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
+                                    cgit_repobasename(cgit_repo->url),
+                                    cgit_query_path,
+                                    cgit_repo->snapshots );
                 return;
         }
 
@@ -92,22 +93,21 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
         switch(cgit_cmd) {
         case CMD_LOG:
-                cgit_print_log(cgit_query_head, cgit_query_ofs,
+                cgit_print_log(cgit_query_sha1, cgit_query_ofs,
                                cgit_max_commit_count, cgit_query_search,
                                cgit_query_path, 1);
                 break;
         case CMD_TREE:
-                cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
+                cgit_print_tree(cgit_query_sha1, cgit_query_path);
                 break;
         case CMD_COMMIT:
-                cgit_print_commit(cgit_query_head);
+                cgit_print_commit(cgit_query_sha1);
                 break;
-        case CMD_VIEW:
-                cgit_print_view(cgit_query_sha1, cgit_query_path);
+        case CMD_TAG:
+                cgit_print_tag(cgit_query_sha1);
                 break;
         case CMD_DIFF:
-                cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
-                                cgit_query_path);
+                cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
                 break;
         default:
                 cgit_print_error("Invalid request");
@@ -227,6 +227,7 @@ static void cgit_parse_args(int argc, const char **argv)
 int main(int argc, const char **argv)
 {
         struct cacheitem item;
+        const char *cgit_config_env = getenv("CGIT_CONFIG");
 
         htmlfd = STDOUT_FILENO;
         item.st.st_mtime = time(NULL);
@@ -234,7 +235,8 @@ int main(int argc, const char **argv)
         cgit_repolist.count = 0;
         cgit_repolist.repos = NULL;
 
-        cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+        cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+                         cgit_global_config_cb);
         cgit_repo = NULL;
         if (getenv("SCRIPT_NAME"))
                 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
diff --git a/cgit.css b/cgit.css
index 8977533..54bbfcc 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,6 +1,7 @@
 body {
-        font-family: arial;
+        font-family: arial, sans-serif;
         font-size: 11pt;
+        color: black;
         background: white;
 }
 
@@ -94,6 +95,14 @@ td#header {
         vertical-align: text-bottom;
 }
 
+td#header a {
+        color: #666;
+}
+
+td#header a:hoved {
+        text-decoration: underline;
+}
+
 td#logo {
         text-align: right;
         vertical-align: middle;
@@ -114,15 +123,19 @@ td#crumb {
 
 td#crumb a {
         color: #ccc;
+        background-color: #666;
+        padding: 0em 0.5em 0em 0.5em;
 }
 
 td#crumb a:hover {
-        color: #eee;
+        color: #666;
+        background-color: #ccc;
+        text-decoration: none;
 }
 
 td#search {
         text-align: right;
-        vertical-align: center;
+        vertical-align: middle;
         padding-right: 0.5em;
 }
 
@@ -171,35 +184,47 @@ div.error {
         margin: 1em 2em;
 }
 
-td.ls-blob, td.ls-dir, td.ls-mod {
+a.ls-blob, a.ls-dir, a.ls-mod {
         font-family: monospace;
 }
 
-div.ls-dir a {
-        font-weight: bold;
+td.ls-size {
+        text-align: right;
 }
 
-th.filesize, td.filesize {
-        text-align: right;
+td.ls-size {
+        font-family: monospace;
 }
 
-td.filesize {
+td.ls-mode {
         font-family: monospace;
 }
 
-td.links {
-        font-size: 80%;
-        padding-left: 2em;
+table.blob {
+        margin-top: 0.5em;
+        border-top: solid 1px black;
 }
 
-td.filemode {
-        font-family: monospace;
+table.blob td.no {
+        border-right: solid 1px black;
+        color: black;
+        background-color: #eee;
+        text-align: right;
+}
+
+table.blob td.no a {
+        color: black;
 }
 
-td.blob {
+table.blob td.no a:hover {
+        color: black;
+        text-decoration: none;
+}
+
+table.blob td.txt {
         white-space: pre;
         font-family: monospace;
-        background-color: white;
+        padding-left: 0.5em;
 }
 
 table.nowrap td {
@@ -215,6 +240,7 @@ table.commit-info th {
         text-align: left;
         font-weight: normal;
         padding: 0.1em 1em 0.1em 0.1em;
+        vertical-align: top;
 }
 
 table.commit-info td {
@@ -287,7 +313,7 @@ table.diffstat td.upd a {
 
 table.diffstat td.graph {
         width: 75%;
-        vertical-align: center;
+        vertical-align: middle;
 }
 
 table.diffstat td.graph table {
@@ -308,10 +334,6 @@ table.diffstat td.graph td.rem {
         background-color: #c55;
 }
 
-table.diffstat td.graph td.none {
-        background-color: none;
-}
-
 div.diffstat-summary {
         color: #888;
         padding-top: 0.5em;
@@ -340,7 +362,7 @@ table.diff td div.del {
 }
 
 .sha1 {
-        font-family: courier;
+        font-family: monospace;
         font-size: 90%;
 }
 
@@ -359,16 +381,17 @@ table.list td.repogroup {
 
 a.button {
         font-size: 80%;
-        color: #333;
-        background-color: #ccc;
-        border: solid 1px #999;
+        color: #aaa;
+        background-color: #eee;
+        border: solid 1px #aaa;
         padding: 0em 0.5em;
         margin: 0.1em 0.25em;
 }
 
 a.button:hover {
         text-decoration: none;
-        background-color: #eee;
+        color: #333;
+        background-color: #ccc;
 }
 
 a.primary {
diff --git a/cgit.h b/cgit.h
index 2f3fca1..e3d9cb8 100644
--- a/cgit.h
+++ b/cgit.h
@@ -25,10 +25,9 @@
 #define CMD_COMMIT   2
 #define CMD_DIFF     3
 #define CMD_TREE     4
-#define CMD_VIEW     5
-#define CMD_BLOB     6
-#define CMD_SNAPSHOT 7
-
+#define CMD_BLOB     5
+#define CMD_SNAPSHOT 6
+#define CMD_TAG      7
 
 /*
  * Dateformats used on misc. pages
@@ -99,7 +98,7 @@ struct taginfo {
         char *msg;
 };
 
-extern const char cgit_version[];
+extern const char *cgit_version;
 
 extern struct repolist cgit_repolist;
 extern struct repoinfo *cgit_repo;
@@ -119,6 +118,7 @@ extern char *cgit_repo_group;
 
 extern int cgit_nocache;