Changeset 782 for git/branches/dmik/diffcore.h

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• diffcore.h (modified) (5 diffs)

git/branches/dmik/diffcore.h ¶

@@ -30 +30 @@
         void *data;
         void *cnt_data;
-        const char *funcname_pattern_ident;
         unsigned long size;
         int count;               /* Reference count */
-        int xfrm_flags;          /* for use by the xfrm */
         int rename_used;         /* Count of rename users */
         unsigned short mode;     /* file mode */
@@ -46 +44 @@
 #define DIRTY_SUBMODULE_UNTRACKED 1
 #define DIRTY_SUBMODULE_MODIFIED  2
+        unsigned is_stdin : 1;
         unsigned has_more_entries : 1; /* only appear in combined diff */
+        /* data should be considered "binary"; -1 means "don't know yet" */
+        signed int is_binary : 2;
         struct userdiff_driver *driver;
-        /* data should be considered "binary"; -1 means "don't know yet" */
-        int is_binary;
 };
 
@@ -55 +54 @@
 extern void free_filespec(struct diff_filespec *);
 extern void fill_filespec(struct diff_filespec *, const unsigned char *,
-                          unsigned short);
+                          int, unsigned short);
 
 extern int diff_populate_filespec(struct diff_filespec *, int);
@@ -70 +69 @@
         unsigned renamed_pair : 1;
         unsigned is_unmerged : 1;
+        unsigned done_skip_stat_unmatch : 1;
+        unsigned skip_stat_unmatch_result : 1;
 };
 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
@@ -111 +112 @@
 extern void diffcore_order(const char *orderfile);
 
+/* low-level interface to diffcore_order */
+struct obj_order {
+        void *obj;      /* setup by caller */
+
+        /* setup/used by order_objects() */
+        int orig_order;
+        int order;
+};
+
+typedef const char *(*obj_path_fn_t)(void *obj);
+
+void order_objects(const char *orderfile, obj_path_fn_t obj_path,
+                   struct obj_order *objs, int nr);
+
 #define DIFF_DEBUG 0
 #if DIFF_DEBUG