Add knobs to enable/disable files/lines changed in log view

These columns can cause lots of IO on the server, so add settings to
explicitly enable them. Also, add per repo settings to optionally disable
the columns if sitewide enabled.

While at it, do not allow repo.snapshot to enable snapshots if the global
setting is disabled.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/shared.c b/shared.c
index 752ceac..53cd9b0 100644
--- a/shared.c
+++ b/shared.c
@@ -1,316 +1,328 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 struct repolist cgit_repolist;
 struct repoinfo *cgit_repo;
 
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
+int cgit_enable_log_filecount  =  0;
+int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
 int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
 
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;
 char *cgit_query_name   = NULL;
 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 
 int chk_zero(int result, char *msg)
 {
         if (result != 0)
                 die("%s: %s", msg, strerror(errno));
         return result;
 }
 
 int chk_positive(int result, char *msg)
 {
         if (result <= 0)
                 die("%s: %s", msg, strerror(errno));
         return result;
 }
 
 struct repoinfo *add_repo(const char *url)
 {
         struct repoinfo *ret;
 
         if (++cgit_repolist.count > cgit_repolist.length) {
                 if (cgit_repolist.length == 0)
                         cgit_repolist.length = 8;
                 else
                         cgit_repolist.length *= 2;
                 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
                                                cgit_repolist.length *
                                                sizeof(struct repoinfo));
         }
 
         ret = &cgit_repolist.repos[cgit_repolist.count-1];
         ret->url = xstrdup(url);
         ret->name = ret->url;
         ret->path = NULL;
         ret->desc = NULL;
         ret->owner = NULL;
         ret->defbranch = "master";
         ret->snapshots = cgit_snapshots;
+        ret->enable_log_filecount = cgit_enable_log_filecount;
+        ret->enable_log_linecount = cgit_enable_log_linecount;
         ret->module_link = cgit_module_link;
         return ret;
 }
 
 void cgit_global_config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root-title"))
                 cgit_root_title = xstrdup(value);
         else if (!strcmp(name, "css"))
                 cgit_css = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 cgit_logo = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 cgit_logo_link = xstrdup(value);
         else if (!strcmp(name, "module-link"))
                 cgit_module_link = xstrdup(value);
         else if (!strcmp(name, "virtual-root"))
                 cgit_virtual_root = xstrdup(value);
         else if (!strcmp(name, "nocache"))
                 cgit_nocache = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 cgit_snapshots = atoi(value);
+        else if (!strcmp(name, "enable-log-filecount"))
+                cgit_enable_log_filecount = atoi(value);
+        else if (!strcmp(name, "enable-log-linecount"))
+                cgit_enable_log_linecount = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 cgit_cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))
                 cgit_cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 cgit_cache_repo_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 cgit_cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 cgit_cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 cgit_max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 cgit_max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 cgit_max_commit_count = atoi(value);
         else if (!strcmp(name, "repo.url"))
                 cgit_repo = add_repo(value);
         else if (!strcmp(name, "repo.name"))
                 cgit_repo->name = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.path"))
                 cgit_repo->path = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.desc"))
                 cgit_repo->desc = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.owner"))
                 cgit_repo->owner = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.defbranch"))
                 cgit_repo->defbranch = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.snapshots"))
