Start adding interfaces to read in partial trees

[git.git] / diff-cache.c

diff --git a/diff-cache.c b/diff-cache.c
index 7d067a8..d78cbb5 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -5,11 +5,14 @@ static int cached_only = 0;
 static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int match_nonexisting = 0;
 static int detect_rename = 0;
+static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
 static int pickaxe_opts = 0;
 static int diff_break_opt = -1;
+static const char *orderfile = NULL;
+static const char *diff_filter = NULL;
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@ -73,7 +76,7 @@ static int show_modified(struct cache_entry *old,
 
        oldmode = old->ce_mode;
        if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
-           detect_rename < DIFF_DETECT_COPY)
+           !find_copies_harder)
                return 0;
 
        mode = ntohl(mode);
@@ -156,7 +159,9 @@ static void mark_merge_entries(void)
 }
 
 static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
+"git-diff-cache [-m] [--cached] "
+"[<common diff options>] <tree-ish> [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
 {
@@ -166,13 +171,14 @@ int main(int argc, const char **argv)
        void *tree;
        unsigned long size;
        int ret;
+       int allow_options = 1;
        int i;
 
        read_cache();
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
-               if (*arg != '-') {
+               if (!allow_options || *arg != '-') {
                        if (tree_name) {
                                pathspec = argv + i;
                                break;
@@ -181,32 +187,52 @@ int main(int argc, const char **argv)
                        continue;
                }
                        
+               if (!strcmp(arg, "--")) {
+                       allow_options = 0;
+                       continue;
+               }
                if (!strcmp(arg, "-r")) {
                        /* We accept the -r flag just to look like git-diff-tree */
                        continue;
                }
-               if (!strcmp(arg, "-p")) {
+               /* We accept the -u flag as a synonym for "-p" */
+               if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
                        diff_output_format = DIFF_FORMAT_PATCH;
                        continue;
                }
                if (!strncmp(arg, "-B", 2)) {
-                       diff_break_opt = diff_scoreopt_parse(arg);
+                       if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
                        continue;
                }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
                        continue;
                }
                if (!strncmp(arg, "-C", 2)) {
                        detect_rename = DIFF_DETECT_COPY;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_cache_usage);
+                       continue;
+               }
+               if (!strcmp(arg, "--find-copies-harder")) {
+                       find_copies_harder = 1;
                        continue;
                }
                if (!strcmp(arg, "-z")) {
                        diff_output_format = DIFF_FORMAT_MACHINE;
                        continue;
                }
+               if (!strcmp(arg, "--name-only")) {
+                       diff_output_format = DIFF_FORMAT_NAME;
+                       continue;
+               }
+               if (!strcmp(arg, "--name-only-z")) {
+                       diff_output_format = DIFF_FORMAT_NAME_Z;
+                       continue;
+               }
                if (!strcmp(arg, "-R")) {
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                        continue;
@@ -215,6 +241,14 @@ int main(int argc, const char **argv)
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strncmp(arg, "--diff-filter=", 14)) {
+                       diff_filter = arg + 14;
+                       continue;
+               }
+               if (!strncmp(arg, "-O", 2)) {
+                       orderfile = arg + 2;
+                       continue;
+               }
                if (!strcmp(arg, "--pickaxe-all")) {
                        pickaxe_opts = DIFF_PICKAXE_ALL;
                        continue;
@@ -230,6 +264,9 @@ int main(int argc, const char **argv)
                usage(diff_cache_usage);
        }
 
+       if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
+               usage(diff_cache_usage);
+
        if (!tree_name || get_sha1(tree_name, sha1))
                usage(diff_cache_usage);
 
@@ -241,7 +278,7 @@ int main(int argc, const char **argv)
        tree = read_object_with_reference(sha1, "tree", &size, NULL);
        if (!tree)
                die("bad tree object %s", tree_name);
-       if (read_tree(tree, size, 1))
+       if (read_tree(tree, size, 1, NULL))
                die("unable to read tree object %s", tree_name);
 
        ret = diff_cache(active_cache, active_nr);
@@ -249,7 +286,8 @@ int main(int argc, const char **argv)
        diffcore_std(pathspec ? : NULL,
                     detect_rename, diff_score_opt,
                     pickaxe, pickaxe_opts,
-                    diff_break_opt);
-       diff_flush(diff_output_format, 1);
+                    diff_break_opt,
+                    orderfile, diff_filter);
+       diff_flush(diff_output_format);
        return ret;
 }