Simplify commit and tag parsing

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index db60107e7c2839fbad98a688db803cfb13602bca..02ddddaa2bf669b3d65dd4f5570a013a8f1a7dd7 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -91,6 +91,12 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                        repo->source_filter = cgit_new_filter(value, SOURCE);
                else if (!strcmp(name, "email-filter"))
                        repo->email_filter = cgit_new_filter(value, EMAIL);
+               else if (!strcmp(name, "owner-filter"))
+                       repo->owner_filter = cgit_new_filter(value, OWNER);
+       } else if (!strcmp(name, "hide")) {
+               repo->hide = atoi(value);
+       } else if (!strcmp(name, "ignore")) {
+               repo->ignore = atoi(value);
        }
 }
 
@@ -194,6 +200,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
        else if (!strcmp(name, "email-filter"))
                ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);
+       else if (!strcmp(name, "owner-filter"))
+               ctx.cfg.owner_filter = cgit_new_filter(value, OWNER);
        else if (!strcmp(name, "auth-filter"))
                ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
        else if (!strcmp(name, "embedded"))
@@ -457,7 +465,7 @@ static char *guess_defbranch(void)
        const char *ref;
        unsigned char sha1[20];
 
-       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
        if (!ref || !starts_with(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);
@@ -595,7 +603,7 @@ static int prepare_repo_cmd(void)
                free(tmp);
                return 1;
        }
-       sort_string_list(&ctx.repo->submodules);
+       string_list_sort(&ctx.repo->submodules);
        cgit_prepare_repo_env(ctx.repo);
        choose_readme(ctx.repo);
        return 0;
@@ -800,6 +808,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
        if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
                cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");
+       if (repo->owner_filter && repo->owner_filter != ctx.cfg.owner_filter)
+               cgit_fprintf_filter(repo->owner_filter, f, "repo.owner-filter=");
        if (repo->snapshots != ctx.cfg.snapshots) {
                char *tmp = build_snapshot_setting(repo->snapshots);
                fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");
@@ -822,6 +832,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                else if (repo->commit_sort == 2)
                        fprintf(f, "repo.commit-sort=topo\n");
        }
+       fprintf(f, "repo.hide=%d\n", repo->hide);
+       fprintf(f, "repo.ignore=%d\n", repo->ignore);
        fprintf(f, "\n");
 }