[PATCH] diff-tree-helper: do not report unmerged path outside specification.

diff --git a/diff-tree.c b/diff-tree.c
index 0f370927dd2496a420af53d137676b6c3c445f75..5a1ad34652fcda63a37c3aeb55c0231f1be69bdd 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,7 +1,14 @@
 #include "cache.h"
+#include "diff.h"
 
 static int recursive = 0;
 static int line_termination = '\n';
+static int generate_patch = 0;
+
+// What paths are we interested in?
+static int nr_paths = 0;
+static char **paths = NULL;
+static int *pathlens = NULL;
 
 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
 
@@ -32,7 +39,7 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
 static char *malloc_base(const char *base, const char *path, int pathlen)
 {
        int baselen = strlen(base);
-       char *newbase = malloc(baselen + pathlen + 2);
+       char *newbase = xmalloc(baselen + pathlen + 2);
        memcpy(newbase, base, baselen);
        memcpy(newbase + baselen, path, pathlen);
        memcpy(newbase + baselen + pathlen, "/", 2);
@@ -74,10 +81,15 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
                return;
        }
 
-       printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
-              S_ISDIR(mode) ? "tree" : "blob",
-              sha1_to_hex(sha1), base, path,
-              line_termination);
+       if (generate_patch) {
+               if (!S_ISDIR(mode))
+                       diff_addremove(prefix[0], mode, sha1, base, path);
+       }
+       else
+               printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode,
+                      S_ISDIR(mode) ? "tree" : "blob",
+                      sha1_to_hex(sha1), base, path,
+                      line_termination);
 }
 
 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -123,17 +135,77 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
                return retval;
        }
 
-       strcpy(old_sha1_hex, sha1_to_hex(sha1));
-       printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
-              S_ISDIR(mode1) ? "tree" : "blob",
-              old_sha1_hex, sha1_to_hex(sha2), base, path1,
-              line_termination);
+       if (generate_patch) {
+               if (!S_ISDIR(mode1))
+                       diff_change(mode1, mode2, sha1, sha2, base, path1);
+       }
+       else {
+               strcpy(old_sha1_hex, sha1_to_hex(sha1));
+               printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
+                      S_ISDIR(mode1) ? "tree" : "blob",
+                      old_sha1_hex, sha1_to_hex(sha2), base, path1,
+                      line_termination);
+       }
        return 0;
 }
 
+static int interesting(void *tree, unsigned long size, const char *base)
+{
+       const char *path;
+       unsigned mode;
+       int i;
+       int baselen, pathlen;
+
+       if (!nr_paths)
+               return 1;
+
+       (void)extract(tree, size, &path, &mode);
+
+       pathlen = strlen(path);
+       baselen = strlen(base);
+
+       for (i=0; i < nr_paths; i++) {
+               const char *match = paths[i];
+               int matchlen = pathlens[i];
+
+               if (baselen >= matchlen) {
+                       /* If it doesn't match, move along... */
+                       if (strncmp(base, match, matchlen))
+                               continue;
+
+                       /* The base is a subdirectory of a path which was specified. */
+                       return 1;
+               }
+
+               /* Does the base match? */
+               if (strncmp(base, match, baselen))
+                       continue;
+
+               match += baselen;
+               matchlen -= baselen;
+
+               if (pathlen > matchlen)
+                       continue;
+
+               if (strncmp(path, match, pathlen))
+                       continue;
+
+               return 1;
+       }
+       return 0; /* No matches */
+}
+
 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
 {
        while (size1 | size2) {
+               if (nr_paths && size1 && !interesting(tree1, size1, base)) {
+                       update_tree_entry(&tree1, &size1);
+                       continue;
+               }
+               if (nr_paths && size2 && !interesting(tree2, size2, base)) {
+                       update_tree_entry(&tree2, &size2);
+                       continue;
+               }
                if (!size1) {
                        show_file("+", tree2, size2, base);
                        update_tree_entry(&tree2, &size2);
@@ -184,14 +256,22 @@ int main(int argc, char **argv)
 {
        unsigned char old[20], new[20];
 
-       while (argc > 3) {
+       for (;;) {
                char *arg = argv[1];
+
+               if (!arg || *arg != '-')
+                       break;
+
                argv++;
                argc--;
                if (!strcmp(arg, "-r")) {
                        recursive = 1;
                        continue;
                }
+               if (!strcmp(arg, "-p")) {
+                       recursive = generate_patch = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        line_termination = '\0';
                        continue;
@@ -199,7 +279,18 @@ int main(int argc, char **argv)
                usage(diff_tree_usage);
        }
 
-       if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
+       if (argc < 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
                usage(diff_tree_usage);
+
+       if (argc > 3) {
+               int i;
+
+               paths = &argv[3];
+               nr_paths = argc - 3;
+               pathlens = xmalloc(nr_paths * sizeof(int));
+               for (i=0; i<nr_paths; i++)
+                       pathlens[i] = strlen(paths[i]);
+       }
+
        return diff_tree_sha1(old, new, "");
 }