summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-13 12:21:19 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-13 12:21:19 (UTC)
commitc4ef667961ef4668c9449124f97d55b9ac46c059 (patch) (unidiff)
tree3e1d3ed9dbf2bac55d0ffbcd2909c5d935fae48b
parent48dc00342effe3ba530ff6cbb79e5d0d5fc740fd (diff)
downloadcgit-c4ef667961ef4668c9449124f97d55b9ac46c059.zip
cgit-c4ef667961ef4668c9449124f97d55b9ac46c059.tar.gz
cgit-c4ef667961ef4668c9449124f97d55b9ac46c059.tar.bz2
Add standard interface for file diff functions
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h7
-rw-r--r--shared.c79
2 files changed, 86 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index 24b02d7..43de375 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,54 +1,55 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
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/xdiff.h> 18#include <xdiff/xdiff.h>
19 19
20 20
21typedef void (*configfn)(const char *name, const char *value); 21typedef void (*configfn)(const char *name, const char *value);
22typedef void (*filepair_fn)(struct diff_filepair *pair); 22typedef void (*filepair_fn)(struct diff_filepair *pair);
23typedef void (*linediff_fn)(char *line, int len);
23 24
24struct cacheitem { 25struct cacheitem {
25 char *name; 26 char *name;
26 struct stat st; 27 struct stat st;
27 int ttl; 28 int ttl;
28 int fd; 29 int fd;
29}; 30};
30 31
31struct repoinfo { 32struct repoinfo {
32 char *url; 33 char *url;
33 char *name; 34 char *name;
34 char *path; 35 char *path;
35 char *desc; 36 char *desc;
36 char *owner; 37 char *owner;
37 char *module_link; 38 char *module_link;
38 int snapshots; 39 int snapshots;
39}; 40};
40 41
41struct repolist { 42struct repolist {
42 int length; 43 int length;
43 int count; 44 int count;
44 struct repoinfo *repos; 45 struct repoinfo *repos;
45}; 46};
46 47
47struct commitinfo { 48struct commitinfo {
48 struct commit *commit; 49 struct commit *commit;
49 char *author; 50 char *author;
50 char *author_email; 51 char *author_email;
51 unsigned long author_date; 52 unsigned long author_date;
52 char *committer; 53 char *committer;
53 char *committer_email; 54 char *committer_email;
54 unsigned long committer_date; 55 unsigned long committer_date;
@@ -88,67 +89,73 @@ extern int cgit_cache_max_create_time;
88extern int cgit_max_msg_len; 89extern int cgit_max_msg_len;
89 90
90extern char *cgit_repo_name; 91extern char *cgit_repo_name;
91extern char *cgit_repo_desc; 92extern char *cgit_repo_desc;
92extern char *cgit_repo_owner; 93extern char *cgit_repo_owner;
93 94
94extern int cgit_query_has_symref; 95extern int cgit_query_has_symref;
95extern int cgit_query_has_sha1; 96extern int cgit_query_has_sha1;
96 97
97extern char *cgit_querystring; 98extern char *cgit_querystring;
98extern char *cgit_query_repo; 99extern char *cgit_query_repo;
99extern char *cgit_query_page; 100extern char *cgit_query_page;
100extern char *cgit_query_search; 101extern char *cgit_query_search;
101extern char *cgit_query_head; 102extern char *cgit_query_head;
102extern char *cgit_query_sha1; 103extern char *cgit_query_sha1;
103extern char *cgit_query_sha2; 104extern char *cgit_query_sha2;
104extern char *cgit_query_path; 105extern char *cgit_query_path;
105extern char *cgit_query_name; 106extern char *cgit_query_name;
106extern int cgit_query_ofs; 107extern int cgit_query_ofs;
107 108
108extern int htmlfd; 109extern int htmlfd;
109 110
110extern void cgit_global_config_cb(const char *name, const char *value); 111extern void cgit_global_config_cb(const char *name, const char *value);
111extern void cgit_repo_config_cb(const char *name, const char *value); 112extern void cgit_repo_config_cb(const char *name, const char *value);
112extern void cgit_querystring_cb(const char *name, const char *value); 113extern void cgit_querystring_cb(const char *name, const char *value);
113 114
114extern int chk_zero(int result, char *msg); 115extern int chk_zero(int result, char *msg);
115extern int chk_positive(int result, char *msg); 116extern int chk_positive(int result, char *msg);
116 117
117extern int hextoint(char c); 118extern int hextoint(char c);
118 119
119extern void *cgit_free_commitinfo(struct commitinfo *info); 120extern void *cgit_free_commitinfo(struct commitinfo *info);
121
122extern int cgit_diff_files(const unsigned char *old_sha1,
123 const unsigned char *new_sha1,
124 linediff_fn fn);
125
120extern void cgit_diff_tree(const unsigned char *old_sha1, 126extern void cgit_diff_tree(const unsigned char *old_sha1,
121 const unsigned char *new_sha1, 127 const unsigned char *new_sha1,
122 filepair_fn fn); 128 filepair_fn fn);
129
123extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 130extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
124 131
125extern char *fmt(const char *format,...); 132extern char *fmt(const char *format,...);
126 133
127extern void html(const char *txt); 134extern void html(const char *txt);
128extern void htmlf(const char *format,...); 135extern void htmlf(const char *format,...);
129extern void html_txt(char *txt); 136extern void html_txt(char *txt);
130extern void html_ntxt(int len, char *txt); 137extern void html_ntxt(int len, char *txt);
131extern void html_attr(char *txt); 138extern void html_attr(char *txt);
132extern void html_hidden(char *name, char *value); 139extern void html_hidden(char *name, char *value);
133extern void html_link_open(char *url, char *title, char *class); 140extern void html_link_open(char *url, char *title, char *class);
134extern void html_link_close(void); 141extern void html_link_close(void);
135extern void html_filemode(unsigned short mode); 142extern void html_filemode(unsigned short mode);
136 143
137extern int cgit_read_config(const char *filename, configfn fn); 144extern int cgit_read_config(const char *filename, configfn fn);
138extern int cgit_parse_query(char *txt, configfn fn); 145extern int cgit_parse_query(char *txt, configfn fn);
139extern struct commitinfo *cgit_parse_commit(struct commit *commit); 146extern struct commitinfo *cgit_parse_commit(struct commit *commit);
140extern struct taginfo *cgit_parse_tag(struct tag *tag); 147extern struct taginfo *cgit_parse_tag(struct tag *tag);
141 148
142extern char *cache_safe_filename(const char *unsafe); 149extern char *cache_safe_filename(const char *unsafe);
143extern int cache_lock(struct cacheitem *item); 150extern int cache_lock(struct cacheitem *item);
144extern int cache_unlock(struct cacheitem *item); 151extern int cache_unlock(struct cacheitem *item);
145extern int cache_cancel_lock(struct cacheitem *item); 152extern int cache_cancel_lock(struct cacheitem *item);
146extern int cache_exist(struct cacheitem *item); 153extern int cache_exist(struct cacheitem *item);
147extern int cache_expired(struct cacheitem *item); 154extern int cache_expired(struct cacheitem *item);
148 155
149extern char *cgit_repourl(const char *reponame); 156extern char *cgit_repourl(const char *reponame);
150extern char *cgit_pageurl(const char *reponame, const char *pagename, 157extern char *cgit_pageurl(const char *reponame, const char *pagename,
151 const char *query); 158 const char *query);
152 159
153extern void cgit_print_error(char *msg); 160extern void cgit_print_error(char *msg);
154extern void cgit_print_date(unsigned long secs); 161extern void cgit_print_date(unsigned long secs);
diff --git a/shared.c b/shared.c
index f8a17b6..801f68d 100644
--- a/shared.c
+++ b/shared.c
@@ -178,63 +178,142 @@ void *cgit_free_commitinfo(struct commitinfo *info)
178 free(info->author_email); 178 free(info->author_email);
179 free(info->committer); 179 free(info->committer);
180 free(info->committer_email); 180 free(info->committer_email);
181 free(info->subject); 181 free(info->subject);
182 free(info); 182 free(info);
183 return NULL; 183 return NULL;
184} 184}
185 185
186int hextoint(char c) 186int hextoint(char c)
187{ 187{
188 if (c >= 'a' && c <= 'f') 188 if (c >= 'a' && c <= 'f')
189 return 10 + c - 'a'; 189 return 10 + c - 'a';
190 else if (c >= 'A' && c <= 'F') 190 else if (c >= 'A' && c <= 'F')
191 return 10 + c - 'A'; 191 return 10 + c - 'A';
192 else if (c >= '0' && c <= '9') 192 else if (c >= '0' && c <= '9')
193 return c - '0'; 193 return c - '0';
194 else 194 else
195 return -1; 195 return -1;
196} 196}
197 197
198void cgit_diff_tree_cb(struct diff_queue_struct *q, 198void cgit_diff_tree_cb(struct diff_queue_struct *q,
199 struct diff_options *options, void *data) 199 struct diff_options *options, void *data)
200{ 200{
201 int i; 201 int i;
202 202
203 for (i = 0; i < q->nr; i++) { 203 for (i = 0; i < q->nr; i++) {
204 if (q->queue[i]->status == 'U') 204 if (q->queue[i]->status == 'U')
205 continue; 205 continue;
206 ((filepair_fn)data)(q->queue[i]); 206 ((filepair_fn)data)(q->queue[i]);
207 } 207 }
208} 208}
209 209
210static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
211{
212 enum object_type type;
213
214 if (is_null_sha1(sha1)) {
215 file->ptr = (char *)"";
216 file->size = 0;
217 } else {
218 file->ptr = read_sha1_file(sha1, &type, &file->size);
219 }
220 return 1;
221}
222
223/*
224 * Receive diff-buffers from xdiff and concatenate them as
225 * needed across multiple callbacks.
226 *
227 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
228 * ripped from git and modified to use globals instead of
229 * a special callback-struct.
230 */
231char *diffbuf = NULL;
232int buflen = 0;
233
234int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
235{
236 int i;
237
238 for (i = 0; i < nbuf; i++) {
239 if (mb[i].ptr[mb[i].size-1] != '\n') {
240 /* Incomplete line */
241 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
242 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
243 buflen += mb[i].size;
244 continue;
245 }
246
247 /* we have a complete line */
248 if (!diffbuf) {
249 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
250 continue;
251 }
252 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
253 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
254 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
255 free(diffbuf);
256 diffbuf = NULL;
257 buflen = 0;
258 }
259 if (diffbuf) {
260 ((linediff_fn)priv)(diffbuf, buflen);
261 free(diffbuf);
262 diffbuf = NULL;
263 buflen = 0;
264 }
265 return 0;
266}
267
268int cgit_diff_files(const unsigned char *old_sha1,
269 const unsigned char *new_sha1,
270 linediff_fn fn)
271{
272 mmfile_t file1, file2;
273 xpparam_t diff_params;
274 xdemitconf_t emit_params;
275 xdemitcb_t emit_cb;
276
277 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
278 return 1;
279
280 diff_params.flags = XDF_NEED_MINIMAL;
281 emit_params.ctxlen = 3;
282 emit_params.flags = XDL_EMIT_FUNCNAMES;
283 emit_cb.outf = filediff_cb;
284 emit_cb.priv = fn;
285 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
286 return 0;
287}
288
210void cgit_diff_tree(const unsigned char *old_sha1, 289void cgit_diff_tree(const unsigned char *old_sha1,
211 const unsigned char *new_sha1, 290 const unsigned char *new_sha1,
212 filepair_fn fn) 291 filepair_fn fn)
213{ 292{
214 struct diff_options opt; 293 struct diff_options opt;
215 int ret; 294 int ret;
216 295
217 diff_setup(&opt); 296 diff_setup(&opt);
218 opt.output_format = DIFF_FORMAT_CALLBACK; 297 opt.output_format = DIFF_FORMAT_CALLBACK;
219 opt.detect_rename = 1; 298 opt.detect_rename = 1;
220 opt.recursive = 1; 299 opt.recursive = 1;
221 opt.format_callback = cgit_diff_tree_cb; 300 opt.format_callback = cgit_diff_tree_cb;
222 opt.format_callback_data = fn; 301 opt.format_callback_data = fn;
223 diff_setup_done(&opt); 302 diff_setup_done(&opt);
224 303
225 if (old_sha1) 304 if (old_sha1)
226 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 305 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
227 else 306 else
228 ret = diff_root_tree_sha1(new_sha1, "", &opt); 307 ret = diff_root_tree_sha1(new_sha1, "", &opt);
229 diffcore_std(&opt); 308 diffcore_std(&opt);
230 diff_flush(&opt); 309 diff_flush(&opt);
231} 310}
232 311
233void cgit_diff_commit(struct commit *commit, filepair_fn fn) 312void cgit_diff_commit(struct commit *commit, filepair_fn fn)
234{ 313{
235 unsigned char *old_sha1 = NULL; 314 unsigned char *old_sha1 = NULL;
236 315
237 if (commit->parents) 316 if (commit->parents)
238 old_sha1 = commit->parents->item->object.sha1; 317 old_sha1 = commit->parents->item->object.sha1;
239 cgit_diff_tree(old_sha1, commit->object.sha1, fn); 318 cgit_diff_tree(old_sha1, commit->object.sha1, fn);
240} 319}