summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-20 02:00:36 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 05:33:07 (GMT)
commit57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch)
tree8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /diff-tree.c
parentdc26bd890d0a8571c38397e2ab33c0f3963c01a7 (diff)
downloadgit-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.zip
git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.gz
git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.bz2
[PATCH] diff overhaul
This cleans up the way calls are made into the diff core from diff-tree family and diff-helper. Earlier, these programs had "if (generating_patch)" sprinkled all over the place, but those ugliness are gone and handled uniformly from the diff core, even when not generating patch format. This also allowed diff-cache and diff-files to acquire -R (reverse) option to generate diff in reverse. Users of diff-tree can swap two trees easily so I did not add -R there. [ Linus' note: I'll add -R to "diff-tree" too, since a "commit diff" doesn't have another tree to switch around: the other tree is always the parent(s) of the commit ] Also -M<digits-as-mantissa> suggestion made by Linus has been implemented. Documentation updates are also included. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c46
1 files changed, 15 insertions, 31 deletions
diff --git a/diff-tree.c b/diff-tree.c
index 9d94e0c..b43df18 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -11,6 +11,7 @@ static int read_stdin = 0;
static int line_termination = '\n';
static int generate_patch = 0;
static int detect_rename = 0;
+static int diff_score_opt = 0;
static const char *header = NULL;
static const char *header_prefix = "";
@@ -84,21 +85,13 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
die("corrupt tree sha %s", sha1_to_hex(sha1));
show_tree(prefix, tree, size, newbase);
-
+
free(tree);
free(newbase);
return;
}
- if (generate_patch) {
- if (!S_ISDIR(mode))
- diff_addremove(prefix[0], mode, sha1, base, path);
- }
- else
- printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
- S_ISDIR(mode) ? "tree" : "blob",
- sha1_to_hex(sha1), base, path,
- line_termination);
+ diff_addremove(prefix[0], mode, sha1, base, path);
}
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -107,7 +100,6 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
const char *path1, *path2;
const unsigned char *sha1, *sha2;
int cmp, pathlen1, pathlen2;
- char old_sha1_hex[50];
sha1 = extract(tree1, size1, &path1, &mode1);
sha2 = extract(tree2, size2, &path2, &mode2);
@@ -151,17 +143,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
if (silent)
return 0;
- if (generate_patch) {
- if (!S_ISDIR(mode1))
- diff_change(mode1, mode2, sha1, sha2, base, path1);
- }
- else {
- strcpy(old_sha1_hex, sha1_to_hex(sha1));
- printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
- S_ISDIR(mode1) ? "tree" : "blob",
- old_sha1_hex, sha1_to_hex(sha2), base, path1,
- line_termination);
- }
+ diff_change(mode1, mode2, sha1, sha2, base, path1);
return 0;
}
@@ -287,11 +269,12 @@ static int diff_tree_sha1_top(const unsigned char *old,
const unsigned char *new, const char *base)
{
int ret;
- if (generate_patch)
- diff_setup(detect_rename, 0, 0, 0, 0);
+
+ diff_setup(detect_rename, diff_score_opt, 0,
+ (generate_patch ? -1 : line_termination),
+ 0, 0);
ret = diff_tree_sha1(old, new, base);
- if (generate_patch)
- diff_flush();
+ diff_flush();
return ret;
}
@@ -301,15 +284,15 @@ static int diff_root_tree(const unsigned char *new, const char *base)
void *tree;
unsigned long size;
- if (generate_patch)
- diff_setup(detect_rename, 0, 0, 0, 0);
+ diff_setup(detect_rename, diff_score_opt, 0,
+ (generate_patch ? -1 : line_termination),
+ 0, 0);
tree = read_object_with_reference(new, "tree", &size, 0);
if (!tree)
die("unable to read root tree (%s)", sha1_to_hex(new));
retval = diff_tree("", 0, tree, size, base);
free(tree);
- if (generate_patch)
- diff_flush();
+ diff_flush();
return retval;
}
@@ -485,8 +468,9 @@ int main(int argc, char **argv)
recursive = generate_patch = 1;
continue;
}
- if (!strcmp(arg, "-M")) {
+ if (!strncmp(arg, "-M", 2)) {
detect_rename = recursive = generate_patch = 1;
+ diff_score_opt = diff_scoreopt_parse(arg);
continue;
}
if (!strcmp(arg, "-z")) {