git: update to v2.29.2

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 92e8c558dab46e402381f084e437cf5be90b0b21..69b5c13232e74845907a2212ade32f36f861bba8 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -3,15 +3,18 @@
 
 
 #include <git-compat-util.h>
 
 
 #include <git-compat-util.h>

+#include <stdbool.h>
+

 #include <cache.h>
 #include <grep.h>
 #include <object.h>
 #include <cache.h>
 #include <grep.h>
 #include <object.h>

+#include <object-store.h>

 #include <tree.h>
 #include <commit.h>
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
 #include <tree.h>
 #include <commit.h>
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>

-#include <argv-array.h>
+#include <strvec.h>

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


@@ -23,13 +26,9 @@
 #include <notes.h>
 #include <graph.h>
 
 #include <notes.h>
 #include <graph.h>
 

-
-/*
- * Dateformats used on misc. pages
- */
-#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
-#define FMT_SHORTDATE "%Y-%m-%d"
-#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
+/* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
+#undef isgraph
+#define isgraph(x) (isprint((x)) && !isspace((x)))

 
 
 /*
 
 
 /*


@@ -48,27 +47,33 @@
  */
 #define PAGE_ENCODING "UTF-8"
 
  */
 #define PAGE_ENCODING "UTF-8"
 

+#define BIT(x) (1U << (x))
+

 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 {
 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
+       DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY
+} diff_type;
+
+typedef enum {
+       ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER

 } filter_type;
 
 struct cgit_filter {
        int (*open)(struct cgit_filter *, va_list ap);
        int (*close)(struct cgit_filter *);
        void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);
 } filter_type;
 
 struct cgit_filter {
        int (*open)(struct cgit_filter *, va_list ap);
        int (*close)(struct cgit_filter *);
        void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);

+       void (*cleanup)(struct cgit_filter *);
+       int argument_count;

 };
 
 struct cgit_exec_filter {
        struct cgit_filter base;
        char *cmd;
        char **argv;
 };
 
 struct cgit_exec_filter {
        struct cgit_filter base;
        char *cmd;
        char **argv;

-       int extra_args;

        int old_stdout;
        int old_stdout;

-       int pipe_fh[2];

        int pid;
 };
 
        int pid;
 };
 


