Show More
@@ -9,7 +9,7 b'' | |||||
9 | > txnclose-phase.test = sh $TESTTMP/hook.sh |
|
9 | > txnclose-phase.test = sh $TESTTMP/hook.sh | |
10 | > EOF |
|
10 | > EOF | |
11 |
|
11 | |||
12 | $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; } |
|
12 | $ hglog() { hg log -G --template "{rev} {phaseidx} {desc}\n" $*; } | |
13 | $ mkcommit() { |
|
13 | $ mkcommit() { | |
14 | > echo "$1" > "$1" |
|
14 | > echo "$1" > "$1" | |
15 | > hg add "$1" |
|
15 | > hg add "$1" | |
@@ -36,7 +36,8 b' Cannot change null revision phase' | |||||
36 | New commit are draft by default |
|
36 | New commit are draft by default | |
37 |
|
37 | |||
38 | $ hglog |
|
38 | $ hglog | |
39 | 0 1 A |
|
39 | @ 0 1 A | |
|
40 | ||||
40 |
|
41 | |||
41 | Following commit are draft too |
|
42 | Following commit are draft too | |
42 |
|
43 | |||
@@ -45,8 +46,10 b' Following commit are draft too' | |||||
45 | test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> draft |
|
46 | test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56: -> draft | |
46 |
|
47 | |||
47 | $ hglog |
|
48 | $ hglog | |
48 | 1 1 B |
|
49 | @ 1 1 B | |
49 | 0 1 A |
|
50 | | | |
|
51 | o 0 1 A | |||
|
52 | ||||
50 |
|
53 | |||
51 | Working directory phase is secret when its parent is secret. |
|
54 | Working directory phase is secret when its parent is secret. | |
52 |
|
55 | |||
@@ -103,8 +106,10 b' Draft commit are properly created over p' | |||||
103 | $ hg phase |
|
106 | $ hg phase | |
104 | 1: public |
|
107 | 1: public | |
105 | $ hglog |
|
108 | $ hglog | |
106 | 1 0 B |
|
109 | @ 1 0 B | |
107 | 0 0 A |
|
110 | | | |
|
111 | o 0 0 A | |||
|
112 | ||||
108 |
|
113 | |||
109 | $ mkcommit C |
|
114 | $ mkcommit C | |
110 | test-debug-phase: new rev 2: x -> 1 |
|
115 | test-debug-phase: new rev 2: x -> 1 | |
@@ -114,10 +119,14 b' Draft commit are properly created over p' | |||||
114 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft |
|
119 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft | |
115 |
|
120 | |||
116 | $ hglog |
|
121 | $ hglog | |
117 | 3 1 D |
|
122 | @ 3 1 D | |
118 | 2 1 C |
|
123 | | | |
119 | 1 0 B |
|
124 | o 2 1 C | |
120 | 0 0 A |
|
125 | | | |
|
126 | o 1 0 B | |||
|
127 | | | |||
|
128 | o 0 0 A | |||
|
129 | ||||
121 |
|
130 | |||
122 | Test creating changeset as secret |
|
131 | Test creating changeset as secret | |
123 |
|
132 | |||
@@ -125,11 +134,16 b' Test creating changeset as secret' | |||||
125 | test-debug-phase: new rev 4: x -> 2 |
|
134 | test-debug-phase: new rev 4: x -> 2 | |
126 | test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> secret |
|
135 | test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde: -> secret | |
127 | $ hglog |
|
136 | $ hglog | |
128 | 4 2 E |
|
137 | @ 4 2 E | |
129 | 3 1 D |
|
138 | | | |
130 | 2 1 C |
|
139 | o 3 1 D | |
131 | 1 0 B |
|
140 | | | |
132 | 0 0 A |
|
141 | o 2 1 C | |
|
142 | | | |||
|
143 | o 1 0 B | |||
|
144 | | | |||
|
145 | o 0 0 A | |||
|
146 | ||||
133 |
|
147 | |||
134 | Test the secret property is inherited |
|
148 | Test the secret property is inherited | |
135 |
|
149 | |||
@@ -137,12 +151,18 b' Test the secret property is inherited' | |||||
137 | test-debug-phase: new rev 5: x -> 2 |
|
151 | test-debug-phase: new rev 5: x -> 2 | |
138 | test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret |
|
152 | test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret | |
139 | $ hglog |
|
153 | $ hglog | |
140 | 5 2 H |
|
154 | @ 5 2 H | |
141 | 4 2 E |
|
155 | | | |
142 | 3 1 D |
|
156 | o 4 2 E | |
143 | 2 1 C |
|
157 | | | |
144 | 1 0 B |
|
158 | o 3 1 D | |
145 | 0 0 A |
|
159 | | | |
|
160 | o 2 1 C | |||
|
161 | | | |||
|
162 | o 1 0 B | |||
|
163 | | | |||
|
164 | o 0 0 A | |||
|
165 | ||||
146 |
|
166 | |||
147 | Even on merge |
|
167 | Even on merge | |
148 |
|
168 | |||
@@ -152,13 +172,20 b' Even on merge' | |||||
152 | created new head |
|
172 | created new head | |
153 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft |
|
173 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft | |
154 | $ hglog |
|
174 | $ hglog | |
155 | 6 1 B' |
|
175 | @ 6 1 B' | |
156 | 5 2 H |
|
176 | | | |
157 | 4 2 E |
|
177 | | o 5 2 H | |
158 | 3 1 D |
|
178 | | | | |
159 | 2 1 C |
|
179 | | o 4 2 E | |
160 | 1 0 B |
|
180 | | | | |
161 | 0 0 A |
|
181 | | o 3 1 D | |
|
182 | | | | |||
|
183 | | o 2 1 C | |||
|
184 | |/ | |||
|
185 | o 1 0 B | |||
|
186 | | | |||
|
187 | o 0 0 A | |||
|
188 | ||||
162 | $ hg merge 4 # E |
|
189 | $ hg merge 4 # E | |
163 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
190 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
164 | (branch merge, don't forget to commit) |
|
191 | (branch merge, don't forget to commit) | |
@@ -170,14 +197,22 b' Even on merge' | |||||
170 | test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> secret |
|
197 | test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af: -> secret | |
171 |
|
198 | |||
172 | $ hglog |
|
199 | $ hglog | |
173 | 7 2 merge B' and E |
|
200 | @ 7 2 merge B' and E | |
174 | 6 1 B' |
|
201 | |\ | |
175 | 5 2 H |
|
202 | | o 6 1 B' | |
176 | 4 2 E |
|
203 | | | | |
177 | 3 1 D |
|
204 | +---o 5 2 H | |
178 | 2 1 C |
|
205 | | | | |
179 | 1 0 B |
|
206 | o | 4 2 E | |
180 | 0 0 A |
|
207 | | | | |
|
208 | o | 3 1 D | |||
|
209 | | | | |||
|
210 | o | 2 1 C | |||
|
211 | |/ | |||
|
212 | o 1 0 B | |||
|
213 | | | |||
|
214 | o 0 0 A | |||
|
215 | ||||
181 |
|
216 | |||
182 | Test secret changeset are not pushed |
|
217 | Test secret changeset are not pushed | |
183 |
|
218 | |||
@@ -221,21 +256,34 b' Test secret changeset are not pushed' | |||||
221 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft |
|
256 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> draft | |
222 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft |
|
257 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> draft | |
223 | $ hglog |
|
258 | $ hglog | |
224 | 7 2 merge B' and E |
|
259 | @ 7 2 merge B' and E | |
225 | 6 1 B' |
|
260 | |\ | |
226 | 5 2 H |
|
261 | | o 6 1 B' | |
227 | 4 2 E |
|
262 | | | | |
228 | 3 1 D |
|
263 | +---o 5 2 H | |
229 | 2 1 C |
|
264 | | | | |
230 | 1 0 B |
|
265 | o | 4 2 E | |
231 | 0 0 A |
|
266 | | | | |
|
267 | o | 3 1 D | |||
|
268 | | | | |||
|
269 | o | 2 1 C | |||
|
270 | |/ | |||
|
271 | o 1 0 B | |||
|
272 | | | |||
|
273 | o 0 0 A | |||
|
274 | ||||
232 | $ cd ../push-dest |
|
275 | $ cd ../push-dest | |
233 | $ hglog |
|
276 | $ hglog | |
234 | 4 1 B' |
|
277 | o 4 1 B' | |
235 | 3 1 D |
|
278 | | | |
236 | 2 1 C |
|
279 | | o 3 1 D | |
237 | 1 0 B |
|
280 | | | | |
238 | 0 0 A |
|
281 | | o 2 1 C | |
|
282 | |/ | |||
|
283 | o 1 0 B | |||
|
284 | | | |||
|
285 | o 0 0 A | |||
|
286 | ||||
239 |
|
287 | |||
240 | (Issue3303) |
|
288 | (Issue3303) | |
241 | Check that remote secret changeset are ignore when checking creation of remote heads |
|
289 | Check that remote secret changeset are ignore when checking creation of remote heads | |
@@ -328,11 +376,16 b' Test secret changeset are not pull' | |||||
328 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public |
|
376 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public | |
329 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
377 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
330 | $ hglog |
|
378 | $ hglog | |
331 | 4 0 B' |
|
379 | o 4 0 B' | |
332 | 3 0 D |
|
380 | | | |
333 | 2 0 C |
|
381 | | o 3 0 D | |
334 | 1 0 B |
|
382 | | | | |
335 | 0 0 A |
|
383 | | o 2 0 C | |
|
384 | |/ | |||
|
385 | o 1 0 B | |||
|
386 | | | |||
|
387 | o 0 0 A | |||
|
388 | ||||
336 | $ cd .. |
|
389 | $ cd .. | |
337 |
|
390 | |||
338 | But secret can still be bundled explicitly |
|
391 | But secret can still be bundled explicitly | |
@@ -357,11 +410,16 b' Test secret changeset are not cloned' | |||||
357 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public |
|
410 | test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e: -> public | |
358 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public |
|
411 | test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519: -> public | |
359 | $ hglog -R clone-dest |
|
412 | $ hglog -R clone-dest | |
360 | 4 0 B' |
|
413 | o 4 0 B' | |
361 | 3 0 D |
|
414 | | | |
362 | 2 0 C |
|
415 | | o 3 0 D | |
363 | 1 0 B |
|
416 | | | | |
364 | 0 0 A |
|
417 | | o 2 0 C | |
|
418 | |/ | |||
|
419 | o 1 0 B | |||
|
420 | | | |||
|
421 | o 0 0 A | |||
|
422 | ||||
365 |
|
423 | |||
366 | Test summary |
|
424 | Test summary | |
367 |
|
425 | |||
@@ -385,16 +443,28 b' Test revset' | |||||
385 |
|
443 | |||
386 | $ cd initialrepo |
|
444 | $ cd initialrepo | |
387 | $ hglog -r 'public()' |
|
445 | $ hglog -r 'public()' | |
388 | 0 0 A |
|
446 | o 1 0 B | |
389 | 1 0 B |
|
447 | | | |
|
448 | o 0 0 A | |||
|
449 | ||||
390 | $ hglog -r 'draft()' |
|
450 | $ hglog -r 'draft()' | |
391 | 2 1 C |
|
451 | o 6 1 B' | |
392 | 3 1 D |
|
452 | | | |
393 | 6 1 B' |
|
453 | ~ | |
|
454 | o 3 1 D | |||
|
455 | | | |||
|
456 | o 2 1 C | |||
|
457 | | | |||
|
458 | ~ | |||
394 | $ hglog -r 'secret()' |
|
459 | $ hglog -r 'secret()' | |
395 | 4 2 E |
|
460 | @ 7 2 merge B' and E | |
396 | 5 2 H |
|
461 | |\ | |
397 | 7 2 merge B' and E |
|
462 | | ~ | |
|
463 | | o 5 2 H | |||
|
464 | |/ | |||
|
465 | o 4 2 E | |||
|
466 | | | |||
|
467 | ~ | |||
398 |
|
468 | |||
399 | test that phase are displayed in log at debug level |
|
469 | test that phase are displayed in log at debug level | |
400 |
|
470 |
General Comments 0
You need to be logged in to leave comments.
Login now