summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
commit5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff)
tree823678b1c4a907cf0df50067c27fb5b752114df5 /cgit.h
parent0b3c746ba80738dbe0885a21406409390936537c (diff)
parent481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff)
downloadcgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2
Merge branch 'lh/binary'
Diffstat (limited to 'cgit.h') (more/less context) (show whitespace changes)
-rw-r--r--cgit.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 4942b96..5f7af51 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
@@ -213,25 +214,26 @@ extern int chk_non_negative(int result, char *msg);
213extern char *trim_end(const char *str, char c); 214extern char *trim_end(const char *str, char c);
214extern char *strlpart(char *txt, int maxlen); 215extern char *strlpart(char *txt, int maxlen);
215extern char *strrpart(char *txt, int maxlen); 216extern char *strrpart(char *txt, int maxlen);
216 217
217extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 218extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
218extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 219extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
219 int flags, void *cb_data); 220 int flags, void *cb_data);
220 221
221extern void *cgit_free_commitinfo(struct commitinfo *info); 222extern void *cgit_free_commitinfo(struct commitinfo *info);
222 223
223extern int cgit_diff_files(const unsigned char *old_sha1, 224extern int cgit_diff_files(const unsigned char *old_sha1,
224 const unsigned char *new_sha1, 225 const unsigned char *new_sha1,
225 linediff_fn fn); 226 unsigned long *old_size, unsigned long *new_size,
227 int *binary, linediff_fn fn);
226 228
227extern void cgit_diff_tree(const unsigned char *old_sha1, 229extern void cgit_diff_tree(const unsigned char *old_sha1,
228 const unsigned char *new_sha1, 230 const unsigned char *new_sha1,
229 filepair_fn fn, const char *prefix); 231 filepair_fn fn, const char *prefix);
230 232
231extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 233extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
232 234
233extern char *fmt(const char *format,...); 235extern char *fmt(const char *format,...);
234 236
235extern struct commitinfo *cgit_parse_commit(struct commit *commit); 237extern struct commitinfo *cgit_parse_commit(struct commit *commit);
236extern struct taginfo *cgit_parse_tag(struct tag *tag); 238extern struct taginfo *cgit_parse_tag(struct tag *tag);
237extern void cgit_parse_url(const char *url); 239extern void cgit_parse_url(const char *url);