Makefile: fetch git tarballs from http://hjemli.net/git/git/

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 76d26dd99e902c0e651c33c9f40dd64428c5f6b7..3778a5ba440313ca439190217ffb7b458e337e53 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -10,7 +10,6 @@
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;

-int cgit_cmd;

 
 int chk_zero(int result, char *msg)
 {
 
 int chk_zero(int result, char *msg)
 {


@@ -57,12 +56,14 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->section = ctx.cfg.section;
        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;
        ret->section = ctx.cfg.section;
        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;

+       ret->enable_commit_graph = ctx.cfg.enable_commit_graph;

        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;

+       ret->enable_subject_links = ctx.cfg.enable_subject_links;

        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;

-       ret->readme = NULL;
+       ret->readme = ctx.cfg.readme;

        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;


@@ -99,23 +100,15 @@ void *cgit_free_commitinfo(struct commitinfo *info)
 char *trim_end(const char *str, char c)
 {
        int len;
 char *trim_end(const char *str, char c)
 {
        int len;

-       char *s, *t;

 
        if (str == NULL)
                return NULL;
 
        if (str == NULL)
                return NULL;

-       t = (char *)str;
-       len = strlen(t);
-       while(len > 0 && t[len - 1] == c)
+       len = strlen(str);
+       while(len > 0 && str[len - 1] == c)

                len--;
                len--;

-

        if (len == 0)
                return NULL;
        if (len == 0)
                return NULL;

-
-       c = t[len];
-       t[len] = '\0';
-       s = xstrdup(t);
-       t[len] = c;
-       return s;
+       return xstrndup(str, len);

 }
 
 char *strlpart(char *txt, int maxlen)
 }
 
 char *strlpart(char *txt, int maxlen)


@@ -263,7 +256,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,
 
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,

-                   unsigned long *new_size, int *binary, linediff_fn fn)
+                   unsigned long *new_size, int *binary, int context,
+                   int ignorews, linediff_fn fn)

 {
        mmfile_t file1, file2;
        xpparam_t diff_params;
 {
        mmfile_t file1, file2;
        xpparam_t diff_params;


@@ -279,6 +273,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
        if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
            (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
                *binary = 1;
        if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
            (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
                *binary = 1;

+               if (file1.size)
+                       free(file1.ptr);
+               if (file2.size)
+                       free(file2.ptr);

                return 0;
        }
 
                return 0;
        }
 


@@ -286,20 +284,25 @@ int cgit_diff_files(const unsigned char *old_sha1,
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;

-       emit_params.ctxlen = 3;
+       if (ignorews)
+               diff_params.flags |= XDF_IGNORE_WHITESPACE;
+       emit_params.ctxlen = context > 0 ? context : 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);
        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);

+       if (file1.size)
+               free(file1.ptr);
+       if (file2.size)
+               free(file2.ptr);

        return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,
        return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,

-                   filepair_fn fn, const char *prefix)
+                   filepair_fn fn, const char *prefix, int ignorews)

 {
        struct diff_options opt;
 {
        struct diff_options opt;

-       int ret;

        int prefixlen;
 
        diff_setup(&opt);
        int prefixlen;
 
        diff_setup(&opt);


@@ -307,6 +310,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
        DIFF_OPT_SET(&opt, RECURSIVE);
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
        DIFF_OPT_SET(&opt, RECURSIVE);

+       if (ignorews)
+               DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);

        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {


@@ -318,20 +323,21 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        diff_setup_done(&opt);
 
        if (old_sha1 && !is_null_sha1(old_sha1))
        diff_setup_done(&opt);
 
        if (old_sha1 && !is_null_sha1(old_sha1))

-               ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+               diff_tree_sha1(old_sha1, new_sha1, "", &opt);

        else
        else

-               ret = diff_root_tree_sha1(new_sha1, "", &opt);
+               diff_root_tree_sha1(new_sha1, "", &opt);

        diffcore_std(&opt);
        diff_flush(&opt);
 }
 
        diffcore_std(&opt);
        diff_flush(&opt);
 }
 

-void cgit_diff_commit(struct commit *commit, filepair_fn fn)
+void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)

 {
        unsigned char *old_sha1 = NULL;
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;
 {
        unsigned char *old_sha1 = NULL;
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;

-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+                      ctx.qry.ignorews);

 }
 
 int cgit_parse_snapshots_mask(const char *str)
 }
 
 int cgit_parse_snapshots_mask(const char *str)