summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-18 06:29:49 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 18:16:24 (GMT)
commit915838c3cbf5695e754b2826ee5e8fd46b23b0b7 (patch)
treebc893d0dd849a227a7ffcdffdb0a545232c755b2 /diff.c
parente7bd907db6a707481066f2c8d58e208110824358 (diff)
downloadgit-915838c3cbf5695e754b2826ee5e8fd46b23b0b7.zip
git-915838c3cbf5695e754b2826ee5e8fd46b23b0b7.tar.gz
git-915838c3cbf5695e754b2826ee5e8fd46b23b0b7.tar.bz2
[PATCH] Diff-helper update
This patch adds a framework and a stub implementation of rename detection to diff-helper program. The current stub code is just enough to detect pure renames in diff-tree output and not fancier. The plan is perhaps to use the same delta code when Nico's delta storage patch is merged for similarity evaluation purposes. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/diff.c b/diff.c
index 36e8bd4..74004e5 100644
--- a/diff.c
+++ b/diff.c
@@ -79,7 +79,8 @@ static struct diff_tempfile {
char tmp_path[50];
} diff_temp[2];
-static void builtin_diff(const char *name,
+static void builtin_diff(const char *name_a,
+ const char *name_b,
struct diff_tempfile *temp)
{
int i, next_at;
@@ -88,9 +89,12 @@ static void builtin_diff(const char *name,
const char *input_name_sq[2];
const char *path0[2];
const char *path1[2];
- const char *name_sq = sq_expand(name);
+ const char *name_sq[2];
char *cmd;
-
+
+ name_sq[0] = sq_expand(name_a);
+ name_sq[1] = sq_expand(name_b);
+
/* diff_cmd and diff_arg have 6 %s in total which makes
* the sum of these strings 12 bytes larger than required.
* we use 2 spaces around diff-opts, and we need to count
@@ -105,7 +109,7 @@ static void builtin_diff(const char *name,
path1[i] = "";
} else {
path0[i] = i ? "b/" : "a/";
- path1[i] = name_sq;
+ path1[i] = name_sq[i];
}
cmd_size += (strlen(path0[i]) + strlen(path1[i]) +
strlen(input_name_sq[i]));
@@ -122,7 +126,7 @@ static void builtin_diff(const char *name,
next_at += snprintf(cmd+next_at, cmd_size-next_at,
diff_arg, input_name_sq[0], input_name_sq[1]);
- printf("diff --git a/%s b/%s\n", name, name);
+ printf("diff --git a/%s b/%s\n", name_a, name_b);
if (!path1[0][0])
printf("new file mode %s\n", temp[1].mode);
else if (!path1[1][0])
@@ -132,6 +136,10 @@ static void builtin_diff(const char *name,
printf("old mode %s\n", temp[0].mode);
printf("new mode %s\n", temp[1].mode);
}
+ if (strcmp(name_a, name_b)) {
+ printf("rename old %s\n", name_a);
+ printf("rename new %s\n", name_b);
+ }
if (strncmp(temp[0].mode, temp[1].mode, 3))
/* we do not run diff between different kind
* of objects.
@@ -157,7 +165,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1)
* benchmark with my previous version that always reads cache
* shows that it makes things worse for diff-tree comparing
* two linux-2.6 kernel trees in an already checked out work
- * tree. This is because most diff-tree comparison deals with
+ * tree. This is because most diff-tree comparisons deal with
* only a small number of files, while reading the cache is
* expensive for a large project, and its cost outweighs the
* savings we get by not inflating the object to a temporary
@@ -294,6 +302,7 @@ static void remove_tempfile_on_signal(int signo)
*
*/
void run_external_diff(const char *name,
+ const char *other,
struct diff_spec *one,
struct diff_spec *two)
{
@@ -304,7 +313,7 @@ void run_external_diff(const char *name,
if (one && two) {
prepare_temp_file(name, &temp[0], one);
- prepare_temp_file(name, &temp[1], two);
+ prepare_temp_file(other ? : name, &temp[1], two);
if (! atexit_asked &&
(temp[0].name == temp[0].tmp_path ||
temp[1].name == temp[1].tmp_path)) {
@@ -320,7 +329,8 @@ void run_external_diff(const char *name,
die("unable to fork");
if (!pid) {
const char *pgm = external_diff();
- if (pgm) {
+ /* not passing rename patch to external ones */
+ if (!other && pgm) {
if (one && two)
execlp(pgm, pgm,
name,
@@ -334,7 +344,7 @@ void run_external_diff(const char *name,
* otherwise we use the built-in one.
*/
if (one && two)
- builtin_diff(name, temp);
+ builtin_diff(name, other ? : name, temp);
else
printf("* Unmerged path %s\n", name);
exit(0);
@@ -379,7 +389,7 @@ void diff_addremove(int addremove, unsigned mode,
strcpy(concatpath, base);
strcat(concatpath, path);
}
- run_external_diff(path ? concatpath : base, one, two);
+ run_external_diff(path ? concatpath : base, NULL, one, two);
}
void diff_change(unsigned old_mode, unsigned new_mode,
@@ -400,10 +410,10 @@ void diff_change(unsigned old_mode, unsigned new_mode,
strcpy(concatpath, base);
strcat(concatpath, path);
}
- run_external_diff(path ? concatpath : base, &spec[0], &spec[1]);
+ run_external_diff(path ? concatpath : base, NULL, &spec[0], &spec[1]);
}
void diff_unmerge(const char *path)
{
- run_external_diff(path, NULL, NULL);
+ run_external_diff(path, NULL, NULL, NULL);
}