Update git to v1.7.7.7

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 1f8b1bee11c77bfeaea22b5d9758e03731c951d9..c655bd8eb54266150a0f80bd35e11ec2ed184e38 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -11,6 +11,7 @@
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>

+#include <argv-array.h>

 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>


@@ -84,10 +85,12 @@ struct cgit_repo {
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;
        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;
        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,
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,


@@ -137,6 +140,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
 struct cgit_query {
        int has_symref;
        int has_sha1;

+       int has_ssdiff;

        char *raw;
        char *repo;
        char *page;
        char *raw;
        char *repo;
        char *page;


@@ -165,6 +169,7 @@ struct cgit_config {
        char *agefile;
        char *cache_root;
        char *clone_prefix;
        char *agefile;
        char *cache_root;
        char *clone_prefix;

+       char *clone_url;

        char *css;
        char *favicon;
        char *footer;
        char *css;
        char *favicon;
        char *footer;


@@ -174,6 +179,7 @@ struct cgit_config {
        char *index_info;
        char *logo;
        char *logo_link;
        char *index_info;
        char *logo;
        char *logo_link;

+       char *mimetype_file;

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


@@ -183,6 +189,7 @@ struct cgit_config {
        char *root_readme;
        char *script_name;
        char *section;
        char *root_readme;
        char *script_name;
        char *section;

+       char *repository_sort;

        char *virtual_root;
        char *strict_export;
        int cache_size;
        char *virtual_root;
        char *strict_export;
        int cache_size;


@@ -192,16 +199,19 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;

+       int case_sensitive_sort;

        int embedded;
        int enable_filter_overrides;
        int embedded;
        int enable_filter_overrides;

-       int enable_gitweb_owner;
+       int enable_http_clone;

        int enable_index_links;
        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_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 local_time;
        int max_atom_items;
        int max_repo_count;


@@ -219,10 +229,12 @@ struct cgit_config {
        int scan_hidden_path;
        int section_from_path;
        int snapshots;
        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 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;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;


@@ -263,6 +275,8 @@ struct cgit_context {
        struct cgit_page page;
 };
 
        struct cgit_page page;
 };
 

+typedef int (*write_archive_fn_t)(const char *, const char *);
+

 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;


@@ -276,6 +290,7 @@ extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 
 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);
 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);


@@ -321,6 +336,8 @@ 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 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);
 extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);