summaryrefslogtreecommitdiff
path: root/diff-helper.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-21 09:39:09 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 16:58:03 (GMT)
commit427dcb4bca49117664d9428fd4e86483f516d703 (patch)
treeb97246a87e8852b9b3cdf3c9956c895d92fbab6f /diff-helper.c
parentc8265ac096afe8a0eb460a41c0620f6ae13394fe (diff)
downloadgit-427dcb4bca49117664d9428fd4e86483f516d703.zip
git-427dcb4bca49117664d9428fd4e86483f516d703.tar.gz
git-427dcb4bca49117664d9428fd4e86483f516d703.tar.bz2
[PATCH] Diff overhaul, adding half of copy detection.
This introduces the diff-core, the layer between the diff-tree family and the external diff interface engine. The calls to the interface diff-tree family uses (diff_change and diff_addremove) have not changed and will not change. The purpose of the diff-core layer is to provide an infrastructure to transform the set of differences sent from the applications, before sending them to the external diff interface. The recently introduced rename detection code has been rewritten to use the diff-core facility. When applications send in separate creates and deletes, matching ones are transformed into a single rename-and-edit diff, and sent out to the external diff interface as such. This patch also enhances the rename detection code further to be able to detect copies. Currently this happens only as long as copy sources appear as part of the modified files, but there already is enough provision for callers to report unmodified files to diff-core, so that they can be also used as copy source candidates. Extending the callers this way will be done in a separate patch. Please see and marvel at how well this works by trying out the newly added t/t4003-diff-rename-1.sh test script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-helper.c')
-rw-r--r--diff-helper.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/diff-helper.c b/diff-helper.c
index ea9aefa..4e966db 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -8,6 +8,7 @@
static int detect_rename = 0;
static int diff_score_opt = 0;
+static int generate_patch = 1;
static int parse_oneside_change(const char *cp, int *mode,
unsigned char *sha1, char *path)
@@ -20,7 +21,8 @@ static int parse_oneside_change(const char *cp, int *mode,
cp++;
}
*mode = m;
- if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6))
+ if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6) &&
+ strncmp(cp, "\ttree\t", 6) && strncmp(cp, " tree ", 6))
return -1;
cp += 6;
if (get_sha1_hex(cp, sha1))
@@ -44,11 +46,13 @@ static int parse_diff_raw_output(const char *buf)
diff_unmerge(cp + 1);
break;
case '+':
- parse_oneside_change(cp, &new_mode, new_sha1, path);
+ if (parse_oneside_change(cp, &new_mode, new_sha1, path))
+ return -1;
diff_addremove('+', new_mode, new_sha1, path, NULL);
break;
case '-':
- parse_oneside_change(cp, &old_mode, old_sha1, path);
+ if (parse_oneside_change(cp, &old_mode, old_sha1, path))
+ return -1;
diff_addremove('-', old_mode, old_sha1, path, NULL);
break;
case '*':
@@ -64,7 +68,8 @@ static int parse_diff_raw_output(const char *buf)
new_mode = (new_mode << 3) | (ch - '0');
cp++;
}
- if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6))
+ if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6) &&
+ strncmp(cp, "\ttree\t", 6) && strncmp(cp, " tree ", 6))
return -1;
cp += 6;
if (get_sha1_hex(cp, old_sha1))
@@ -88,7 +93,7 @@ static int parse_diff_raw_output(const char *buf)
}
static const char *diff_helper_usage =
- "git-diff-helper [-z] [-R] [-M] paths...";
+ "git-diff-helper [-z] [-R] [-M] [-C] paths...";
int main(int ac, const char **av) {
struct strbuf sb;
@@ -102,17 +107,25 @@ int main(int ac, const char **av) {
reverse = 1;
else if (av[1][1] == 'z')
line_termination = 0;
+ else if (av[1][1] == 'p') /* hidden from the help */
+ generate_patch = 0;
else if (av[1][1] == 'M') {
detect_rename = 1;
diff_score_opt = diff_scoreopt_parse(av[1]);
}
+ else if (av[1][1] == 'C') {
+ detect_rename = 2;
+ diff_score_opt = diff_scoreopt_parse(av[1]);
+ }
else
usage(diff_helper_usage);
ac--; av++;
}
/* the remaining parameters are paths patterns */
- diff_setup(detect_rename, diff_score_opt, reverse, -1, av+1, ac-1);
+ diff_setup(detect_rename, diff_score_opt, reverse,
+ (generate_patch ? -1 : line_termination),
+ av+1, ac-1);
while (1) {
int status;