Make 'traverse_trees()' traverse conflicting DF entries in parallel

This makes the traverse_trees() entry comparator routine use the more
relaxed form of name comparison that considers files and directories
with the same name identical.

We pass in a separate mask for just the directory entries, so that the
callback routine can decide (if it wants to) to only handle one or the
other type, but generally most (all?) users are expected to really want
to see the case of a name 'foo' showing up in one tree as a file and in
another as a directory at the same time.

In particular, moving 'unpack_trees()' over to use this tree traversal
mechanism requires this.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-tree.c b/merge-tree.c
index 8be0b9f910b7c2fa9506ffe5fb31bd4632eaa1a1..02fc10f7e622ba1c53065e7cf4563ff10af0c41f 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -287,7 +287,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
  * The successful merge rules are the same as for the three-way merge
  * in git-read-tree.
  */
  * The successful merge rules are the same as for the three-way merge
  * in git-read-tree.
  */

-static int threeway_callback(int n, unsigned long mask, struct name_entry *entry, struct traverse_info *info)
+static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)

 {
        /* Same in both? */
        if (same_entry(entry+1, entry+2)) {
 {
        /* Same in both? */
        if (same_entry(entry+1, entry+2)) {

diff --git a/tree-walk.c b/tree-walk.c
index 7170e375b3473aaced9b639d915c93ff931be859..842cb6ad2e4086610cb4f268be14ec0cddf2ee4e 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -62,7 +62,7 @@ void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
 
 static int entry_compare(struct name_entry *a, struct name_entry *b)
 {
 
 static int entry_compare(struct name_entry *a, struct name_entry *b)
 {

-       return base_name_compare(
+       return df_name_compare(

                        a->path, tree_entry_len(a->path, a->sha1), a->mode,
                        b->path, tree_entry_len(b->path, b->sha1), b->mode);
 }
                        a->path, tree_entry_len(a->path, a->sha1), a->mode,
                        b->path, tree_entry_len(b->path, b->sha1), b->mode);
 }


@@ -142,6 +142,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
 
        for (;;) {
                unsigned long mask = 0;
 
        for (;;) {
                unsigned long mask = 0;

+               unsigned long dirmask = 0;

                int i, last;
 
                last = -1;
                int i, last;
 
                last = -1;


@@ -166,10 +167,13 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
                                        mask = 0;
                        }
                        mask |= 1ul << i;
                                        mask = 0;
                        }
                        mask |= 1ul << i;

+                       if (S_ISDIR(entry[i].mode))
+                               dirmask |= 1ul << i;

                        last = i;
                }
                if (!mask)
                        break;
                        last = i;
                }
                if (!mask)
                        break;

+               dirmask &= mask;

 
                /*
                 * Clear all the unused name-entries.
 
                /*
                 * Clear all the unused name-entries.


@@ -179,7 +183,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
                                continue;
                        entry_clear(entry + i);
                }
                                continue;
                        entry_clear(entry + i);
                }

-               ret = info->fn(n, mask, entry, info);
+               ret = info->fn(n, mask, dirmask, entry, info);

                if (ret < 0)
                        break;
                if (ret)
                if (ret < 0)
                        break;
                if (ret)

diff --git a/tree-walk.h b/tree-walk.h
index c123cfeef4abeff5e750d7faa23481619d995ce6..42110a465f9a8c91d1bc643dfae7a9b9c32e3719 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -34,7 +34,7 @@ int tree_entry(struct tree_desc *, struct name_entry *);
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
 
 struct traverse_info;
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
 
 struct traverse_info;

-typedef int (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, struct traverse_info *);
+typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);

 int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
 
 struct traverse_info {
 int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
 
 struct traverse_info {


@@ -42,6 +42,7 @@ struct traverse_info {
        struct name_entry name;
        int pathlen;
 
        struct name_entry name;
        int pathlen;
 

+       unsigned long conflicts;

        traverse_callback_t fn;
        void *data;
 };
        traverse_callback_t fn;
        void *data;
 };