Use standard tree-diff function when showing diffstat for single commit

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 6fd70a80cbd6dc92f3f68859e205b648703c8103..f8a17b6826a83e3ffb0d483cfb31858df22cc5a7 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -15,11 +15,13 @@ 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_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
+int cgit_snapshots             =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
@@ -44,10 +46,25 @@ 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;
@@ -57,8 +74,8 @@ struct repoinfo *add_repo(const char *url)
                        cgit_repolist.length = 8;
                else
                        cgit_repolist.length *= 2;
-               cgit_repolist.repos = xrealloc(cgit_repolist.repos, 
-                                              cgit_repolist.length * 
+               cgit_repolist.repos = xrealloc(cgit_repolist.repos,
+                                              cgit_repolist.length *
                                               sizeof(struct repoinfo));
        }
 
@@ -68,6 +85,8 @@ struct repoinfo *add_repo(const char *url)
        ret->path = NULL;
        ret->desc = NULL;
        ret->owner = NULL;
+       ret->snapshots = cgit_snapshots;
+       ret->module_link = cgit_module_link;
        return ret;
 }
 
@@ -81,10 +100,14 @@ void cgit_global_config_cb(const char *name, const char *value)
                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, "cache-root"))
                cgit_cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
@@ -107,6 +130,10 @@ void cgit_global_config_cb(const char *name, const char *value)
                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.snapshots"))
+               cgit_repo->snapshots = atoi(value);
+       else if (cgit_repo && !strcmp(name, "repo.module-link"))
+               cgit_repo->module_link= xstrdup(value);
 }
 
 void cgit_repo_config_cb(const char *name, const char *value)
@@ -140,6 +167,8 @@ void cgit_querystring_cb(const char *name, const char *value)
                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);
        }
 }
 
@@ -166,3 +195,46 @@ int hextoint(char c)
                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]);
+       }
+}
+
+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);
+}