summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorJohan Herland <johan@herland.net>2010-11-15 17:39:50 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-11-16 07:18:36 (UTC)
commit9a8d39c668b98464bac97d4e5442966de63f97b2 (patch) (unidiff)
treeee1a7766d6d9365ae45f694939c20cab811abd84 /cgit.h
parent5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff)
downloadcgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip
cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz
cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.bz2
ui-log: Implement support for commit graphs
Teach CGit to print an ASCII art commit graph to the left of the commit message, similar to 'git log --graph'. The graph adds extra lines (table rows) to the log when needed to add/remove/shuffle edges in the graph. When 'showmsg' is enabled, the graph is automatically padded to account for the extra lines added by the commit message/notes. This feature is controlled by a new config variable: "enable-commit-graph" (disabled by default), and individual repos can control it by setting "repo.enable-commit-graph". Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.h') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index f5f68ac..bed770b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,286 +1,289 @@
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 */
47#define PAGE_ENCODING "UTF-8" 48#define PAGE_ENCODING "UTF-8"
48 49
49typedef void (*configfn)(const char *name, const char *value); 50typedef void (*configfn)(const char *name, const char *value);
50typedef void (*filepair_fn)(struct diff_filepair *pair); 51typedef void (*filepair_fn)(struct diff_filepair *pair);
51typedef void (*linediff_fn)(char *line, int len); 52typedef void (*linediff_fn)(char *line, int len);
52 53
53struct cgit_filter { 54struct 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
62struct cgit_repo { 63struct 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
85typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, 87typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
86 const char *value); 88 const char *value);
87 89
88struct cgit_repolist { 90struct 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
94struct commitinfo { 96struct commitinfo {
95 struct commit *commit; 97 struct commit *commit;
96 char *author; 98 char *author;
97 char *author_email; 99 char *author_email;
98 unsigned long author_date; 100 unsigned long author_date;
99 char *committer; 101 char *committer;
100 char *committer_email; 102 char *committer_email;
101 unsigned long committer_date; 103 unsigned long committer_date;
102 char *subject; 104 char *subject;
103 char *msg; 105 char *msg;
104 char *msg_encoding; 106 char *msg_encoding;
105}; 107};
106 108
107struct taginfo { 109struct taginfo {
108 char *tagger; 110 char *tagger;
109 char *tagger_email; 111 char *tagger_email;
110 unsigned long tagger_date; 112 unsigned long tagger_date;
111 char *msg; 113 char *msg;
112}; 114};
113 115
114struct refinfo { 116struct refinfo {
115 const char *refname; 117 const char *refname;
116 struct object *object; 118 struct object *object;
117 union { 119 union {
118 struct taginfo *tag; 120 struct taginfo *tag;
119 struct commitinfo *commit; 121 struct commitinfo *commit;
120 }; 122 };
121}; 123};
122 124
123struct reflist { 125struct reflist {
124 struct refinfo **refs; 126 struct refinfo **refs;
125 int alloc; 127 int alloc;
126 int count; 128 int count;
127}; 129};
128 130
129struct cgit_query { 131struct cgit_query {
130 int has_symref; 132 int has_symref;
131 int has_sha1; 133 int has_sha1;
132 char *raw; 134 char *raw;
133 char *repo; 135 char *repo;
134 char *page; 136 char *page;
135 char *search; 137 char *search;
136 char *grep; 138 char *grep;
137 char *head; 139 char *head;
138 char *sha1; 140 char *sha1;
139 char *sha2; 141 char *sha2;
140 char *path; 142 char *path;
141 char *name; 143 char *name;
142 char *mimetype; 144 char *mimetype;
143 char *url; 145 char *url;
144 char *period; 146 char *period;
145 int ofs; 147 int ofs;
146 int nohead; 148 int nohead;
147 char *sort; 149 char *sort;
148 int showmsg; 150 int showmsg;
149 int ssdiff; 151 int ssdiff;
150 int show_all; 152 int show_all;
151 int context; 153 int context;
152 int ignorews; 154 int ignorews;
153 char *vpath; 155 char *vpath;
154}; 156};
155 157
156struct cgit_config { 158struct cgit_config {
157 char *agefile; 159 char *agefile;
158 char *cache_root; 160 char *cache_root;
159 char *clone_prefix; 161 char *clone_prefix;
160 char *css; 162 char *css;
161 char *favicon; 163 char *favicon;
162 char *footer; 164 char *footer;
163 char *head_include; 165 char *head_include;
164 char *header; 166 char *header;
165 char *index_header; 167 char *index_header;
166 char *index_info; 168 char *index_info;
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;
215 int ssdiff; 218 int ssdiff;
216 struct string_list mimetypes; 219 struct string_list mimetypes;
217 struct cgit_filter *about_filter; 220 struct cgit_filter *about_filter;
218 struct cgit_filter *commit_filter; 221 struct cgit_filter *commit_filter;
219 struct cgit_filter *source_filter; 222 struct cgit_filter *source_filter;
220}; 223};
221 224
222struct cgit_page { 225struct cgit_page {
223 time_t modified; 226 time_t modified;
224 time_t expires; 227 time_t expires;
225 size_t size; 228 size_t size;
226 char *mimetype; 229 char *mimetype;
227 char *charset; 230 char *charset;
228 char *filename; 231 char *filename;
229 char *etag; 232 char *etag;
230 char *title; 233 char *title;
231 int status; 234 int status;
232 char *statusmsg; 235 char *statusmsg;
233}; 236};
234 237
235struct cgit_environment { 238struct cgit_environment {
236 char *cgit_config; 239 char *cgit_config;
237 char *http_host; 240 char *http_host;
238 char *https; 241 char *https;
239 char *no_http; 242 char *no_http;
240 char *path_info; 243 char *path_info;
241 char *query_string; 244 char *query_string;
242 char *request_method; 245 char *request_method;
243 char *script_name; 246 char *script_name;
244 char *server_name; 247 char *server_name;
245 char *server_port; 248 char *server_port;
246}; 249};
247 250
248struct cgit_context { 251struct cgit_context {
249 struct cgit_environment env; 252 struct cgit_environment env;
250 struct cgit_query qry; 253 struct cgit_query qry;
251 struct cgit_config cfg; 254 struct cgit_config cfg;
252 struct cgit_repo *repo; 255 struct cgit_repo *repo;
253 struct cgit_page page; 256 struct cgit_page page;
254}; 257};
255 258
256struct cgit_snapshot_format { 259struct cgit_snapshot_format {
257 const char *suffix; 260 const char *suffix;
258 const char *mimetype; 261 const char *mimetype;
259 write_archive_fn_t write_func; 262 write_archive_fn_t write_func;
260 int bit; 263 int bit;
261}; 264};
262 265
263extern const char *cgit_version; 266extern const char *cgit_version;
264 267
265extern struct cgit_repolist cgit_repolist; 268extern struct cgit_repolist cgit_repolist;
266extern struct cgit_context ctx; 269extern struct cgit_context ctx;
267extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 270extern const struct cgit_snapshot_format cgit_snapshot_formats[];
268 271
269extern struct cgit_repo *cgit_add_repo(const char *url); 272extern struct cgit_repo *cgit_add_repo(const char *url);
270extern struct cgit_repo *cgit_get_repoinfo(const char *url); 273extern struct cgit_repo *cgit_get_repoinfo(const char *url);
271extern void cgit_repo_config_cb(const char *name, const char *value); 274extern void cgit_repo_config_cb(const char *name, const char *value);
272 275
273extern int chk_zero(int result, char *msg); 276extern int chk_zero(int result, char *msg);
274extern int chk_positive(int result, char *msg); 277extern int chk_positive(int result, char *msg);
275extern int chk_non_negative(int result, char *msg); 278extern int chk_non_negative(int result, char *msg);
276 279
277extern char *trim_end(const char *str, char c); 280extern char *trim_end(const char *str, char c);
278extern char *strlpart(char *txt, int maxlen); 281extern char *strlpart(char *txt, int maxlen);
279extern char *strrpart(char *txt, int maxlen); 282extern char *strrpart(char *txt, int maxlen);
280 283
281extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 284extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
282extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 285extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
283 int flags, void *cb_data); 286 int flags, void *cb_data);
284 287
285extern void *cgit_free_commitinfo(struct commitinfo *info); 288extern void *cgit_free_commitinfo(struct commitinfo *info);
286 289