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

Instead we can normalize what diff-raw records at the diffcore
side.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/diff-helper.c b/diff-helper.c
index 2dd6bdac33a470d3ff4f6fe63149ba33f167a4a3..4da2614fc699ddb6d6a963c1181ac5b372272a1f 100644 (file)
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -4,7 +4,6 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "diff.h"
 #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';
 
 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);
                        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);
                                if (line_termination) {
                                        cp = strchr(cp,
                                                    inter_name_termination);

diff --git a/diff.c b/diff.c
index 680b521a8bcab5355306ba6367d4c7f2cbd75f5c..5031c7d685a8238353b950bbff6a94e00f5c6740 100644 (file)
--- 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);
        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;
 }
 
        dp->status = status;
 }