log: allow users to follow a file

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 09fce0c7a49163a902a0e6675d9d8dbd7ee26465..d84b4be370bb17136430ffe40b2aa1e7eb677232 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -69,7 +69,7 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);

-       else if (!prefixcmp(name, "module-link.")) {
+       else if (starts_with(name, "module-link.")) {

                item = string_list_append(&repo->submodules, xstrdup(name + 12));
                item->util = xstrdup(value);
        } else if (!strcmp(name, "section"))
                item = string_list_append(&repo->submodules, xstrdup(name + 12));
                item->util = xstrdup(value);
        } else if (!strcmp(name, "section"))


@@ -82,6 +82,10 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);

+       else if (!strcmp(name, "hide"))
+               repo->hide = atoi(value);
+       else if (!strcmp(name, "ignore"))
+               repo->ignore = atoi(value);

        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);
        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);


@@ -91,6 +95,8 @@ 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);
                        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);

        }
 }
 
        }
 }
 


@@ -102,7 +108,7 @@ static void config_cb(const char *name, const char *value)
                ctx.repo = cgit_add_repo(value);
        else if (ctx.repo && !strcmp(name, "repo.path"))
                ctx.repo->path = trim_end(value, '/');
                ctx.repo = cgit_add_repo(value);
        else if (ctx.repo && !strcmp(name, "repo.path"))
                ctx.repo->path = trim_end(value, '/');

-       else if (ctx.repo && !prefixcmp(name, "repo."))
+       else if (ctx.repo && starts_with(name, "repo."))

                repo_config(ctx.repo, name + 5, value);
        else if (!strcmp(name, "readme") && value != NULL)
                string_list_append(&ctx.cfg.readme, xstrdup(value));
                repo_config(ctx.repo, name + 5, value);
        else if (!strcmp(name, "readme") && value != NULL)
                string_list_append(&ctx.cfg.readme, xstrdup(value));


@@ -146,6 +152,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);

+       else if (!strcmp(name, "enable-follow-links"))
+               ctx.cfg.enable_follow_links = atoi(value);

        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))


@@ -184,6 +192,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.cache_dynamic_ttl = atoi(value);
        else if (!strcmp(name, "cache-about-ttl"))
                ctx.cfg.cache_about_ttl = atoi(value);
                ctx.cfg.cache_dynamic_ttl = atoi(value);
        else if (!strcmp(name, "cache-about-ttl"))
                ctx.cfg.cache_about_ttl = atoi(value);

+       else if (!strcmp(name, "cache-snapshot-ttl"))
+               ctx.cfg.cache_snapshot_ttl = atoi(value);

        else if (!strcmp(name, "case-sensitive-sort"))
                ctx.cfg.case_sensitive_sort = atoi(value);
        else if (!strcmp(name, "about-filter"))
        else if (!strcmp(name, "case-sensitive-sort"))
                ctx.cfg.case_sensitive_sort = atoi(value);
        else if (!strcmp(name, "about-filter"))


@@ -192,6 +202,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);
                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"))
        else if (!strcmp(name, "auth-filter"))
                ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
        else if (!strcmp(name, "embedded"))


@@ -235,7 +247,7 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "side-by-side-diffs"))
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "side-by-side-diffs"))

-               ctx.cfg.ssdiff = atoi(value);
+               ctx.cfg.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;

        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "mimetype-file"))
        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "mimetype-file"))


@@ -262,7 +274,7 @@ static void config_cb(const char *name, const char *value)
                        ctx.cfg.branch_sort = 1;
                if (!strcmp(value, "name"))
                        ctx.cfg.branch_sort = 0;
                        ctx.cfg.branch_sort = 1;
                if (!strcmp(value, "name"))
                        ctx.cfg.branch_sort = 0;

-       } else if (!prefixcmp(name, "mimetype."))
+       } else if (starts_with(name, "mimetype."))

                add_mimetype(name + 9, value);
        else if (!strcmp(name, "include"))
                parse_configfile(expand_macros(value), config_cb);
                add_mimetype(name + 9, value);
        else if (!strcmp(name, "include"))
                parse_configfile(expand_macros(value), config_cb);


@@ -310,15 +322,21 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.showmsg = atoi(value);
        } else if (!strcmp(name, "period")) {
                ctx.qry.period = xstrdup(value);
                ctx.qry.showmsg = atoi(value);
        } else if (!strcmp(name, "period")) {
                ctx.qry.period = xstrdup(value);

+       } else if (!strcmp(name, "dt")) {
+               ctx.qry.difftype = atoi(value);
+               ctx.qry.has_difftype = 1;

        } else if (!strcmp(name, "ss")) {
        } else if (!strcmp(name, "ss")) {

-               ctx.qry.ssdiff = atoi(value);
-               ctx.qry.has_ssdiff = 1;
+               /* No longer generated, but there may be links out there. */
+               ctx.qry.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;
+               ctx.qry.has_difftype = 1;

        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
        } else if (!strcmp(name, "context")) {
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);
        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
        } else if (!strcmp(name, "context")) {
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);

