Merge branch 'stable'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 1bdfbc666aeed1d4bd995e2524979a03669de471..caa9d8e91853ae626f96ff939896f0dfb83a2e31 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -19,6 +19,8 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
+#include <notes.h>
+#include <graph.h>
 
 
 /*
@@ -49,6 +51,10 @@ 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 enum {
+       ABOUT, COMMIT, SOURCE
+} filter_type;
+
 struct cgit_filter {
        char *cmd;
        char **argv;
@@ -69,10 +75,14 @@ struct cgit_repo {
        char *readme;
        char *section;
        char *clone_url;
+       char *logo;
+       char *logo_link;
        int snapshots;
+       int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -145,6 +155,7 @@ struct cgit_query {
        char *sort;
        int showmsg;
        int ssdiff;
+       int show_all;
        int context;
        int ignorews;
        char *vpath;
@@ -164,6 +175,8 @@ struct cgit_config {
        char *logo;
        char *logo_link;
        char *module_link;
+       char *project_list;
+       char *readme;
        char *robots;
        char *root_title;
        char *root_desc;
@@ -171,6 +184,7 @@ struct cgit_config {
        char *script_name;
        char *section;
        char *virtual_root;
+       char *strict_export;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
@@ -180,12 +194,17 @@ struct cgit_config {
        int cache_static_ttl;
        int embedded;
        int enable_filter_overrides;
+       int enable_gitweb_owner;
+       int enable_http_clone;
        int enable_index_links;
+       int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
+       int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;
+       int max_atom_items;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
@@ -197,6 +216,9 @@ struct cgit_config {
        int noplainemail;
        int noheader;
        int renamelimit;
+       int remove_suffix;
+       int scan_hidden_path;
+       int section_from_path;
        int snapshots;
        int summary_branches;
        int summary_log;
@@ -283,8 +305,10 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           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,
+                            const char *prefix);
 
+__attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
@@ -295,9 +319,11 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
-extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo);
 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 */