X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c712d5ac434b9ee8cb4e63a173a2538e1878637f..4dee601bb6042cf7db2472b9c34530850345f680:/cgit.h

diff --git a/cgit.h b/cgit.h
index a686390..ddd2ccb 100644
--- 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>
@@ -24,6 +25,7 @@
 #include <utf8.h>
 #include <notes.h>
 #include <graph.h>
+#include <inttypes.h>
 
 /* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
 #undef isgraph
@@ -46,6 +48,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);
@@ -79,6 +83,7 @@ struct cgit_repo {
 	char *name;
 	char *path;
 	char *desc;
+	char *extra_head_content;
 	char *owner;
 	char *homepage;
 	char *defbranch;
@@ -90,6 +95,7 @@ struct cgit_repo {
 	char *logo_link;
 	char *snapshot_prefix;
 	int snapshots;
+	int enable_blame;
 	int enable_commit_graph;
 	int enable_log_filecount;
 	int enable_log_linecount;
@@ -159,7 +165,7 @@ struct reflist {
 
 struct cgit_query {
 	int has_symref;
-	int has_sha1;
+	int has_oid;
 	int has_difftype;
 	char *raw;
 	char *repo;
@@ -167,8 +173,8 @@ struct cgit_query {
 	char *search;
 	char *grep;
 	char *head;
-	char *sha1;
-	char *sha2;
+	char *oid;
+	char *oid2;
 	char *path;
 	char *name;
 	char *url;
@@ -190,19 +196,17 @@ struct cgit_config {
 	char *cache_root;
 	char *clone_prefix;
 	char *clone_url;
-	char *css;
 	char *favicon;
 	char *footer;
 	char *head_include;
 	char *header;
-	char *index_header;
-	char *index_info;
 	char *logo;
 	char *logo_link;
 	char *mimetype_file;
 	char *module_link;
 	char *project_list;
 	struct string_list readme;
+	struct string_list css;
 	char *robots;
 	char *root_title;
 	char *root_desc;
@@ -246,7 +250,6 @@ struct cgit_config {
 	int max_repodesc_len;
 	int max_blob_size;
 	int max_stats;
-	int nocache;
 	int noplainemail;
 	int noheader;
 	int renamelimit;
@@ -262,6 +265,7 @@ struct cgit_config {
 	int branch_sort;
 	int commit_sort;
 	struct string_list mimetypes;
+	struct string_list js;
 	struct cgit_filter *about_filter;
 	struct cgit_filter *commit_filter;
 	struct cgit_filter *source_filter;
@@ -314,7 +318,6 @@ struct cgit_snapshot_format {
 	const char *suffix;
 	const char *mimetype;
 	write_archive_fn_t write_func;
-	int bit;
 };
 
 extern const char *cgit_version;
@@ -376,6 +379,7 @@ 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);