Update git to v1.7.7.7

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 9b1e3f8ca7862857a0fa800dc6fda5becbe614c9..c655bd8eb54266150a0f80bd35e11ec2ed184e38 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -11,6 +11,7 @@
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
+#include <argv-array.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
@@ -19,6 +20,8 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
+#include <notes.h>
+#include <graph.h>
 
 
 /*
@@ -49,6 +52,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,16 +76,21 @@ 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;
+       int commit_sort;
        time_t mtime;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct string_list submodules;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
@@ -128,6 +140,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
+       int has_ssdiff;
        char *raw;
        char *repo;
        char *page;
@@ -146,12 +159,17 @@ struct cgit_query {
        char *sort;
        int showmsg;
        int ssdiff;
+       int show_all;
+       int context;
+       int ignorews;
+       char *vpath;
 };
 
 struct cgit_config {
        char *agefile;
        char *cache_root;
        char *clone_prefix;
+       char *clone_url;
        char *css;
        char *favicon;
        char *footer;
@@ -161,14 +179,19 @@ struct cgit_config {
        char *index_info;
        char *logo;
        char *logo_link;
+       char *mimetype_file;
        char *module_link;
+       char *project_list;
+       char *readme;
        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;
        char *section;
+       char *repository_sort;
        char *virtual_root;
+       char *strict_export;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
@@ -176,15 +199,21 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
+       int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;
+       int enable_http_clone;
        int enable_index_links;
+       int enable_index_owner;
+       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 enable_git_config;
        int local_time;
+       int max_atom_items;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
@@ -196,11 +225,16 @@ struct cgit_config {
        int noplainemail;
        int noheader;
        int renamelimit;
+       int remove_suffix;
+       int scan_hidden_path;
+       int section_from_path;
        int snapshots;
+       int section_sort;
        int summary_branches;
        int summary_log;
        int summary_tags;
        int ssdiff;
+       int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
@@ -241,6 +275,8 @@ struct cgit_context {
        struct cgit_page page;
 };
 
+typedef int (*write_archive_fn_t)(const char *, const char *);
+
 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
@@ -254,6 +290,7 @@ extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 
+extern char *cgit_default_repo_desc;
 extern struct cgit_repo *cgit_add_repo(const char *url);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern void cgit_repo_config_cb(const char *name, const char *value);
@@ -275,14 +312,17 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 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, linediff_fn fn);
+                          int *binary, int context, int ignorews,
+                          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,
+                            const char *prefix);
 
+__attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
@@ -296,6 +336,10 @@ extern int cgit_parse_snapshots_mask(const char *str);
 extern int cgit_open_filter(struct cgit_filter *filter);
 extern int cgit_close_filter(struct cgit_filter *filter);
 
+extern void cgit_prepare_repo_env(struct cgit_repo * repo);
+
 extern int readfile(const char *path, char **buf, size_t *size);
 
+extern char *expand_macros(const char *txt);
+
 #endif /* CGIT_H */