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;