[PATCH] Docs - Makefile update
[gitweb.git] / diff-files.c
index d556b968842a334526a59eb7153db135ca6cb44a..4e0a306ef580036beb21c24bb8b520563b35c172 100644 (file)
@@ -7,62 +7,33 @@
 #include "diff.h"
 
 static const char *diff_files_usage =
-"diff-files [-p] [-q] [-r] [-z] [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)
-{
-       int i;
-       int namelen = ce_namelen(ce);
-       for (i = 0; i < cnt; i++) {
-               int speclen = strlen(spec[i]);
-               if (! strncmp(spec[i], ce->name, speclen) &&
-                   speclen <= namelen &&
-                   (ce->name[speclen] == 0 ||
-                    ce->name[speclen] == '/'))
-                       return 1;
-       }
-       return 0;
-}
-
 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)
+int main(int argc, const char **argv)
 {
        static const unsigned char null_sha1[20] = { 0, };
        int entries = read_cache();
@@ -70,7 +41,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"))
@@ -78,7 +49,19 @@ int main(int argc, char **argv)
                else if (!strcmp(argv[1], "-s"))
                        ; /* no-op */
                else if (!strcmp(argv[1], "-z"))
-                       line_termination = 0;
+                       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 = DIFF_DETECT_RENAME;
+               }
+               else if (!strncmp(argv[1], "-C", 2)) {
+                       diff_score_opt = diff_scoreopt_parse(argv[1]);
+                       detect_rename = DIFF_DETECT_COPY;
+               }
                else
                        usage(diff_files_usage);
                argv++; argc--;
@@ -92,16 +75,14 @@ int main(int argc, char **argv)
                exit(1);
        }
 
+       diff_setup(reverse_diff);
+
        for (i = 0; i < entries; i++) {
                struct stat st;
                unsigned int oldmode, mode;
                struct cache_entry *ce = active_cache[i];
                int changed;
 
-               if (1 < argc &&
-                   ! matches_pathspec(ce, argv+1, argc-1))
-                       continue;
-
                if (ce_stage(ce)) {
                        show_unmerge(ce->name);
                        while (i < entries &&
@@ -110,19 +91,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 < DIFF_DETECT_COPY)
                        continue;
 
                oldmode = ntohl(ce->ce_mode);
@@ -132,5 +113,13 @@ int main(int argc, char **argv)
                show_modified(oldmode, mode, ce->sha1, null_sha1,
                              ce->name);
        }
+       if (detect_rename)
+               diffcore_rename(detect_rename, diff_score_opt);
+       diffcore_prune();
+       if (pickaxe)
+               diffcore_pickaxe(pickaxe);
+       if (1 < argc)
+               diffcore_pathspec(argv + 1);
+       diff_flush(diff_output_format);
        return 0;
 }