+       } else if (!strcmp(name, "follow")) {
+               ctx.qry.follow = atoi(value);

        }
 }
 
        }
 }
 


@@ -331,6 +349,7 @@ static void prepare_context(void)
        ctx.cfg.cache_max_create_time = 5;
        ctx.cfg.cache_root = CGIT_CACHE_ROOT;
        ctx.cfg.cache_about_ttl = 15;
        ctx.cfg.cache_max_create_time = 5;
        ctx.cfg.cache_root = CGIT_CACHE_ROOT;
        ctx.cfg.cache_about_ttl = 15;

+       ctx.cfg.cache_snapshot_ttl = 5;

        ctx.cfg.cache_repo_ttl = 5;
        ctx.cfg.cache_root_ttl = 5;
        ctx.cfg.cache_scanrc_ttl = 15;
        ctx.cfg.cache_repo_ttl = 5;
        ctx.cfg.cache_root_ttl = 5;
        ctx.cfg.cache_scanrc_ttl = 15;


@@ -369,7 +388,7 @@ static void prepare_context(void)
        ctx.cfg.summary_log = 10;
        ctx.cfg.summary_tags = 10;
        ctx.cfg.max_atom_items = 10;
        ctx.cfg.summary_log = 10;
        ctx.cfg.summary_tags = 10;
        ctx.cfg.max_atom_items = 10;

-       ctx.cfg.ssdiff = 0;
+       ctx.cfg.difftype = DIFF_UNIFIED;

        ctx.env.cgit_config = getenv("CGIT_CONFIG");
        ctx.env.http_host = getenv("HTTP_HOST");
        ctx.env.https = getenv("HTTPS");
        ctx.env.cgit_config = getenv("CGIT_CONFIG");
        ctx.env.http_host = getenv("HTTP_HOST");
        ctx.env.https = getenv("HTTPS");


@@ -406,7 +425,7 @@ struct refmatch {
        int match;
 };
 
        int match;
 };
 

-static int find_current_ref(const char *refname, const unsigned char *sha1,
+static int find_current_ref(const char *refname, const struct object_id *oid,

                            int flags, void *cb_data)
 {
        struct refmatch *info;
                            int flags, void *cb_data)
 {
        struct refmatch *info;


@@ -450,8 +469,8 @@ static char *guess_defbranch(void)
        const char *ref;
        unsigned char sha1[20];
 
        const char *ref;
        unsigned char sha1[20];
 

-       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
-       if (!ref || prefixcmp(ref, "refs/heads/"))
+       ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+       if (!ref || !starts_with(ref, "refs/heads/"))

                return "master";
        return xstrdup(ref + 11);
 }
                return "master";
        return xstrdup(ref + 11);
 }


@@ -501,12 +520,6 @@ static void choose_readme(struct cgit_repo *repo)
                        free(ref);
                        continue;
                }
                        free(ref);
                        continue;
                }

-               /* If there's only one item, we skip the possibly expensive
-                * selection process. */
-               if (repo->readme.nr == 1) {
-                       found = 1;
-                       break;
-               }

                if (ref) {
                        if (cgit_ref_path_exists(filename, ref, 1)) {
                                found = 1;
                if (ref) {
                        if (cgit_ref_path_exists(filename, ref, 1)) {
                                found = 1;


@@ -527,6 +540,17 @@ static void choose_readme(struct cgit_repo *repo)
                string_list_append(&repo->readme, filename)->util = ref;
 }
 
                string_list_append(&repo->readme, filename)->util = ref;
 }
 

+static void print_no_repo_clone_urls(const char *url)
+{
+        html("<tr><td><a rel='vcs-git' href='");
+        html_url_path(url);
+        html("' title='");
+        html_attr(ctx.repo->name);
+        html(" Git repository'>");
+        html_txt(url);
+        html("</a></td></tr>\n");
+}
+

 static int prepare_repo_cmd(void)
 {
        unsigned char sha1[20];
 static int prepare_repo_cmd(void)
 {
        unsigned char sha1[20];


@@ -577,6 +601,12 @@ static int prepare_repo_cmd(void)
                cgit_print_docstart();
                cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");
                cgit_print_docstart();
                cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");

+               if (!strcmp(ctx.qry.page, "summary")) {
+                       html("<table class='list'><tr class='nohover'><td>&nbsp;</td></tr><tr class='nohover'><th class='left'>Clone</th></tr>\n");
+                       cgit_prepare_repo_env(ctx.repo);
+                       cgit_add_clone_urls(print_no_repo_clone_urls);
+                       html("</table>\n");
+               }

                cgit_print_docend();
                return 1;
        }
                cgit_print_docend();
                return 1;
        }


@@ -594,7 +624,7 @@ static int prepare_repo_cmd(void)
                free(tmp);
                return 1;
        }
                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;
        cgit_prepare_repo_env(ctx.repo);
        choose_readme(ctx.repo);
        return 0;


@@ -716,6 +746,9 @@ static void process_request(void)
        if (ctx.repo && prepare_repo_cmd())
                return;
 
        if (ctx.repo && prepare_repo_cmd())
                return;
 

+       if (cmd->pre)
+               cmd->pre();
+

        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();
        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();


@@ -799,6 +832,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=");
                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 : "");
        if (repo->snapshots != ctx.cfg.snapshots) {
                char *tmp = build_snapshot_setting(repo->snapshots);
                fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");


@@ -821,6 +856,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                else if (repo->commit_sort == 2)
                        fprintf(f, "repo.commit-sort=topo\n");
        }
                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");
 }
 
        fprintf(f, "\n");
 }
 


