summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-10-21 04:05:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-23 05:49:51 (GMT)
commitac1b3d1248f36b26c2eab55022b9a54bde36b1ee (patch)
treec7b164aa108d7ea6722dc6dc0c305eae3fe5b08c /diff.h
parent4f692b19788364ed0bd65983579edcd6e5444f2b (diff)
downloadgit-ac1b3d1248f36b26c2eab55022b9a54bde36b1ee.zip
git-ac1b3d1248f36b26c2eab55022b9a54bde36b1ee.tar.gz
git-ac1b3d1248f36b26c2eab55022b9a54bde36b1ee.tar.bz2
Split up tree diff functions into tree-diff.c library
This makes the tree diff functionality independent of the "git-diff-tree" program, by splitting the core functionality up into a library file. This will be needed for when we teach git-rev-list to only follow a specified set of pathnames, rather than the global revision history. Most of it is a fairly straightforward code move, but it also involves some calling convention cleanup, and moving some of the static variables from diff-tree.c into the options structure. The actual tree change callback routines also become paramterized by the diff_options structure, allowing the library functionality to do something else than just show the diff on stdout. Right now the only user of this functionality remains git-diff-tree itself. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h29
1 files changed, 29 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 2f4a7b4..5115547 100644
--- a/diff.h
+++ b/diff.h
@@ -8,11 +8,31 @@
(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+struct tree_desc {
+ void *buf;
+ unsigned long size;
+};
+
+struct diff_options;
+
+typedef void (*change_fn_t)(struct diff_options *options,
+ unsigned old_mode, unsigned new_mode,
+ const unsigned char *old_sha1,
+ const unsigned char *new_sha1,
+ const char *base, const char *path);
+
+typedef void (*add_remove_fn_t)(struct diff_options *options,
+ int addremove, unsigned mode,
+ const unsigned char *sha1,
+ const char *base, const char *path);
+
struct diff_options {
const char **paths;
const char *filter;
const char *orderfile;
const char *pickaxe;
+ unsigned recursive:1,
+ tree_in_recursive:1;
int break_opt;
int detect_rename;
int find_copies_harder;
@@ -23,8 +43,17 @@ struct diff_options {
int reverse_diff;
int rename_limit;
int setup;
+
+ change_fn_t change;
+ add_remove_fn_t add_remove;
};
+extern void diff_tree_setup_paths(const char **paths);
+extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
+ const char *base, struct diff_options *opt);
+extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
+ const char *base, struct diff_options *opt);
+
extern void diff_addremove(struct diff_options *,
int addremove,
unsigned mode,