cgit.css: try to make diffs look a little bit nicer

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 19d2df04d9071dea4cd7bf238e6090c6f89a46ac..ffecac888a76ea870df4811741d19cb61c1d662e 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -30,6 +30,7 @@ int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 
 int cgit_max_msg_len = 60;
+int cgit_max_commit_count = 50;
 
 char *cgit_repo_name    = NULL;
 char *cgit_repo_desc    = NULL;
@@ -74,8 +75,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));
        }
 
@@ -120,6 +121,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_cache_dynamic_ttl = atoi(value);
        else if (!strcmp(name, "max-message-length"))
                cgit_max_msg_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"))
@@ -195,3 +198,125 @@ 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]);
+       }
+}
+
+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);
+}