@@ -921,28 +958,45 @@ static void cgit_parse_args(int argc, const char **argv)
        int scan = 0;
 
        for (i = 1; i < argc; i++) {
        int scan = 0;
 
        for (i = 1; i < argc; i++) {

-               if (!prefixcmp(argv[i], "--cache=")) {
+               if (!strcmp(argv[i], "--version")) {
+                       printf("CGit %s | http://git.zx2c4.com/cgit/\n\nCompiled in features:\n", CGIT_VERSION);
+#ifdef NO_LUA
+                       printf("[-] ");
+#else
+                       printf("[+] ");
+#endif
+                       printf("Lua scripting\n");
+#ifndef HAVE_LINUX_SENDFILE
+                       printf("[-] ");
+#else
+                       printf("[+] ");
+#endif
+                       printf("Linux sendfile() usage\n");
+
+                       exit(0);
+               }
+               if (starts_with(argv[i], "--cache=")) {

                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                } else if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
                } else if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                } else if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
                } else if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";

-               } else if (!prefixcmp(argv[i], "--query=")) {
+               } else if (starts_with(argv[i], "--query=")) {

                        ctx.qry.raw = xstrdup(argv[i] + 8);
                        ctx.qry.raw = xstrdup(argv[i] + 8);

-               } else if (!prefixcmp(argv[i], "--repo=")) {
+               } else if (starts_with(argv[i], "--repo=")) {

                        ctx.qry.repo = xstrdup(argv[i] + 7);
                        ctx.qry.repo = xstrdup(argv[i] + 7);

-               } else if (!prefixcmp(argv[i], "--page=")) {
+               } else if (starts_with(argv[i], "--page=")) {

                        ctx.qry.page = xstrdup(argv[i] + 7);
                        ctx.qry.page = xstrdup(argv[i] + 7);

-               } else if (!prefixcmp(argv[i], "--head=")) {
+               } else if (starts_with(argv[i], "--head=")) {

                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;

-               } else if (!prefixcmp(argv[i], "--sha1=")) {
+               } else if (starts_with(argv[i], "--sha1=")) {

                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;

-               } else if (!prefixcmp(argv[i], "--ofs=")) {
+               } else if (starts_with(argv[i], "--ofs=")) {

                        ctx.qry.ofs = atoi(argv[i] + 6);
                        ctx.qry.ofs = atoi(argv[i] + 6);

-               } else if (!prefixcmp(argv[i], "--scan-tree=") ||
-                          !prefixcmp(argv[i], "--scan-path=")) {
+               } else if (starts_with(argv[i], "--scan-tree=") ||
+                          starts_with(argv[i], "--scan-path=")) {

                        /*
                         * HACK: The global snapshot bit mask defines the set
                         * of allowed snapshot formats, but the config file
                        /*
                         * HACK: The global snapshot bit mask defines the set
                         * of allowed snapshot formats, but the config file


@@ -967,7 +1021,7 @@ static void cgit_parse_args(int argc, const char **argv)
        }
 }
 
        }
 }
 

-static int calc_ttl()
+static int calc_ttl(void)

 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;
 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;


@@ -978,6 +1032,9 @@ static int calc_ttl()
        if (!strcmp(ctx.qry.page, "about"))
                return ctx.cfg.cache_about_ttl;
 
        if (!strcmp(ctx.qry.page, "about"))
                return ctx.cfg.cache_about_ttl;
 

+       if (!strcmp(ctx.qry.page, "snapshot"))
+               return ctx.cfg.cache_snapshot_ttl;
+

        if (ctx.qry.has_sha1)
                return ctx.cfg.cache_static_ttl;
 
        if (ctx.qry.has_sha1)
                return ctx.cfg.cache_static_ttl;