summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-01-31 09:40:40 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-31 09:40:40 (UTC)
commitc495cf02bac16e459f7c9e1740798646f12c00c5 (patch) (unidiff)
treea36ba3904edd96ffc79fdf420fb10d33117a469f /cgit.h
parentd6174b7aab476c2b6a86e59d98cf978d603045f4 (diff)
downloadcgit-c495cf02bac16e459f7c9e1740798646f12c00c5.zip
cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.gz
cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.bz2
Handle binary files in diffs
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch) how to handle binary files. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.h') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 4fe94c6..8b0defa 100644
--- a/cgit.h
+++ b/cgit.h
@@ -6,24 +6,25 @@
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 <xdiff-interface.h>
18#include <xdiff/xdiff.h> 19#include <xdiff/xdiff.h>
19#include <utf8.h> 20#include <utf8.h>
20 21
21 22
22/* 23/*
23 * Dateformats used on misc. pages 24 * Dateformats used on misc. pages
24 */ 25 */
25#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" 26#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
26#define FMT_SHORTDATE "%Y-%m-%d" 27#define FMT_SHORTDATE "%Y-%m-%d"
27#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" 28#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
28 29
29 30
@@ -212,25 +213,26 @@ extern int chk_non_negative(int result, char *msg);
212extern char *trim_end(const char *str, char c); 213extern char *trim_end(const char *str, char c);
213extern char *strlpart(char *txt, int maxlen); 214extern char *strlpart(char *txt, int maxlen);
214extern char *strrpart(char *txt, int maxlen); 215extern char *strrpart(char *txt, int maxlen);
215 216
216extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 217extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
217extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 218extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
218 int flags, void *cb_data); 219 int flags, void *cb_data);
219 220
220extern void *cgit_free_commitinfo(struct commitinfo *info); 221extern void *cgit_free_commitinfo(struct commitinfo *info);
221 222
222extern int cgit_diff_files(const unsigned char *old_sha1, 223extern int cgit_diff_files(const unsigned char *old_sha1,
223 const unsigned char *new_sha1, 224 const unsigned char *new_sha1,
224 linediff_fn fn); 225 unsigned long *old_size, unsigned long *new_size,
226 int *binary, linediff_fn fn);
225 227
226extern void cgit_diff_tree(const unsigned char *old_sha1, 228extern void cgit_diff_tree(const unsigned char *old_sha1,
227 const unsigned char *new_sha1, 229 const unsigned char *new_sha1,
228 filepair_fn fn, const char *prefix); 230 filepair_fn fn, const char *prefix);
229 231
230extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 232extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
231 233
232extern char *fmt(const char *format,...); 234extern char *fmt(const char *format,...);
233 235
234extern struct commitinfo *cgit_parse_commit(struct commit *commit); 236extern struct commitinfo *cgit_parse_commit(struct commit *commit);
235extern struct taginfo *cgit_parse_tag(struct tag *tag); 237extern struct taginfo *cgit_parse_tag(struct tag *tag);
236extern void cgit_parse_url(const char *url); 238extern void cgit_parse_url(const char *url);