@matheusbsbs / matheus-bagliano / commits / 53e38358c8

t6111: add parents to tests

Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kevin Bracey committed May 16, 2013 at 18:32 UTC 53e38358c8ad5bef1a71e3dac4331014120165cc
1 file changed +19 -19
t/t6111-rev-list-treesame.sh
+19 -19
@@ -66,8 +66,6 @@ test_expect_success setup '
66 test_commit M file "Parts 1+2"
67 '
68
69 -# could we soup this up to optionally check parents? So "(BA)C" would check
70 -# that C is shown and has parents B A.
69 check_outcome () {
70 outcome=$1
71 shift
@@ -109,14 +107,16 @@ check_result () {
107 # except the most basic list. Achieving this means normal merge D will also be
108 # shown in normal full-history, as we can't distinguish unless we do a
109 # simplification pass. After simplification, D is dropped but G remains.
110 +# Also, merge simplification of G should not drop the parent B that the default
111 +# simple history follows.
112 check_result 'M L K J I H G F E D C B A'
113 check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FE)G (D)F (B)E (BC)D (A)C (A)B A'
114 check_result 'M H L K J I G E F D C B A' --topo-order
115 check_result 'M L H B A' -- file
116 -check_result 'M L H B A' --parents -- file
116 +check_result '(LH)M (B)L (B)H (A)B A' --parents -- file
117 check_outcome failure 'M L J I H G F D B A' --full-history -- file # drops G
118 -check_result 'M L K J I H G F D B A' --full-history --parents -- file
119 -check_outcome failure 'M H L J I G F B A' --simplify-merges -- file # drops G
118 +check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FB)G (D)F (BA)D (A)B A' --full-history --parents -- file
119 +check_outcome failure '(LH)M (G)H (J)L (I)J (G)I (FB)G (B)F (A)B A' --simplify-merges -- file # drops G
120 check_result 'M L K G F D B A' --first-parent
121 check_result 'M L G F B A' --first-parent -- file
122
@@ -124,14 +124,14 @@ check_result 'M L G F B A' --first-parent -- file
124 check_result 'M L K J I H G E' F..M
125 check_result 'M H L K J I G E' F..M --topo-order
126 check_result 'M L H' F..M -- file
127 -check_result 'M L H' F..M --parents -- file # L+H's parents rewritten to B, so more useful than it may seem
127 +check_result '(LH)M (B)L (B)H' --parents F..M -- file
128 check_outcome failure 'M L J I H G' F..M --full-history -- file # drops G
129 -check_result 'M L K J I H G' F..M --full-history --parents -- file
130 -check_outcome failure 'M H L J I G' F..M --simplify-merges -- file # drops G
129 +check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FB)G' F..M --full-history --parents -- file
130 +check_outcome failure '(LH)M (G)H (J)L (I)J (G)I (FB)G' F..M --simplify-merges -- file # drops G
131 check_result 'M L K J I H G' F..M --ancestry-path
132 check_outcome failure 'M L J I H G' F..M --ancestry-path -- file # drops G
133 -check_result 'M L K J I H G' F..M --ancestry-path --parents -- file
134 -check_result 'M H L J I G' F..M --ancestry-path --simplify-merges -- file
133 +check_result '(LH)M (K)L (GJ)K (I)J (G)I (G)H (FE)G' F..M --ancestry-path --parents -- file
134 +check_result '(LH)M (G)H (J)L (I)J (G)I (FE)G' F..M --ancestry-path --simplify-merges -- file
135 check_result 'M L K G' F..M --first-parent
136 check_result 'M L G' F..M --first-parent -- file
137
@@ -139,15 +139,15 @@ check_result 'M L G' F..M --first-parent -- file
139 # If we want history since E, then we're quite happy to ignore G that took E.
140 check_result 'M L K J I H G' E..M --ancestry-path
141 check_result 'M L J I H' E..M --ancestry-path -- file
142 -check_outcome failure 'M L K J I H' E..M --ancestry-path --parents -- file # includes G
143 -check_outcome failure 'M H L J I' E..M --ancestry-path --simplify-merges -- file # includes G
142 +check_outcome failure '(LH)M (K)L (EJ)K (I)J (E)I (E)H' E..M --ancestry-path --parents -- file # includes G
143 +check_outcome failure '(LH)M (E)H (J)L (I)J (E)I' E..M --ancestry-path --simplify-merges -- file # includes G
144
145 # Should still be able to ignore I-J branch in simple log, despite limiting
146 # to G.
147 check_result 'M L K J I H' G..M
148 check_result 'M H L K J I' G..M --topo-order
149 check_outcome failure 'M L H' G..M -- file # includes J I
150 -check_outcome failure 'M L H' G..M --parents -- file # includes J I
150 +check_outcome failure '(LH)M (G)L (G)H' G..M --parents -- file # includes J I
151 check_result 'M L J I H' G..M --full-history -- file
152 check_result 'M L K J I H' G..M --full-history --parents -- file
153 check_result 'M H L J I' G..M --simplify-merges -- file
@@ -162,10 +162,10 @@ check_result 'M H L J I' G..M --ancestry-path --simplify-merges -- file
162 # we can't decide if the merge from INTERESTING commit C was sensible.
163 check_result 'F D C' B..F
164 check_result 'F' B..F -- file
165 -check_outcome failure 'F' B..F --parents -- file # includes D
165 +check_outcome failure '(B)F' B..F --parents -- file # includes D
166 check_outcome failure 'F D' B..F --full-history -- file # drops D prematurely
167 -check_result 'F D' B..F --full-history --parents -- file
168 -check_result 'F' B..F --simplify-merges -- file
167 +check_result '(D)F (BA)D' B..F --full-history --parents -- file
168 +check_result '(B)F' B..F --simplify-merges -- file
169 check_result 'F D' B..F --ancestry-path
170 check_result 'F' B..F --ancestry-path -- file
171 check_outcome failure 'F' B..F --ancestry-path --parents -- file # includes D
@@ -181,10 +181,10 @@ check_result 'F' E...F -- file
181 # and it differs from it.
182 check_result 'F D B' C..F
183 check_result 'F B' C..F -- file
184 -check_result 'F B' C..F --parents -- file
184 +check_result '(B)F (A)B' C..F --parents -- file
185 check_outcome failure 'F D B' C..F --full-history -- file # drops D
186 -check_result 'F D B' C..F --full-history --parents -- file
187 -check_result 'F D B' C..F --simplify-merges -- file
186 +check_result '(D)F (BC)D (A)B' C..F --full-history --parents -- file
187 +check_result '(D)F (BC)D (A)B' C..F --simplify-merges -- file
188 check_result 'F D' C..F --ancestry-path
189 check_outcome failure 'F D' C..F --ancestry-path -- file # drops D
190 check_result 'F D' C..F --ancestry-path --parents -- file