summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2010-07-18 13:03:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-18 13:03:30 (UTC)
commit6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (unidiff)
treee9d2ea0555f801653cc9caa382e33afc7c5d804d /cgit.h
parent5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff)
parent72ef913514288bd2aae23509581097bfd3edf8c4 (diff)
downloadcgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2
Merge branch 'jh/ignorews'
Diffstat (limited to 'cgit.h') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/cgit.h b/cgit.h
index 2bf6ab0..e9e2718 100644
--- a/cgit.h
+++ b/cgit.h
@@ -143,16 +143,17 @@ struct cgit_query {
143 char *period; 143 char *period;
144 int ofs; 144 int ofs;
145 int nohead; 145 int nohead;
146 char *sort; 146 char *sort;
147 int showmsg; 147 int showmsg;
148 int ssdiff; 148 int ssdiff;
149 int show_all; 149 int show_all;
150 int context; 150 int context;
151 int ignorews;
151 char *vpath; 152 char *vpath;
152}; 153};
153 154
154struct cgit_config { 155struct cgit_config {
155 char *agefile; 156 char *agefile;
156 char *cache_root; 157 char *cache_root;
157 char *clone_prefix; 158 char *clone_prefix;
158 char *css; 159 char *css;
@@ -274,21 +275,22 @@ extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
274extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 275extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
275 int flags, void *cb_data); 276 int flags, void *cb_data);
276 277
277extern void *cgit_free_commitinfo(struct commitinfo *info); 278extern void *cgit_free_commitinfo(struct commitinfo *info);
278 279
279extern int cgit_diff_files(const unsigned char *old_sha1, 280extern int cgit_diff_files(const unsigned char *old_sha1,
280 const unsigned char *new_sha1, 281 const unsigned char *new_sha1,
281 unsigned long *old_size, unsigned long *new_size, 282 unsigned long *old_size, unsigned long *new_size,
282 int *binary, int context, linediff_fn fn); 283 int *binary, int context, int ignorews,
284 linediff_fn fn);
283 285
284extern void cgit_diff_tree(const unsigned char *old_sha1, 286extern void cgit_diff_tree(const unsigned char *old_sha1,
285 const unsigned char *new_sha1, 287 const unsigned char *new_sha1,
286 filepair_fn fn, const char *prefix); 288 filepair_fn fn, const char *prefix, int ignorews);
287 289
288extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 290extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
289 291
290extern char *fmt(const char *format,...); 292extern char *fmt(const char *format,...);
291 293
292extern struct commitinfo *cgit_parse_commit(struct commit *commit); 294extern struct commitinfo *cgit_parse_commit(struct commit *commit);
293extern struct taginfo *cgit_parse_tag(struct tag *tag); 295extern struct taginfo *cgit_parse_tag(struct tag *tag);
294extern void cgit_parse_url(const char *url); 296extern void cgit_parse_url(const char *url);