Merge branch 'stable'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index 9b1e3f8ca7862857a0fa800dc6fda5becbe614c9..4090cd4f2fe114d6a70f9d138d9b67b3ad861d39 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -19,6 +19,7 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>

+#include <notes.h>

 
 
 /*
 
 
 /*


@@ -146,6 +147,10 @@ struct cgit_query {
        char *sort;
        int showmsg;
        int ssdiff;
        char *sort;
        int showmsg;
        int ssdiff;

+       int show_all;
+       int context;
+       int ignorews;
+       char *vpath;

 };
 
 struct cgit_config {
 };
 
 struct cgit_config {


@@ -162,6 +167,7 @@ struct cgit_config {
        char *logo;
        char *logo_link;
        char *module_link;
        char *logo;
        char *logo_link;
        char *module_link;

+       char *project_list;

        char *robots;
        char *root_title;
        char *root_desc;
        char *robots;
        char *root_title;
        char *root_desc;


@@ -178,6 +184,7 @@ struct cgit_config {
        int cache_static_ttl;
        int embedded;
        int enable_filter_overrides;
        int cache_static_ttl;
        int embedded;
        int enable_filter_overrides;

+       int enable_gitweb_owner;

        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;


@@ -185,6 +192,7 @@ struct cgit_config {
        int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;
        int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;

+       int max_atom_items;

        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;


@@ -196,6 +204,7 @@ struct cgit_config {
        int noplainemail;
        int noheader;
        int renamelimit;
        int noplainemail;
        int noheader;
        int renamelimit;

+       int remove_suffix;

        int snapshots;
        int summary_branches;
        int summary_log;
        int snapshots;
        int summary_branches;
        int summary_log;


@@ -275,11 +284,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
 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, linediff_fn fn);
+                          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 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);
 


@@ -298,4 +308,6 @@ extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
 
 
 extern int readfile(const char *path, char **buf, size_t *size);
 

+extern char *expand_macros(const char *txt);
+

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