[PATCH] Do not expose internal scaling to diff-helper.

Junio C Hamano · Linus Torvalds · commit 903d475a0bcd · 2005-05-29T11:17:43.000-07:00
Instead we can normalize what diff-raw records at the diffcore
side.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/diff-helper.c b/diff-helper.c
@@ -4,7 +4,6 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "diff.h"
-#include "diffcore.h" /* just for MAX_SCORE */
 
 static const char *pickaxe = NULL;
 static int line_termination = '\n';
@@ -78,7 +77,6 @@ int main(int ac, const char **av) {
 			if (status == 'R' || status == 'C') {
 				two_paths = 1;
 				sscanf(cp, "%d", &score);
-				score = score * MAX_SCORE / 100;
 				if (line_termination) {
 					cp = strchr(cp,
 						    inter_name_termination);
diff --git a/diff.c b/diff.c
@@ -886,7 +886,7 @@ void diff_helper_input(unsigned old_mode,
 	if (new_mode)
 		fill_filespec(two, new_sha1, new_mode);
 	dp = diff_queue(&diff_queued_diff, one, two);
-	dp->score = score;
+	dp->score = score * MAX_SCORE / 100;
 	dp->status = status;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ void diff_helper_input(unsigned old_mode,`
`886`	`886`	`if (new_mode)`
`887`	`887`	`fill_filespec(two, new_sha1, new_mode);`
`888`	`888`	`dp = diff_queue(&diff_queued_diff, one, two);`
`889`		`- dp->score = score;`
	`889`	`+ dp->score = score * MAX_SCORE / 100;`
`890`	`890`	`dp->status = status;`
`891`	`891`	`}`
`892`	`892`