git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/tree-walk.h b/tree-walk.h
index 47438fe1c08a8e119fd08aea0eac612c76c21a66..42110a465f9a8c91d1bc643dfae7a9b9c32e3719 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,27 +1,59 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
-struct tree_desc {
-       void *buf;
-       unsigned long size;
-};
-
 struct name_entry {
        const unsigned char *sha1;
        const char *path;
        unsigned int mode;
-       int pathlen;
 };
 
+struct tree_desc {
+       const void *buffer;
+       struct name_entry entry;
+       unsigned int size;
+};
+
+static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+{
+       *pathp = desc->entry.path;
+       *modep = canon_mode(desc->entry.mode);
+       return desc->entry.sha1;
+}
+
+static inline int tree_entry_len(const char *name, const unsigned char *sha1)
+{
+       return (const char *)sha1 - name - 1;
+}
+
 void update_tree_entry(struct tree_desc *);
-const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
+
+/* Helper function that does both of the above and returns true for success */
+int tree_entry(struct tree_desc *, struct name_entry *);
 
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
 
-typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, const char *base);
+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);
 
-void traverse_trees(int n, struct tree_desc *t, const char *base, traverse_callback_t callback);
+struct traverse_info {
+       struct traverse_info *prev;
+       struct name_entry name;
+       int pathlen;
+
+       unsigned long conflicts;
+       traverse_callback_t fn;
+       void *data;
+};
 
 int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
+extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
+extern void setup_traverse_info(struct traverse_info *info, const char *base);
+
+static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+{
+       return info->pathlen + tree_entry_len(n->path, n->sha1);
+}
 
 #endif