X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.h;h=4b270435109a8aefb4a85fa01d1f5d8a0f33f0bb;hb=3e1a70d925b46b9eac1ae523589298ddb6e295af;hp=6c2becad1394829142a3775a43097f65de4e524a;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git diff --git a/revision.h b/revision.h index 6c2becad..4b270435 100644 --- a/revision.h +++ b/revision.h @@ -6,6 +6,9 @@ #define TREECHANGE (1u<<2) #define SHOWN (1u<<3) #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ +#define BOUNDARY (1u<<5) +#define BOUNDARY_SHOW (1u<<6) +#define ADDED (1u<<7) /* Parents already parsed and added? */ struct rev_info; @@ -32,13 +35,18 @@ struct rev_info { blob_objects:1, edge_hint:1, limited:1, - unpacked:1; + unpacked:1, + boundary:1, + parents:1; /* special limits */ int max_count; unsigned long max_age; unsigned long min_age; + /* paths limiting */ + struct diff_options diffopt; + topo_sort_set_fn_t topo_setter; topo_sort_get_fn_t topo_getter; }; @@ -48,8 +56,8 @@ struct rev_info { #define REV_TREE_DIFFERENT 2 /* revision.c */ -extern int rev_same_tree_as_empty(struct tree *t1); -extern int rev_compare_tree(struct tree *t1, struct tree *t2); +extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1); +extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2); extern void init_revisions(struct rev_info *revs); extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);