[PATCH] The diff-raw format updates.

[git.git] / diff-files.c

diff --git a/diff-files.c b/diff-files.c
index 7ffe663..884d452 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,11 +7,13 @@
 #include "diff.h"
 
 static const char *diff_files_usage =
-"diff-files [-p] [-q] [-r] [-z] [-M] [paths...]";
+"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
 
-static int generate_patch = 0;
-static int line_termination = '\n';
+static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int detect_rename = 0;
+static int reverse_diff = 0;
+static int diff_score_opt = 0;
+static const char *pickaxe = NULL;
 static int silent = 0;
 
 static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
@@ -31,36 +33,19 @@ static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
 
 static void show_unmerge(const char *path)
 {
-       if (generate_patch)
-               diff_unmerge(path);
-       else
-               printf("U %s%c", path, line_termination);
+       diff_unmerge(path);
 }
 
 static void show_file(int pfx, struct cache_entry *ce)
 {
-       if (generate_patch)
-               diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1,
-                              ce->name, NULL);
-       else
-               printf("%c%06o\t%s\t%s\t%s%c",
-                      pfx, ntohl(ce->ce_mode), "blob",
-                      sha1_to_hex(ce->sha1), ce->name, line_termination);
+       diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
 }
 
 static void show_modified(int oldmode, int mode,
                          const unsigned char *old_sha1, const unsigned char *sha1,
                          char *path)
 {
-       char old_sha1_hex[41];
-       strcpy(old_sha1_hex, sha1_to_hex(old_sha1));
-
-       if (generate_patch)
-               diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
-       else
-               printf("*%06o->%06o\tblob\t%s->%s\t%s%c",
-                      oldmode, mode, old_sha1_hex, sha1_to_hex(sha1), path,
-                      line_termination);
+       diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
 }
 
 int main(int argc, char **argv)
@@ -71,7 +56,7 @@ int main(int argc, char **argv)
 
        while (1 < argc && argv[1][0] == '-') {
                if (!strcmp(argv[1], "-p"))
-                       generate_patch = 1;
+                       diff_output_format = DIFF_FORMAT_PATCH;
                else if (!strcmp(argv[1], "-q"))
                        silent = 1;
                else if (!strcmp(argv[1], "-r"))
@@ -79,9 +64,18 @@ int main(int argc, char **argv)
                else if (!strcmp(argv[1], "-s"))
                        ; /* no-op */
                else if (!strcmp(argv[1], "-z"))
-                       line_termination = 0;
-               else if (!strcmp(argv[1], "-M")) {
-                       detect_rename = generate_patch = 1;
+                       diff_output_format = DIFF_FORMAT_MACHINE;
+               else if (!strcmp(argv[1], "-R"))
+                       reverse_diff = 1;
+               else if (!strcmp(argv[1], "-S"))
+                       pickaxe = argv[1] + 2;
+               else if (!strncmp(argv[1], "-M", 2)) {
+                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       detect_rename = 1;
+               }
+               else if (!strncmp(argv[1], "-C", 2)) {
+                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       detect_rename = 2;
                }
                else
                        usage(diff_files_usage);
@@ -96,8 +90,7 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       if (generate_patch)
-               diff_setup(detect_rename, 0, 0, 0, 0);          
+       diff_setup(reverse_diff, diff_output_format);
 
        for (i = 0; i < entries; i++) {
                struct stat st;
@@ -117,19 +110,19 @@ int main(int argc, char **argv)
                        i--; /* compensate for loop control increments */
                        continue;
                }
- 
+
                if (lstat(ce->name, &st) < 0) {
-                       if (errno != ENOENT) {
+                       if (errno != ENOENT && errno != ENOTDIR) {
                                perror(ce->name);
                                continue;
-                       }       
+                       }
                        if (silent)
                                continue;
                        show_file('-', ce);
                        continue;
                }
                changed = ce_match_stat(ce, &st);
-               if (!changed)
+               if (!changed && detect_rename < 2)
                        continue;
 
                oldmode = ntohl(ce->ce_mode);
@@ -139,7 +132,10 @@ int main(int argc, char **argv)
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);
        }
-       if (generate_patch)
-               diff_flush();
+       if (detect_rename)
+               diff_detect_rename(detect_rename, diff_score_opt);
+       if (pickaxe)
+               diff_pickaxe(pickaxe);
+       diff_flush(NULL, 0);
        return 0;
 }