author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:24:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:24:23 (UTC) |
commit | 1b49de3c2c52e29c78f870826b6334abdadc0295 (patch) (unidiff) | |
tree | 65c91902c77afe4837d2a650de5863e6afc9c9a7 /shared.c | |
parent | f5af0beb6ab569d64950ca55a52a07923917ce81 (diff) | |
download | cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.zip cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.tar.gz cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.tar.bz2 |
Add shared diff-handling functions
This adds a standard interface for tree diffing.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 47 |
1 files changed, 45 insertions, 2 deletions
@@ -76,4 +76,4 @@ struct repoinfo *add_repo(const char *url) | |||
76 | cgit_repolist.length *= 2; | 76 | cgit_repolist.length *= 2; |
77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
78 | cgit_repolist.length * | 78 | cgit_repolist.length * |
79 | sizeof(struct repoinfo)); | 79 | sizeof(struct repoinfo)); |
@@ -197 +197,44 @@ int hextoint(char c) | |||
197 | 197 | ||
198 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | ||
199 | struct diff_options *options, void *data) | ||
200 | { | ||
201 | int i; | ||
202 | |||
203 | for (i = 0; i < q->nr; i++) { | ||
204 | if (q->queue[i]->status == 'U') | ||
205 | continue; | ||
206 | ((filepair_fn)data)(q->queue[i]); | ||
207 | } | ||
208 | } | ||
209 | |||
210 | void cgit_diff_tree(const unsigned char *old_sha1, | ||
211 | const unsigned char *new_sha1, | ||
212 | filepair_fn fn) | ||
213 | { | ||
214 | struct diff_options opt; | ||
215 | int ret; | ||
216 | |||
217 | diff_setup(&opt); | ||
218 | opt.output_format = DIFF_FORMAT_CALLBACK; | ||
219 | opt.detect_rename = 1; | ||
220 | opt.recursive = 1; | ||
221 | opt.format_callback = cgit_diff_tree_cb; | ||
222 | opt.format_callback_data = fn; | ||
223 | diff_setup_done(&opt); | ||
224 | |||
225 | if (old_sha1) | ||
226 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | ||
227 | else | ||
228 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | ||
229 | diffcore_std(&opt); | ||
230 | diff_flush(&opt); | ||
231 | } | ||
232 | |||
233 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | ||
234 | { | ||
235 | unsigned char *old_sha1 = NULL; | ||
236 | |||
237 | if (commit->parents) | ||
238 | old_sha1 = commit->parents->item->object.sha1; | ||
239 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); | ||
240 | } | ||