Merge branch 'dk/p4-import-ctypes'

diff --git a/ref-filter.h b/ref-filter.h
index 6bf27d8bc4a0b32c0c457b34b3a36e457f89b029..14d435e2ccf0204312d1f72555f1c2c36fabd215 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -13,23 +13,29 @@
 #define QUOTE_PYTHON 4
 #define QUOTE_TCL 8
 
-#define FILTER_REFS_INCLUDE_BROKEN 0x1
-#define FILTER_REFS_ALL 0x2
+#define FILTER_REFS_INCLUDE_BROKEN 0x0001
+#define FILTER_REFS_TAGS           0x0002
+#define FILTER_REFS_BRANCHES       0x0004
+#define FILTER_REFS_REMOTES        0x0008
+#define FILTER_REFS_OTHERS         0x0010
+#define FILTER_REFS_ALL            (FILTER_REFS_TAGS | FILTER_REFS_BRANCHES | \
+                                   FILTER_REFS_REMOTES | FILTER_REFS_OTHERS)
+#define FILTER_REFS_DETACHED_HEAD  0x0020
+#define FILTER_REFS_KIND_MASK      (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
 
-struct atom_value {
-       const char *s;
-       unsigned long ul; /* used for sorting when not FIELD_STR */
-};
+struct atom_value;
 
 struct ref_sorting {
        struct ref_sorting *next;
        int atom; /* index into used_atom array (internal) */
-       unsigned reverse : 1;
+       unsigned reverse : 1,
+               version : 1;
 };
 
 struct ref_array_item {
        unsigned char objectname[20];
        int flag;
+       unsigned int kind;
        const char *symref;
        struct commit *commit;
        struct atom_value *value;
@@ -39,6 +45,7 @@ struct ref_array_item {
 struct ref_array {
        int nr, alloc;
        struct ref_array_item **items;
+       struct rev_info *revs;
 };
 
 struct ref_filter {
@@ -53,7 +60,13 @@ struct ref_filter {
        } merge;
        struct commit *merge_commit;
 
-       unsigned int with_commit_tag_algo : 1;
+       unsigned int with_commit_tag_algo : 1,
+               match_as_path : 1,
+               detached : 1;
+       unsigned int kind,
+               lines;
+       int abbrev,
+               verbose;
 };
 
 struct ref_filter_cbdata {