17 files changed, 703 insertions, 58 deletions

diff --git a/Makefile b/Makefile
index 3c7ec07..a52285e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.6.1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+INSTALL = install
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
@@ -88,6 +90,7 @@ OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
+OBJECTS += ui-stats.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o
@@ -128,22 +131,23 @@ cgit.o: VERSION
 -include $(OBJECTS:.o=.d)
 
 libgit:
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 
 test: all
         $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
-        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
-        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-        install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
+        $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        $(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
 
 uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-        rm -f $(CGIT_SCRIPT_PATH)/cgit.png
+        rm -f $(CGIT_DATA_PATH)/cgit.css
+        rm -f $(CGIT_DATA_PATH)/cgit.png
 
 clean:
         rm -f cgit VERSION *.o *.d
diff --git a/cgit.c b/cgit.c
index 166fbc6..608cab6 100644
--- a/cgit.c
+++ b/cgit.c
@@ -12,6 +12,7 @@
 #include "configfile.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-stats.h"
 #include "scan-tree.h"
 
 const char *cgit_version = CGIT_VERSION;
@@ -54,6 +55,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 ctx.cfg.enable_log_linecount = atoi(value);
+        else if (!strcmp(name, "max-stats"))
+                ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "cache-size"))
                 ctx.cfg.cache_size = atoi(value);
         else if (!strcmp(name, "cache-root"))
@@ -112,6 +115,8 @@ void config_cb(const char *name, const char *value)
                 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
         else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
                 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+        else if (ctx.repo && !strcmp(name, "repo.max-stats"))
+                ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (ctx.repo && !strcmp(name, "repo.module-link"))
                 ctx.repo->module_link= xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
@@ -158,6 +163,8 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.sort = xstrdup(value);
         } else if (!strcmp(name, "showmsg")) {
                 ctx.qry.showmsg = atoi(value);
+        } else if (!strcmp(name, "period")) {
+                ctx.qry.period = xstrdup(value);
         }
 }
 
@@ -181,6 +188,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.max_lock_attempts = 5;
         ctx->cfg.max_msg_len = 80;
         ctx->cfg.max_repodesc_len = 80;
+        ctx->cfg.max_stats = 0;
         ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
         ctx->cfg.renamelimit = -1;
         ctx->cfg.robots = "index, nofollow";
