diff options
author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:24:23 +0000 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:24:23 +0000 |
commit | 1b49de3c2c52e29c78f870826b6334abdadc0295 (patch) | |
tree | 65c91902c77afe4837d2a650de5863e6afc9c9a7 /shared.c | |
parent | f5af0beb6ab569d64950ca55a52a07923917ce81 (diff) | |
download | cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.tar cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.tar.gz cgit-1b49de3c2c52e29c78f870826b6334abdadc0295.zip |
Add shared diff-handling functions
This adds a standard interface for tree diffing.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'shared.c')
-rw-r--r-- | shared.c | 47 |
1 files changed, 45 insertions, 2 deletions
@@ -74,8 +74,8 @@ struct repoinfo *add_repo(const char *url) cgit_repolist.length = 8; else cgit_repolist.length *= 2; - cgit_repolist.repos = xrealloc(cgit_repolist.repos, - cgit_repolist.length * + cgit_repolist.repos = xrealloc(cgit_repolist.repos, + cgit_repolist.length * sizeof(struct repoinfo)); } @@ -195,3 +195,46 @@ int hextoint(char c) return -1; } +void cgit_diff_tree_cb(struct diff_queue_struct *q, + struct diff_options *options, void *data) +{ + int i; + + for (i = 0; i < q->nr; i++) { + if (q->queue[i]->status == 'U') + continue; + ((filepair_fn)data)(q->queue[i]); + } +} + +void cgit_diff_tree(const unsigned char *old_sha1, + const unsigned char *new_sha1, + filepair_fn fn) +{ + struct diff_options opt; + int ret; + + diff_setup(&opt); + opt.output_format = DIFF_FORMAT_CALLBACK; + opt.detect_rename = 1; + opt.recursive = 1; + opt.format_callback = cgit_diff_tree_cb; + opt.format_callback_data = fn; + diff_setup_done(&opt); + + if (old_sha1) + ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); + else + ret = diff_root_tree_sha1(new_sha1, "", &opt); + diffcore_std(&opt); + diff_flush(&opt); +} + +void cgit_diff_commit(struct commit *commit, filepair_fn fn) +{ + unsigned char *old_sha1 = NULL; + + if (commit->parents) + old_sha1 = commit->parents->item->object.sha1; + cgit_diff_tree(old_sha1, commit->object.sha1, fn); +} |