author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:01:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:01:59 (UTC) |
commit | 31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (patch) (unidiff) | |
tree | 26200ad3c376ea1208d2a870ebb3b2bc6d7abee6 /cgit.h | |
parent | e66a16cebcdac53b63e77876acef1ca9e4877038 (diff) | |
parent | c2bfd40f8aaaa69a66c6eb729c202e42a43ec166 (diff) | |
download | cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.zip cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.gz cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.bz2 |
Merge branch 'jh/graph'
* jh/graph:
ui-log: Move 'Age' column when commit graph is present
ui-log: Line-wrap long commit subjects when showmsg is enabled
ui-log: Colorize commit graph
ui-log: Implement support for commit graphs
ui-log: Change display of full commit messages (and notes)
Conflicts:
cgit.css
-rw-r--r-- | cgit.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,46 +1,47 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <string-list.h> | 18 | #include <string-list.h> |
19 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | #include <notes.h> | 22 | #include <notes.h> |
23 | #include <graph.h> | ||
23 | 24 | ||
24 | 25 | ||
25 | /* | 26 | /* |
26 | * Dateformats used on misc. pages | 27 | * Dateformats used on misc. pages |
27 | */ | 28 | */ |
28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 29 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
29 | #define FMT_SHORTDATE "%Y-%m-%d" | 30 | #define FMT_SHORTDATE "%Y-%m-%d" |
30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 31 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
31 | 32 | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * Limits used for relative dates | 35 | * Limits used for relative dates |
35 | */ | 36 | */ |
36 | #define TM_MIN 60 | 37 | #define TM_MIN 60 |
37 | #define TM_HOUR (TM_MIN * 60) | 38 | #define TM_HOUR (TM_MIN * 60) |
38 | #define TM_DAY (TM_HOUR * 24) | 39 | #define TM_DAY (TM_HOUR * 24) |
39 | #define TM_WEEK (TM_DAY * 7) | 40 | #define TM_WEEK (TM_DAY * 7) |
40 | #define TM_YEAR (TM_DAY * 365) | 41 | #define TM_YEAR (TM_DAY * 365) |
41 | #define TM_MONTH (TM_YEAR / 12.0) | 42 | #define TM_MONTH (TM_YEAR / 12.0) |
42 | 43 | ||
43 | 44 | ||
44 | /* | 45 | /* |
45 | * Default encoding | 46 | * Default encoding |
46 | */ | 47 | */ |
@@ -50,48 +51,49 @@ typedef void (*configfn)(const char *name, const char *value); | |||
50 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 51 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
51 | typedef void (*linediff_fn)(char *line, int len); | 52 | typedef void (*linediff_fn)(char *line, int len); |
52 | 53 | ||
53 | struct cgit_filter { | 54 | struct cgit_filter { |
54 | char *cmd; | 55 | char *cmd; |
55 | char **argv; | 56 | char **argv; |
56 | int old_stdout; | 57 | int old_stdout; |
57 | int pipe_fh[2]; | 58 | int pipe_fh[2]; |
58 | int pid; | 59 | int pid; |
59 | int exitstatus; | 60 | int exitstatus; |
60 | }; | 61 | }; |
61 | 62 | ||
62 | struct cgit_repo { | 63 | struct cgit_repo { |
63 | char *url; | 64 | char *url; |
64 | char *name; | 65 | char *name; |
65 | char *path; | 66 | char *path; |
66 | char *desc; | 67 | char *desc; |
67 | char *owner; | 68 | char *owner; |
68 | char *defbranch; | 69 | char *defbranch; |
69 | char *module_link; | 70 | char *module_link; |
70 | char *readme; | 71 | char *readme; |
71 | char *section; | 72 | char *section; |
72 | char *clone_url; | 73 | char *clone_url; |
73 | int snapshots; | 74 | int snapshots; |
75 | int enable_commit_graph; | ||
74 | int enable_log_filecount; | 76 | int enable_log_filecount; |
75 | int enable_log_linecount; | 77 | int enable_log_linecount; |
76 | int enable_remote_branches; | 78 | int enable_remote_branches; |
77 | int enable_subject_links; | 79 | int enable_subject_links; |
78 | int max_stats; | 80 | int max_stats; |
79 | time_t mtime; | 81 | time_t mtime; |
80 | struct cgit_filter *about_filter; | 82 | struct cgit_filter *about_filter; |
81 | struct cgit_filter *commit_filter; | 83 | struct cgit_filter *commit_filter; |
82 | struct cgit_filter *source_filter; | 84 | struct cgit_filter *source_filter; |
83 | }; | 85 | }; |
84 | 86 | ||
85 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | 87 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, |
86 | const char *value); | 88 | const char *value); |
87 | 89 | ||
88 | struct cgit_repolist { | 90 | struct cgit_repolist { |
89 | int length; | 91 | int length; |
90 | int count; | 92 | int count; |
91 | struct cgit_repo *repos; | 93 | struct cgit_repo *repos; |
92 | }; | 94 | }; |
93 | 95 | ||
94 | struct commitinfo { | 96 | struct commitinfo { |
95 | struct commit *commit; | 97 | struct commit *commit; |
96 | char *author; | 98 | char *author; |
97 | char *author_email; | 99 | char *author_email; |
@@ -167,48 +169,49 @@ struct cgit_config { | |||
167 | char *logo; | 169 | char *logo; |
168 | char *logo_link; | 170 | char *logo_link; |
169 | char *module_link; | 171 | char *module_link; |
170 | char *project_list; | 172 | char *project_list; |
171 | char *readme; | 173 | char *readme; |
172 | char *robots; | 174 | char *robots; |
173 | char *root_title; | 175 | char *root_title; |
174 | char *root_desc; | 176 | char *root_desc; |
175 | char *root_readme; | 177 | char *root_readme; |
176 | char *script_name; | 178 | char *script_name; |
177 | char *section; | 179 | char *section; |
178 | char *virtual_root; | 180 | char *virtual_root; |
179 | char *strict_export; | 181 | char *strict_export; |
180 | int cache_size; | 182 | int cache_size; |
181 | int cache_dynamic_ttl; | 183 | int cache_dynamic_ttl; |
182 | int cache_max_create_time; | 184 | int cache_max_create_time; |
183 | int cache_repo_ttl; | 185 | int cache_repo_ttl; |
184 | int cache_root_ttl; | 186 | int cache_root_ttl; |
185 | int cache_scanrc_ttl; | 187 | int cache_scanrc_ttl; |
186 | int cache_static_ttl; | 188 | int cache_static_ttl; |
187 | int embedded; | 189 | int embedded; |
188 | int enable_filter_overrides; | 190 | int enable_filter_overrides; |
189 | int enable_gitweb_owner; | 191 | int enable_gitweb_owner; |
190 | int enable_index_links; | 192 | int enable_index_links; |
193 | int enable_commit_graph; | ||
191 | int enable_log_filecount; | 194 | int enable_log_filecount; |
192 | int enable_log_linecount; | 195 | int enable_log_linecount; |
193 | int enable_remote_branches; | 196 | int enable_remote_branches; |
194 | int enable_subject_links; | 197 | int enable_subject_links; |
195 | int enable_tree_linenumbers; | 198 | int enable_tree_linenumbers; |
196 | int local_time; | 199 | int local_time; |
197 | int max_atom_items; | 200 | int max_atom_items; |
198 | int max_repo_count; | 201 | int max_repo_count; |
199 | int max_commit_count; | 202 | int max_commit_count; |
200 | int max_lock_attempts; | 203 | int max_lock_attempts; |
201 | int max_msg_len; | 204 | int max_msg_len; |
202 | int max_repodesc_len; | 205 | int max_repodesc_len; |
203 | int max_blob_size; | 206 | int max_blob_size; |
204 | int max_stats; | 207 | int max_stats; |
205 | int nocache; | 208 | int nocache; |
206 | int noplainemail; | 209 | int noplainemail; |
207 | int noheader; | 210 | int noheader; |
208 | int renamelimit; | 211 | int renamelimit; |
209 | int remove_suffix; | 212 | int remove_suffix; |
210 | int section_from_path; | 213 | int section_from_path; |
211 | int snapshots; | 214 | int snapshots; |
212 | int summary_branches; | 215 | int summary_branches; |
213 | int summary_log; | 216 | int summary_log; |
214 | int summary_tags; | 217 | int summary_tags; |