author | Johan Herland <johan@herland.net> | 2010-06-24 15:52:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 08:53:48 (UTC) |
commit | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch) (unidiff) | |
tree | 48d555b15c0432bb98712d746100bf6c0fe2be4a /cgit.h | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.bz2 |
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and
cgit_diff_tree() to Git's diff machinery. This is equivalent to passing
--ignore-all-space to 'git diff'.
Signed-off-by: Johan Herland <johan@herland.net>
-rw-r--r-- | cgit.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -133,32 +133,33 @@ struct cgit_query { | |||
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 | int context; |
149 | int ignorews; | ||
149 | char *vpath; | 150 | char *vpath; |
150 | }; | 151 | }; |
151 | 152 | ||
152 | struct cgit_config { | 153 | struct cgit_config { |
153 | char *agefile; | 154 | char *agefile; |
154 | char *cache_root; | 155 | char *cache_root; |
155 | char *clone_prefix; | 156 | char *clone_prefix; |
156 | char *css; | 157 | char *css; |
157 | char *favicon; | 158 | char *favicon; |
158 | char *footer; | 159 | char *footer; |
159 | char *head_include; | 160 | char *head_include; |
160 | char *header; | 161 | char *header; |
161 | char *index_header; | 162 | char *index_header; |
162 | char *index_info; | 163 | char *index_info; |
163 | char *logo; | 164 | char *logo; |
164 | char *logo_link; | 165 | char *logo_link; |
@@ -262,37 +263,38 @@ extern int chk_zero(int result, char *msg); | |||
262 | extern int chk_positive(int result, char *msg); | 263 | extern int chk_positive(int result, char *msg); |
263 | extern int chk_non_negative(int result, char *msg); | 264 | extern int chk_non_negative(int result, char *msg); |
264 | 265 | ||
265 | extern char *trim_end(const char *str, char c); | 266 | extern char *trim_end(const char *str, char c); |
266 | extern char *strlpart(char *txt, int maxlen); | 267 | extern char *strlpart(char *txt, int maxlen); |
267 | extern char *strrpart(char *txt, int maxlen); | 268 | extern char *strrpart(char *txt, int maxlen); |
268 | 269 | ||
269 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 270 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
270 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 271 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
271 | int flags, void *cb_data); | 272 | int flags, void *cb_data); |
272 | 273 | ||
273 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 274 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
274 | 275 | ||
275 | extern int cgit_diff_files(const unsigned char *old_sha1, | 276 | extern int cgit_diff_files(const unsigned char *old_sha1, |
276 | const unsigned char *new_sha1, | 277 | const unsigned char *new_sha1, |
277 | unsigned long *old_size, unsigned long *new_size, | 278 | unsigned long *old_size, unsigned long *new_size, |
278 | int *binary, int context, linediff_fn fn); | 279 | int *binary, int context, int ignorews, |
280 | linediff_fn fn); | ||
279 | 281 | ||
280 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 282 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
281 | const unsigned char *new_sha1, | 283 | const unsigned char *new_sha1, |
282 | filepair_fn fn, const char *prefix); | 284 | filepair_fn fn, const char *prefix, int ignorews); |
283 | 285 | ||
284 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 286 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
285 | 287 | ||
286 | extern char *fmt(const char *format,...); | 288 | extern char *fmt(const char *format,...); |
287 | 289 | ||
288 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 290 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
289 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 291 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
290 | extern void cgit_parse_url(const char *url); | 292 | extern void cgit_parse_url(const char *url); |
291 | 293 | ||
292 | extern const char *cgit_repobasename(const char *reponame); | 294 | extern const char *cgit_repobasename(const char *reponame); |
293 | 295 | ||
294 | extern int cgit_parse_snapshots_mask(const char *str); | 296 | extern int cgit_parse_snapshots_mask(const char *str); |
295 | 297 | ||
296 | extern int cgit_open_filter(struct cgit_filter *filter); | 298 | extern int cgit_open_filter(struct cgit_filter *filter); |
297 | extern int cgit_close_filter(struct cgit_filter *filter); | 299 | extern int cgit_close_filter(struct cgit_filter *filter); |
298 | 300 | ||