git: update to v2.29.2

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index de5c94a1862692f19f35a66f38f4c24e80dad247..69b5c13232e74845907a2212ade32f36f861bba8 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -8,12 +8,13 @@
 #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 <argv-array.h>
+#include <strvec.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
@@ -29,13 +30,6 @@
 #undef isgraph
 #define isgraph(x) (isprint((x)) && !isspace((x)))
 
-/*
- * 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"
-
 
 /*
  * Limits used for relative dates
@@ -53,6 +47,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);
@@ -78,7 +74,6 @@ struct cgit_exec_filter {
        char *cmd;
        char **argv;
        int old_stdout;
-       int pipe_fh[2];
        int pid;
 };
 
@@ -87,7 +82,9 @@ struct cgit_repo {
        char *name;
        char *path;
        char *desc;
+       char *extra_head_content;
        char *owner;
+       char *homepage;
        char *defbranch;
        char *module_link;
        struct string_list readme;
@@ -95,7 +92,9 @@ struct cgit_repo {
        char *clone_url;
        char *logo;
        char *logo_link;
+       char *snapshot_prefix;
        int snapshots;
+       int enable_blame;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
@@ -130,9 +129,11 @@ struct commitinfo {
        char *author;
        char *author_email;
        unsigned long author_date;
+       int author_tz;
        char *committer;
        char *committer_email;
        unsigned long committer_date;
+       int committer_tz;
        char *subject;
        char *msg;
        char *msg_encoding;
@@ -142,6 +143,7 @@ struct taginfo {
        char *tagger;
        char *tagger_email;
        unsigned long tagger_date;
+       int tagger_tz;
        char *msg;
 };
 
@@ -162,7 +164,7 @@ struct reflist {
 
 struct cgit_query {
        int has_symref;
-       int has_sha1;
+       int has_oid;
        int has_difftype;
        char *raw;
        char *repo;
@@ -170,8 +172,8 @@ struct cgit_query {
        char *search;
        char *grep;
        char *head;
-       char *sha1;
-       char *sha2;
+       char *oid;
+       char *oid2;
        char *path;
        char *name;
        char *url;
@@ -198,8 +200,6 @@ struct cgit_config {
        char *footer;
        char *head_include;
        char *header;
-       char *index_header;
-       char *index_info;
        char *logo;
        char *logo_link;
        char *mimetype_file;
@@ -231,6 +231,7 @@ struct cgit_config {
        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;
@@ -248,7 +249,6 @@ struct cgit_config {
        int max_repodesc_len;
        int max_blob_size;
        int max_stats;
-       int nocache;
        int noplainemail;
        int noheader;
        int renamelimit;
@@ -316,7 +316,6 @@ struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
-       int bit;
 };
 
 extern const char *cgit_version;
@@ -336,8 +335,6 @@ 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 *strlpart(char *txt, int maxlen);
-extern char *strrpart(char *txt, int maxlen);
 
 extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
@@ -346,19 +343,20 @@ extern void cgit_free_reflist_inner(struct reflist *list);
 extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
                        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);
 
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                       struct diff_options *options, void *data);
 
-extern int cgit_diff_files(const unsigned char *old_sha1,
-                          const unsigned char *new_sha1,
+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);
 
-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,
@@ -377,6 +375,9 @@ 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 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);