@@ -77,7 +82,9 @@ struct cgit_repo {
        char *name;
        char *path;
        char *desc;
        char *name;
        char *path;
        char *desc;

+       char *extra_head_content;

        char *owner;
        char *owner;

+       char *homepage;

        char *defbranch;
        char *module_link;
        struct string_list readme;
        char *defbranch;
        char *module_link;
        struct string_list readme;


@@ -85,12 +92,15 @@ struct cgit_repo {
        char *clone_url;
        char *logo;
        char *logo_link;
        char *clone_url;
        char *logo;
        char *logo_link;

+       char *snapshot_prefix;

        int snapshots;
        int snapshots;

+       int enable_blame;

        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;

+       int enable_html_serving;

        int max_stats;
        int branch_sort;
        int commit_sort;
        int max_stats;
        int branch_sort;
        int commit_sort;


@@ -98,7 +108,11 @@ struct cgit_repo {
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;

+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;

        struct string_list submodules;
        struct string_list submodules;

+       int hide;
+       int ignore;

 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,


@@ -115,9 +129,11 @@ struct commitinfo {
        char *author;
        char *author_email;
        unsigned long author_date;
        char *author;
        char *author_email;
        unsigned long author_date;

+       int author_tz;

        char *committer;
        char *committer_email;
        unsigned long committer_date;
        char *committer;
        char *committer_email;
        unsigned long committer_date;

+       int committer_tz;

        char *subject;
        char *msg;
        char *msg_encoding;
        char *subject;
        char *msg;
        char *msg_encoding;


@@ -127,6 +143,7 @@ struct taginfo {
        char *tagger;
        char *tagger_email;
        unsigned long tagger_date;
        char *tagger;
        char *tagger_email;
        unsigned long tagger_date;

+       int tagger_tz;

        char *msg;
 };
 
        char *msg;
 };
 


@@ -147,29 +164,29 @@ struct reflist {
 
 struct cgit_query {
        int has_symref;
 
 struct cgit_query {
        int has_symref;

-       int has_sha1;
-       int has_ssdiff;
+       int has_oid;
+       int has_difftype;

        char *raw;
        char *repo;
        char *page;
        char *search;
        char *grep;
        char *head;
        char *raw;
        char *repo;
        char *page;
        char *search;
        char *grep;
        char *head;

-       char *sha1;
-       char *sha2;
+       char *oid;
+       char *oid2;

        char *path;
        char *name;
        char *path;
        char *name;

-       char *mimetype;

        char *url;
        char *period;
        int   ofs;
        int nohead;
        char *sort;
        int showmsg;
        char *url;
        char *period;
        int   ofs;
        int nohead;
        char *sort;
        int showmsg;

-       int ssdiff;
+       diff_type difftype;

        int show_all;
        int context;
        int ignorews;
        int show_all;
        int context;
        int ignorews;

+       int follow;

        char *vpath;
 };
 
        char *vpath;
 };
 


@@ -183,8 +200,6 @@ struct cgit_config {
        char *footer;
        char *head_include;
        char *header;
        char *footer;
        char *head_include;
        char *header;

-       char *index_header;
-       char *index_info;

        char *logo;
        char *logo_link;
        char *mimetype_file;
        char *logo;
        char *logo_link;
        char *mimetype_file;


@@ -208,17 +223,21 @@ struct cgit_config {
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_about_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_about_ttl;

+       int cache_snapshot_ttl;

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

+       int enable_follow_links;

        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;
        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;

+       int enable_blame;

        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;

+       int enable_html_serving;

        int enable_tree_linenumbers;
        int enable_git_config;
        int local_time;
        int enable_tree_linenumbers;
        int enable_git_config;
        int local_time;


@@ -230,7 +249,6 @@ struct cgit_config {
        int max_repodesc_len;
        int max_blob_size;
        int max_stats;
        int max_repodesc_len;
        int max_blob_size;
        int max_stats;

-       int nocache;

        int noplainemail;
        int noheader;
        int renamelimit;
        int noplainemail;
        int noheader;
        int renamelimit;


@@ -242,13 +260,16 @@ struct cgit_config {
        int summary_branches;
        int summary_log;
        int summary_tags;
        int summary_branches;
        int summary_log;
        int summary_tags;

-       int ssdiff;
+       diff_type difftype;

        int branch_sort;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
        int branch_sort;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;

+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;
+       struct cgit_filter *auth_filter;

 };
 
 struct cgit_page {
 };
 
 struct cgit_page {


@@ -275,6 +296,10 @@ struct cgit_environment {
        const char *script_name;
        const char *server_name;
        const char *server_port;
        const char *script_name;
        const char *server_name;
        const char *server_port;

+       const char *http_cookie;
+       const char *http_referer;
+       unsigned int content_length;
+       int authenticated;

 };
 
 struct cgit_context {
 };
 
 struct cgit_context {


@@ -291,7 +316,6 @@ struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;

-       int bit;

 };
 
 extern const char *cgit_version;
 };
 
 extern const char *cgit_version;


@@ -311,26 +335,28 @@ extern int chk_non_negative(int result, char *msg);
 
 extern char *trim_end(const char *str, char c);
 extern char *ensure_end(const char *str, char c);
 
 extern char *trim_end(const char *str, char c);
 extern char *ensure_end(const char *str, char c);

-extern char *strlpart(char *txt, int maxlen);
-extern char *strrpart(char *txt, int maxlen);

 
 extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern void cgit_free_reflist_inner(struct reflist *list);
 
 extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern void cgit_free_reflist_inner(struct reflist *list);

-extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
+extern int cgit_refs_cb(const char *refname, const struct object_id *oid,

                        int flags, void *cb_data);
 
                        int flags, void *cb_data);
 

-extern void *cgit_free_commitinfo(struct commitinfo *info);
+extern void cgit_free_commitinfo(struct commitinfo *info);
+extern void cgit_free_taginfo(struct taginfo *info);

 
 

-extern int cgit_diff_files(const unsigned char *old_sha1,
-                          const unsigned char *new_sha1,
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+                      struct diff_options *options, void *data);
+
+extern int cgit_diff_files(const struct object_id *old_oid,
+                          const struct object_id *new_oid,

                           unsigned long *old_size, unsigned long *new_size,
                           int *binary, int context, int ignorews,
                           linediff_fn fn);
 
                           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,
+extern void cgit_diff_tree(const struct object_id *old_oid,
+                          const struct object_id *new_oid,

                           filepair_fn fn, const char *prefix, int ignorews);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
                           filepair_fn fn, const char *prefix, int ignorews);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,


@@ -349,12 +375,17 @@ extern void cgit_parse_url(const char *url);
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);

+extern const struct object_id *cgit_snapshot_get_sig(const char *ref,
+                                                    const struct cgit_snapshot_format *f);
+extern const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f);

 
 extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);
 extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix);
 extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
 extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);
 
 extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);
 extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix);
 extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
 extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);

+extern void cgit_cleanup_filters(void);
+extern void cgit_init_filters(void);

 
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);
 
 
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);
 


@@ -362,4 +393,6 @@ extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 
 
 extern char *expand_macros(const char *txt);
 

+extern char *get_mimetype_for_filename(const char *filename);
+

 #endif /* CGIT_H */
 #endif /* CGIT_H */