Merge branch 'stable'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index 1de23352fd23b7310ffb6709f2ec1674a6959071..2b28d636e20ba1f79c398a83f9383d43cba9e2e0 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -73,6 +73,7 @@ struct cgit_repo {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;

+       int enable_subject_links;

        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;
        int max_stats;
        time_t mtime;
        struct cgit_filter *about_filter;


@@ -144,6 +145,10 @@ struct cgit_query {
        int nohead;
        char *sort;
        int showmsg;
        int nohead;
        char *sort;
        int showmsg;

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

 };
 
 struct cgit_config {
 };
 
 struct cgit_config {


@@ -180,13 +185,16 @@ struct cgit_config {
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;

+       int enable_subject_links;

        int enable_tree_linenumbers;
        int local_time;
        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_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 noplainemail;
        int max_stats;
        int nocache;
        int noplainemail;


@@ -196,6 +204,7 @@ struct cgit_config {
        int summary_branches;
        int summary_log;
        int summary_tags;
        int summary_branches;
        int summary_log;
        int summary_tags;

+       int ssdiff;

        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;


@@ -270,7 +279,7 @@ 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, 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,