@@ -293,7 +301,6 @@ static void process_request(void *cbdata)
         cmd = cgit_get_cmd(ctx);
         if (!cmd) {
                 ctx->page.title = "cgit error";
-                ctx->repo = NULL;
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -439,28 +446,29 @@ int main(int argc, const char **argv)
         ctx.repo = NULL;
         http_parse_querystring(ctx.qry.raw, querystring_cb);
 
-        /* If virtual-root isn't specified in cgitrc and no url
-         * parameter is specified on the querystring, lets pretend
-         * that virtualroot equals SCRIPT_NAME and use PATH_INFO as
-         * url. This allows cgit to work with virtual urls without
-         * the need for rewriterules in the webserver (as long as
-         * PATH_INFO is included in the cache lookup key).
+        /* If virtual-root isn't specified in cgitrc, lets pretend
+         * that virtual-root equals SCRIPT_NAME.
          */
-        if (!ctx.cfg.virtual_root && !ctx.qry.url) {
+        if (!ctx.cfg.virtual_root)
                 ctx.cfg.virtual_root = ctx.cfg.script_name;
-                path = getenv("PATH_INFO");
-                if (path) {
-                        if (path[0] == '/')
-                                path++;
-                        ctx.qry.url = xstrdup(path);
-                        if (ctx.qry.raw) {
-                                qry = ctx.qry.raw;
-                                ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
-                                free(qry);
-                        } else
-                                ctx.qry.raw = ctx.qry.url;
-                        cgit_parse_url(ctx.qry.url);
-                }
+
+        /* If no url parameter is specified on the querystring, lets
+         * use PATH_INFO as url. This allows cgit to work with virtual
+         * urls without the need for rewriterules in the webserver (as
+         * long as PATH_INFO is included in the cache lookup key).
+         */
+        path = getenv("PATH_INFO");
+        if (!ctx.qry.url && path) {
+                if (path[0] == '/')
+                        path++;
+                ctx.qry.url = xstrdup(path);
+                if (ctx.qry.raw) {
+                        qry = ctx.qry.raw;
+                        ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
+                        free(qry);
+                } else
+                        ctx.qry.raw = ctx.qry.url;
+                cgit_parse_url(ctx.qry.url);
         }
 
         ttl = calc_ttl();
diff --git a/cgit.css b/cgit.css
index 068c37b..f844efa 100644
--- a/cgit.css
+++ b/cgit.css
@@ -476,3 +476,103 @@ div.footer {
         font-size: 80%;
         color: #ccc;
 }
+a.branch-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #88ff88;
+        border: solid 1px #007700;
+}
+a.tag-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ffff88;
+        border: solid 1px #777700;
+}
+a.remote-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ccccff;
+        border: solid 1px #000077;
+}
+a.deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ff8888;
+        border: solid 1px #770000;
+}
+table.stats {
+        border: solid 1px black;
+        border-collapse: collapse;
+}
+
+table.stats th {
+        text-align: left;
+        padding: 1px 0.5em;
+        background-color: #eee;
+        border: solid 1px black;
+}
+
+table.stats td {
+        text-align: right;
+        padding: 1px 0.5em;
+        border: solid 1px black;
+}
+
+table.stats td.total {
+        font-weight: bold;
+        text-align: left;
+}
+
+table.stats td.sum {
+        color: #c00;
+        font-weight: bold;
+/*      background-color: #eee; */
+}
+
+table.stats td.left {
+        text-align: left;
+}
+
+table.vgraph {
+        border-collapse: separate;
+        border: solid 1px black;
+        height: 200px;
+}
+
+table.vgraph th {
+        background-color: #eee;
+        font-weight: bold;
+        border: solid 1px white;
+        padding: 1px 0.5em;
+}
+
+table.vgraph td {
+        vertical-align: bottom;
+        padding: 0px 10px;
+}
+
+table.vgraph div.bar {
+        background-color: #eee;
+}
+
+table.hgraph {
+        border: solid 1px black;
+        width: 800px;
+}
+
+table.hgraph th {
+        background-color: #eee;
+        font-weight: bold;
+        border: solid 1px black;
+        padding: 1px 0.5em;
+}
+
+table.hgraph td {
+        vertical-align: center;
+        padding: 2px 2px;
+}
+
+table.hgraph div.bar {
+        background-color: #eee;
+        height: 1em;
+}
diff --git a/cgit.h b/cgit.h
index cb2f176..4fe94c6 100644
--- a/cgit.h
+++ b/cgit.h
@@ -61,6 +61,7 @@ struct cgit_repo {
         int snapshots;
         int enable_log_filecount;
         int enable_log_linecount;
+        int max_stats;
         time_t mtime;
 };
 
