Merge branch 'stable'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index adb8da4f49be0499eb83ed4a40794f11825be96a..cd4af7247b7c00dd9562917d2df94472d2e1317e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -65,13 +65,14 @@ struct cgit_repo {
        char *desc;
        char *owner;
        char *defbranch;
-       char *group;
        char *module_link;
        char *readme;
+       char *section;
        char *clone_url;
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
+       int enable_remote_branches;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -79,6 +80,9 @@ struct cgit_repo {
        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;
@@ -140,6 +144,7 @@ struct cgit_query {
        int nohead;
        char *sort;
        int showmsg;
+       int ssdiff;
 };
 
 struct cgit_config {
@@ -156,29 +161,34 @@ struct cgit_config {
        char *logo;
        char *logo_link;
        char *module_link;
-       char *repo_group;
        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;
+       int cache_scanrc_ttl;
        int cache_static_ttl;
        int embedded;
+       int enable_filter_overrides;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
+       int enable_remote_branches;
+       int enable_tree_linenumbers;
        int local_time;
        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 noplainemail;
@@ -188,6 +198,7 @@ struct cgit_config {
        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;