diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 10:23:52 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 10:23:52 +0100 |
| commit | 62ca33e02a4ea93dd59538ac986a082430253b27 (patch) | |
| tree | b5f5af9c87a64536f0e7ada9e0066e4f5d29af4e /revision.h | |
| parent | Tenth batch for 2.20 (diff) | |
| parent | t6012: make rev-list tests more interesting (diff) | |
| download | git-62ca33e02a4ea93dd59538ac986a082430253b27.tar.xz git-62ca33e02a4ea93dd59538ac986a082430253b27.zip | |
Merge branch 'ds/reachable-topo-order'
The revision walker machinery learned to take advantage of the
commit generation numbers stored in the commit-graph file.
* ds/reachable-topo-order:
t6012: make rev-list tests more interesting
revision.c: generation-based topo-order algorithm
commit/revisions: bookkeeping before refactoring
revision.c: begin refactoring --topo-order logic
test-reach: add rev-list tests
test-reach: add run_three_modes method
prio-queue: add 'peek' operation
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 0d2abc2d36..7987bfcd2e 100644 --- a/revision.h +++ b/revision.h @@ -32,6 +32,9 @@ #define TRACK_LINEAR (1u<<26) #define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR) +#define TOPO_WALK_EXPLORED (1u<<27) +#define TOPO_WALK_INDEGREE (1u<<28) + #define DECORATE_SHORT_REFS 1 #define DECORATE_FULL_REFS 2 @@ -64,6 +67,8 @@ struct rev_cmdline_info { #define REVISION_WALK_NO_WALK_SORTED 1 #define REVISION_WALK_NO_WALK_UNSORTED 2 +struct topo_walk_info; + struct rev_info { /* Starting list */ struct commit_list *commits; @@ -270,6 +275,8 @@ struct rev_info { const char *break_bar; struct revision_sources *sources; + + struct topo_walk_info *topo_walk_info; }; int ref_excluded(struct string_list *, const char *path); |