@@ -120,6 +121,7 @@ struct cgit_query {
         char *name;
         char *mimetype;
         char *url;
+        char *period;
         int   ofs;
         int nohead;
         char *sort;
@@ -160,6 +162,7 @@ struct cgit_config {
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
+        int max_stats;
         int nocache;
         int renamelimit;
         int snapshots;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7887b02..09f56a6 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -129,6 +129,11 @@ max-repodesc-length
         Specifies the maximum number of repo description characters to display
         on the repository index page. Default value: "80".
 
+max-stats
+        Set the default maximum statistics period. Valid values are "week",
+        "month", "quarter" and "year". If unspecified, statistics are
+        disabled. Default value: none. See also: "repo.max-stats".
+
 module-link
         Text which will be used as the formatstring for a hyperlink when a
         submodule is printed in a directory listing. The arguments for the
@@ -218,6 +223,11 @@ repo.enable-log-linecount
         A flag which can be used to disable the global setting
         `enable-log-linecount'. Default value: none.
 
+repo.max-stats
+        Override the default maximum statistics period. Valid values are equal
+        to the values specified for the global "max-stats" setting. Default
+        value: none.
+
 repo.name
         The value to show as repository name. Default value: <repo.url>.
 
@@ -276,6 +286,10 @@ favicon=/favicon.ico
 logo=/img/mylogo.png
 
 
+# Enable statistics per week, month and quarter
+max-stats=quarter
+
+
 # Set the title and heading of the repository index page
 root-title=foobar.com git repositories
 
@@ -288,8 +302,8 @@ root-desc=tracking the foobar development
 root-readme=/var/www/htdocs/about.html
 
 
-# Allow download of tar.gz, tar.bz and zip-files
-snapshots=tar.gz tar.bz zip
+# Allow download of tar.gz, tar.bz2 and zip-files
+snapshots=tar.gz tar.bz2 zip
 
 
 ##
@@ -348,6 +362,9 @@ repo.snapshots=0
 # Disable line-counts for this repo
 repo.enable-log-linecount=0
 
+# Restrict the max statistics period for this repo
+repo.max-stats=month
+
 
 BUGS
 ----
diff --git a/cmd.c b/cmd.c
index 8914fa5..cf97da7 100644
--- a/cmd.c
+++ b/cmd.c
@@ -21,6 +21,7 @@
 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"
+#include "ui-stats.h"
 #include "ui-summary.h"
 #include "ui-tag.h"
 #include "ui-tree.h"
@@ -108,6 +109,11 @@ static void snapshot_fn(struct cgit_context *ctx)
                             ctx->repo->snapshots, ctx->qry.nohead);
 }
 
+static void stats_fn(struct cgit_context *ctx)
+{
+        cgit_show_stats(ctx);
+}
+
 static void summary_fn(struct cgit_context *ctx)
 {
         cgit_print_summary();
@@ -144,6 +150,7 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
                 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),
diff --git a/shared.c b/shared.c
index a764c4d..578a544 100644
--- a/shared.c
+++ b/shared.c
@@ -58,6 +58,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->snapshots = ctx.cfg.snapshots;
         ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
         ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
+        ret->max_stats = ctx.cfg.max_stats;
         ret->module_link = ctx.cfg.module_link;
         ret->readme = NULL;
         ret->mtime = -1;
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index d97c465..8ab4912 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -4,36 +4,36 @@
 
 prepare_tests "Verify snapshot"
 
-run_test 'get foo/snapshot/test.tar.gz' '
-        cgit_url "foo/snapshot/test.tar.gz" >trash/tmp
+run_test 'get foo/snapshot/master.tar.gz' '
+        cgit_url "foo/snapshot/master.tar.gz" >trash/tmp
 '
 
 run_test 'check html headers' '
         head -n 1 trash/tmp |
-             grep -e "Content-Type: application/x-tar" &&
+             grep -e "Content-Type: application/x-gzip" &&
 
         head -n 2 trash/tmp |
-             grep -e "Content-Disposition: inline; filename=.test.tar.gz."
+             grep -e "Content-Disposition: inline; filename=.master.tar.gz."
 '
 
 run_test 'strip off the header lines' '
-         tail -n +6 trash/tmp > trash/test.tar.gz
+         tail -n +6 trash/tmp > trash/master.tar.gz
 '
 
-run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz'
+run_test 'verify gzip format' 'gunzip --test trash/master.tar.gz'
 run_test 'untar' '
-        rm -rf trash/foo &&
-        tar -xf trash/test.tar.gz -C trash
+        rm -rf trash/master &&
+        tar -xf trash/master.tar.gz -C trash
 '
 
 run_test 'count files' '
-        c=$(ls -1 trash/foo/ | wc -l) &&
+        c=$(ls -1 trash/master/ | wc -l) &&
         test $c = 5
 '
 
 run_test 'verify untarred file-5' '