summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorJohan Herland <johan@herland.net>2010-06-10 18:15:27 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 11:00:07 (UTC)
commit6180e6169d6e87a3bea7e4da835dca17f93e5cfd (patch) (unidiff)
tree7caa053b419c75081179cc4a6056ce6533d01d99 /cgit.h
parenta2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff)
downloadcgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.zip
cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.gz
cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.bz2
Add URL parameter 'context' for changing the number of context lines in diffs
The new ctx.qry.context variable is picked up by cgit_print_diff(), and passed via cgit_diff_files() to Git's diff machinery. 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, 2 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index f990b15..bb8f598 100644
--- a/cgit.h
+++ b/cgit.h
@@ -132,32 +132,33 @@ struct cgit_query {
132 char *page; 132 char *page;
133 char *search; 133 char *search;
134 char *grep; 134 char *grep;
135 char *head; 135 char *head;
136 char *sha1; 136 char *sha1;
137 char *sha2; 137 char *sha2;
138 char *path; 138 char *path;
139 char *name; 139 char *name;
140 char *mimetype; 140 char *mimetype;
141 char *url; 141 char *url;
142 char *period; 142 char *period;
143 int ofs; 143 int ofs;
144 int nohead; 144 int nohead;
145 char *sort; 145 char *sort;
146 int showmsg; 146 int showmsg;
147 int ssdiff; 147 int ssdiff;
148 int context;
148 char *vpath; 149 char *vpath;
149}; 150};
150 151
151struct cgit_config { 152struct cgit_config {
152 char *agefile; 153 char *agefile;
153 char *cache_root; 154 char *cache_root;
154 char *clone_prefix; 155 char *clone_prefix;
155 char *css; 156 char *css;
156 char *favicon; 157 char *favicon;
157 char *footer; 158 char *footer;
158 char *head_include; 159 char *head_include;
159 char *header; 160 char *header;
160 char *index_header; 161 char *index_header;
161 char *index_info; 162 char *index_info;
162 char *logo; 163 char *logo;
163 char *logo_link; 164 char *logo_link;
@@ -261,33 +262,33 @@ extern int chk_zero(int result, char *msg);
261extern int chk_positive(int result, char *msg); 262extern int chk_positive(int result, char *msg);
262extern int chk_non_negative(int result, char *msg); 263extern int chk_non_negative(int result, char *msg);
263 264
264extern char *trim_end(const char *str, char c); 265extern char *trim_end(const char *str, char c);
265extern char *strlpart(char *txt, int maxlen); 266extern char *strlpart(char *txt, int maxlen);
266extern char *strrpart(char *txt, int maxlen); 267extern char *strrpart(char *txt, int maxlen);
267 268
268extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 269extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
269extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 270extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
270 int flags, void *cb_data); 271 int flags, void *cb_data);
271 272
272extern void *cgit_free_commitinfo(struct commitinfo *info); 273extern void *cgit_free_commitinfo(struct commitinfo *info);
273 274
274extern int cgit_diff_files(const unsigned char *old_sha1, 275extern int cgit_diff_files(const unsigned char *old_sha1,
275 const unsigned char *new_sha1, 276 const unsigned char *new_sha1,
276 unsigned long *old_size, unsigned long *new_size, 277 unsigned long *old_size, unsigned long *new_size,
277 int *binary, linediff_fn fn); 278 int *binary, int context, linediff_fn fn);
278 279
279extern void cgit_diff_tree(const unsigned char *old_sha1, 280extern void cgit_diff_tree(const unsigned char *old_sha1,
280 const unsigned char *new_sha1, 281 const unsigned char *new_sha1,
281 filepair_fn fn, const char *prefix); 282 filepair_fn fn, const char *prefix);
282 283
283extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 284extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
284 285
285extern char *fmt(const char *format,...); 286extern char *fmt(const char *format,...);
286 287
287extern struct commitinfo *cgit_parse_commit(struct commit *commit); 288extern struct commitinfo *cgit_parse_commit(struct commit *commit);
288extern struct taginfo *cgit_parse_tag(struct tag *tag); 289extern struct taginfo *cgit_parse_tag(struct tag *tag);
289extern void cgit_parse_url(const char *url); 290extern void cgit_parse_url(const char *url);
290 291
291extern const char *cgit_repobasename(const char *reponame); 292extern const char *cgit_repobasename(const char *reponame);
292 293
293extern int cgit_parse_snapshots_mask(const char *str); 294extern int cgit_parse_snapshots_mask(const char *str);