author | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 09:40:40 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 09:40:40 (UTC) |
commit | c495cf02bac16e459f7c9e1740798646f12c00c5 (patch) (unidiff) | |
tree | a36ba3904edd96ffc79fdf420fb10d33117a469f /cgit.h | |
parent | d6174b7aab476c2b6a86e59d98cf978d603045f4 (diff) | |
download | cgit-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>
-rw-r--r-- | cgit.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -10,16 +10,17 @@ | |||
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)" |
@@ -216,17 +217,18 @@ extern char *strrpart(char *txt, int maxlen); | |||
216 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 217 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
217 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 218 | extern 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 | ||
220 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 221 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
221 | 222 | ||
222 | extern int cgit_diff_files(const unsigned char *old_sha1, | 223 | extern 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 | ||
226 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 228 | extern 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 | ||
230 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 232 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
231 | 233 | ||
232 | extern char *fmt(const char *format,...); | 234 | extern char *fmt(const char *format,...); |