-                cgit_repo->snapshots = atoi(value);
+                cgit_repo->snapshots = cgit_snapshots * atoi(value);
+        else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
+                cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
+        else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
+                cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
         else if (cgit_repo && !strcmp(name, "repo.module-link"))
                 cgit_repo->module_link= xstrdup(value);
         else if (!strcmp(name, "include"))
                 cgit_read_config(value, cgit_global_config_cb);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
 {
         if (!strcmp(name,"r")) {
                 cgit_query_repo = xstrdup(value);
         } else if (!strcmp(name, "p")) {
                 cgit_query_page = xstrdup(value);
         } else if (!strcmp(name, "q")) {
                 cgit_query_search = xstrdup(value);
         } else if (!strcmp(name, "h")) {
                 cgit_query_head = xstrdup(value);
                 cgit_query_has_symref = 1;
         } else if (!strcmp(name, "id")) {
                 cgit_query_sha1 = xstrdup(value);
                 cgit_query_has_sha1 = 1;
         } else if (!strcmp(name, "id2")) {
                 cgit_query_sha2 = xstrdup(value);
                 cgit_query_has_sha1 = 1;
         } else if (!strcmp(name, "ofs")) {
                 cgit_query_ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
                 cgit_query_path = xstrdup(value);
         } else if (!strcmp(name, "name")) {
                 cgit_query_name = xstrdup(value);
         }
 }
 
 void *cgit_free_commitinfo(struct commitinfo *info)
 {
         free(info->author);
         free(info->author_email);
         free(info->committer);
         free(info->committer_email);
         free(info->subject);
         free(info);
         return NULL;
 }
 
 int hextoint(char c)
 {
         if (c >= 'a' && c <= 'f')
                 return 10 + c - 'a';
         else if (c >= 'A' && c <= 'F')
                 return 10 + c - 'A';
         else if (c >= '0' && c <= '9')
                 return c - '0';
         else
                 return -1;
 }
 
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                        struct diff_options *options, void *data)
 {
         int i;
 
         for (i = 0; i < q->nr; i++) {
                 if (q->queue[i]->status == 'U')
                         continue;
                 ((filepair_fn)data)(q->queue[i]);
         }
 }
 
 static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
 {
         enum object_type type;
 
         if (is_null_sha1(sha1)) {
                 file->ptr = (char *)"";
                 file->size = 0;
         } else {
                 file->ptr = read_sha1_file(sha1, &type, &file->size);
         }
         return 1;
 }
 
 /*
  * Receive diff-buffers from xdiff and concatenate them as
  * needed across multiple callbacks.
  *
  * This is basically a copy of xdiff-interface.c/xdiff_outf(),
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */
 char *diffbuf = NULL;
 int buflen = 0;
 
 int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 {
         int i;
 
         for (i = 0; i < nbuf; i++) {
                 if (mb[i].ptr[mb[i].size-1] != '\n') {
                         /* Incomplete line */
                         diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
                         memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
                         buflen += mb[i].size;
                         continue;
                 }
 
                 /* we have a complete line */
                 if (!diffbuf) {
                         ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
                         continue;
                 }
                 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
                 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
                 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
                 free(diffbuf);
                 diffbuf = NULL;
                 buflen = 0;
         }
         if (diffbuf) {
                 ((linediff_fn)priv)(diffbuf, buflen);
                 free(diffbuf);
                 diffbuf = NULL;
                 buflen = 0;
         }
         return 0;
 }
 
 int cgit_diff_files(const unsigned char *old_sha1,
                      const unsigned char *new_sha1,
                      linediff_fn fn)
 {
         mmfile_t file1, file2;
         xpparam_t diff_params;
         xdemitconf_t emit_params;
         xdemitcb_t emit_cb;
 
         if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
                 return 1;
 
         diff_params.flags = XDF_NEED_MINIMAL;
         emit_params.ctxlen = 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
         emit_cb.outf = filediff_cb;
         emit_cb.priv = fn;
         xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
         return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
                     filepair_fn fn)
 {
         struct diff_options opt;
         int ret;
 
         diff_setup(&opt);
         opt.output_format = DIFF_FORMAT_CALLBACK;
         opt.detect_rename = 1;
         opt.recursive = 1;
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
         diff_setup_done(&opt);
 
         if (old_sha1)
                 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
         else
                 ret = diff_root_tree_sha1(new_sha1, "", &opt);
         diffcore_std(&opt);
         diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 {
         unsigned char *old_sha1 = NULL;
 
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
         cgit_diff_tree(old_sha1, commit->object.sha1, fn);
 }