Merge branch 'stable'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index c99d3377b8f962402b10b6aebd5230f77ff1ec2d..4090cd4f2fe114d6a70f9d138d9b67b3ad861d39 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,8 +15,11 @@
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>

+#include <string-list.h>
+#include <xdiff-interface.h>

 #include <xdiff/xdiff.h>
 #include <utf8.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>

+#include <notes.h>

 
 
 /*
 
 
 /*


@@ -47,6 +50,15 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 

+struct cgit_filter {
+       char *cmd;
+       char **argv;
+       int old_stdout;
+       int pipe_fh[2];
+       int pid;
+       int exitstatus;
+};
+

 struct cgit_repo {
        char *url;
        char *name;
 struct cgit_repo {
        char *url;
        char *name;


@@ -54,16 +66,25 @@ struct cgit_repo {
        char *desc;
        char *owner;
        char *defbranch;
        char *desc;
        char *owner;
        char *defbranch;

-       char *group;

        char *module_link;
        char *readme;
        char *module_link;
        char *readme;

+       char *section;

        char *clone_url;
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
        char *clone_url;
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;

+       int enable_remote_branches;
+       int enable_subject_links;
+       int max_stats;

        time_t mtime;
        time_t mtime;

+       struct cgit_filter *about_filter;
+       struct cgit_filter *commit_filter;
+       struct cgit_filter *source_filter;

 };
 
 };
 

+typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
+             const char *value);
+

 struct cgit_repolist {
        int length;
        int count;
 struct cgit_repolist {
        int length;
        int count;


@@ -120,9 +141,16 @@ struct cgit_query {
        char *name;
        char *mimetype;
        char *url;
        char *name;
        char *mimetype;
        char *url;

+       char *period;

        int   ofs;
        int nohead;
        char *sort;
        int   ofs;
        int nohead;
        char *sort;

+       int showmsg;
+       int ssdiff;
+       int show_all;
+       int context;
+       int ignorews;
+       char *vpath;

 };
 
 struct cgit_config {
 };
 
 struct cgit_config {


@@ -132,39 +160,60 @@ struct cgit_config {
        char *css;
        char *favicon;
        char *footer;
        char *css;
        char *favicon;
        char *footer;

+       char *head_include;
+       char *header;

        char *index_header;
        char *index_info;
        char *logo;
        char *logo_link;
        char *module_link;
        char *index_header;
        char *index_info;
        char *logo;
        char *logo_link;
        char *module_link;

-       char *repo_group;
+       char *project_list;

        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;
        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;

+       char *section;

        char *virtual_root;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;
        char *virtual_root;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;

+       int cache_scanrc_ttl;

        int cache_static_ttl;
        int cache_static_ttl;

+       int embedded;
+       int enable_filter_overrides;
+       int enable_gitweb_owner;

        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;

+       int enable_remote_branches;
+       int enable_subject_links;
+       int enable_tree_linenumbers;

        int local_time;
        int local_time;

+       int max_atom_items;

        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;

+       int max_blob_size;
+       int max_stats;

        int nocache;
        int nocache;

+       int noplainemail;
+       int noheader;

        int renamelimit;
        int renamelimit;

+       int remove_suffix;

        int snapshots;
        int summary_branches;
        int summary_log;
        int summary_tags;
        int snapshots;
        int summary_branches;
        int summary_log;
        int summary_tags;

+       int ssdiff;
+       struct string_list mimetypes;
+       struct cgit_filter *about_filter;
+       struct cgit_filter *commit_filter;
+       struct cgit_filter *source_filter;

 };
 
 struct cgit_page {
 };
 
 struct cgit_page {


@@ -174,10 +223,27 @@ struct cgit_page {
        char *mimetype;
        char *charset;
        char *filename;
        char *mimetype;
        char *charset;
        char *filename;

+       char *etag;

        char *title;
        char *title;

+       int status;
+       char *statusmsg;
+};
+
+struct cgit_environment {
+       char *cgit_config;
+       char *http_host;
+       char *https;
+       char *no_http;
+       char *path_info;
+       char *query_string;
+       char *request_method;
+       char *script_name;
+       char *server_name;
+       char *server_port;

 };
 
 struct cgit_context {
 };
 
 struct cgit_context {

+       struct cgit_environment env;

        struct cgit_query qry;
        struct cgit_config cfg;
        struct cgit_repo *repo;
        struct cgit_query qry;
        struct cgit_config cfg;
        struct cgit_repo *repo;


@@ -217,11 +283,13 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,

+                          unsigned long *old_size, unsigned long *new_size,
+                          int *binary, int context, int ignorews,

                           linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           linediff_fn fn);
 
 extern 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);

 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 


@@ -235,11 +303,11 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
 
 extern int cgit_parse_snapshots_mask(const char *str);
 

-/* libgit.a either links against or compiles its own implementation of
- * strcasestr(), and we'd like to reuse it. Simply re-declaring it
- * seems to do the trick.
- */
-extern char *strcasestr(const char *haystack, const char *needle);
+extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_close_filter(struct cgit_filter *filter);
+
+extern int readfile(const char *path, char **buf, size_t *size);

 
 

+extern char *expand_macros(const char *txt);

 
 #endif /* CGIT_H */
 
 #endif /* CGIT_H */