Update git to v1.7.6.5

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index ea90833e923c4ee2faaa49ae8ed1788f47dcbe6a..f3d2556949ddce9d698ae6231b887328cc83f6db 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,8 +15,12 @@
 #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>
+#include <graph.h>

 
 
 /*
 
 
 /*


@@ -47,6 +51,19 @@ 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);
 

+typedef enum {
+       ABOUT, COMMIT, SOURCE
+} filter_type;
+
+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,15 +71,30 @@ 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;
        char *clone_url;

+       char *logo;
+       char *logo_link;

        int snapshots;
        int snapshots;

+       int enable_commit_graph;

        int enable_log_filecount;
        int enable_log_linecount;
        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,
+             const char *value);
+

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


@@ -107,6 +139,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;


@@ -119,51 +152,92 @@ 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 {
        char *agefile;
        char *cache_root;
        char *clone_prefix;
 };
 
 struct cgit_config {
        char *agefile;
        char *cache_root;
        char *clone_prefix;

+       char *clone_url;

        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 *index_header;
        char *index_info;
        char *logo;
        char *logo_link;

+       char *mimetype_file;

        char *module_link;
        char *module_link;

-       char *repo_group;
+       char *project_list;
+       char *readme;

        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 *repository_sort;

        char *virtual_root;
        char *virtual_root;

+       char *strict_export;

        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;
        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 case_sensitive_sort;
+       int embedded;
+       int enable_filter_overrides;
+       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_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 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 scan_hidden_path;
+       int section_from_path;

        int snapshots;
        int snapshots;

+       int section_sort;

        int summary_branches;
        int summary_log;
        int summary_tags;
        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 cgit_filter *source_filter;

 };
 
 struct cgit_page {
 };
 
 struct cgit_page {


@@ -173,10 +247,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;


@@ -196,6 +287,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);


@@ -216,14 +308,18 @@ 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,
+                            const char *prefix);

 
 

+__attribute__((format (printf,1,2)))

 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);


@@ -234,11 +330,13 @@ 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 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 */
 
 #endif /* CGIT_H */