Mercurial > hg > mercurial-source
comparison tests/test-obsolete.t @ 21978:c21c1c8c2017
test-obsolete: better logging template
Gratuitous improvement of the test readability.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 04 Jul 2014 19:52:39 +0200 |
parents | 925d1bb9a971 |
children | 9fcf772f15ff |
comparison
equal
deleted
inserted
replaced
21977:4ca4e1572022 | 21978:c21c1c8c2017 |
---|---|
1 $ cat >> $HGRCPATH << EOF | 1 $ cat >> $HGRCPATH << EOF |
2 > [phases] | 2 > [phases] |
3 > # public changeset are not obsolete | 3 > # public changeset are not obsolete |
4 > publish=false | 4 > publish=false |
5 > [ui] | |
6 > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" | |
5 > EOF | 7 > EOF |
6 $ mkcommit() { | 8 $ mkcommit() { |
7 > echo "$1" > "$1" | 9 > echo "$1" > "$1" |
8 > hg add "$1" | 10 > hg add "$1" |
9 > hg ci -m "add $1" | 11 > hg ci -m "add $1" |
56 | 58 |
57 (test that mercurial is not confused) | 59 (test that mercurial is not confused) |
58 | 60 |
59 $ hg up null --quiet # having 0 as parent prevents it to be hidden | 61 $ hg up null --quiet # having 0 as parent prevents it to be hidden |
60 $ hg tip | 62 $ hg tip |
61 changeset: -1:000000000000 | 63 -1:000000000000 (public) [tip ] |
62 tag: tip | |
63 user: | |
64 date: Thu Jan 01 00:00:00 1970 +0000 | |
65 | |
66 $ hg up --hidden tip --quiet | 64 $ hg up --hidden tip --quiet |
67 $ cd .. | 65 $ cd .. |
68 | 66 |
69 Killing a single changeset with replacement | 67 Killing a single changeset with replacement |
70 | 68 |
123 [255] | 121 [255] |
124 | 122 |
125 Check that graphlog detect that a changeset is obsolete: | 123 Check that graphlog detect that a changeset is obsolete: |
126 | 124 |
127 $ hg log -G | 125 $ hg log -G |
128 @ changeset: 5:5601fb93a350 | 126 @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
129 | tag: tip | 127 | |
130 | parent: 1:7c3bad9141dc | 128 o 1:7c3bad9141dc (draft) [ ] add b |
131 | user: test | 129 | |
132 | date: Thu Jan 01 00:00:00 1970 +0000 | 130 o 0:1f0dee641bb7 (draft) [ ] add a |
133 | summary: add new_3_c | |
134 | | |
135 o changeset: 1:7c3bad9141dc | |
136 | user: test | |
137 | date: Thu Jan 01 00:00:00 1970 +0000 | |
138 | summary: add b | |
139 | | |
140 o changeset: 0:1f0dee641bb7 | |
141 user: test | |
142 date: Thu Jan 01 00:00:00 1970 +0000 | |
143 summary: add a | |
144 | 131 |
145 | 132 |
146 check that heads does not report them | 133 check that heads does not report them |
147 | 134 |
148 $ hg heads | 135 $ hg heads |
149 changeset: 5:5601fb93a350 | 136 5:5601fb93a350 (draft) [tip ] add new_3_c |
150 tag: tip | |
151 parent: 1:7c3bad9141dc | |
152 user: test | |
153 date: Thu Jan 01 00:00:00 1970 +0000 | |
154 summary: add new_3_c | |
155 | |
156 $ hg heads --hidden | 137 $ hg heads --hidden |
157 changeset: 5:5601fb93a350 | 138 5:5601fb93a350 (draft) [tip ] add new_3_c |
158 tag: tip | 139 4:ca819180edb9 (draft) [ ] add new_2_c |
159 parent: 1:7c3bad9141dc | 140 3:cdbce2fbb163 (draft) [ ] add new_c |
160 user: test | 141 2:245bde4270cd (draft) [ ] add original_c |
161 date: Thu Jan 01 00:00:00 1970 +0000 | |
162 summary: add new_3_c | |
163 | |
164 changeset: 4:ca819180edb9 | |
165 parent: 1:7c3bad9141dc | |
166 user: test | |
167 date: Thu Jan 01 00:00:00 1970 +0000 | |
168 summary: add new_2_c | |
169 | |
170 changeset: 3:cdbce2fbb163 | |
171 parent: 1:7c3bad9141dc | |
172 user: test | |
173 date: Thu Jan 01 00:00:00 1970 +0000 | |
174 summary: add new_c | |
175 | |
176 changeset: 2:245bde4270cd | |
177 user: test | |
178 date: Thu Jan 01 00:00:00 1970 +0000 | |
179 summary: add original_c | |
180 | |
181 | 142 |
182 | 143 |
183 check that summary does not report them | 144 check that summary does not report them |
184 | 145 |
185 $ hg init ../sink | 146 $ hg init ../sink |
202 remote: 3 outgoing | 163 remote: 3 outgoing |
203 | 164 |
204 check that various commands work well with filtering | 165 check that various commands work well with filtering |
205 | 166 |
206 $ hg tip | 167 $ hg tip |
207 changeset: 5:5601fb93a350 | 168 5:5601fb93a350 (draft) [tip ] add new_3_c |
208 tag: tip | |
209 parent: 1:7c3bad9141dc | |
210 user: test | |
211 date: Thu Jan 01 00:00:00 1970 +0000 | |
212 summary: add new_3_c | |
213 | |
214 $ hg log -r 6 | 169 $ hg log -r 6 |
215 abort: unknown revision '6'! | 170 abort: unknown revision '6'! |
216 [255] | 171 [255] |
217 $ hg log -r 4 | 172 $ hg log -r 4 |
218 abort: unknown revision '4'! | 173 abort: unknown revision '4'! |
220 | 175 |
221 Check that public changeset are not accounted as obsolete: | 176 Check that public changeset are not accounted as obsolete: |
222 | 177 |
223 $ hg --hidden phase --public 2 | 178 $ hg --hidden phase --public 2 |
224 $ hg log -G | 179 $ hg log -G |
225 @ changeset: 5:5601fb93a350 | 180 @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
226 | tag: tip | 181 | |
227 | parent: 1:7c3bad9141dc | 182 | o 2:245bde4270cd (public) [ ] add original_c |
228 | user: test | 183 |/ |
229 | date: Thu Jan 01 00:00:00 1970 +0000 | 184 o 1:7c3bad9141dc (public) [ ] add b |
230 | summary: add new_3_c | 185 | |
231 | | 186 o 0:1f0dee641bb7 (public) [ ] add a |
232 | o changeset: 2:245bde4270cd | |
233 |/ user: test | |
234 | date: Thu Jan 01 00:00:00 1970 +0000 | |
235 | summary: add original_c | |
236 | | |
237 o changeset: 1:7c3bad9141dc | |
238 | user: test | |
239 | date: Thu Jan 01 00:00:00 1970 +0000 | |
240 | summary: add b | |
241 | | |
242 o changeset: 0:1f0dee641bb7 | |
243 user: test | |
244 date: Thu Jan 01 00:00:00 1970 +0000 | |
245 summary: add a | |
246 | 187 |
247 | 188 |
248 And that bumped changeset are detected | 189 And that bumped changeset are detected |
249 -------------------------------------- | 190 -------------------------------------- |
250 | 191 |
251 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | 192 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
252 note that the bumped changeset (5:5601fb93a350) is not a direct successor of | 193 note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
253 the public changeset | 194 the public changeset |
254 | 195 |
255 $ hg log --hidden -r 'bumped()' | 196 $ hg log --hidden -r 'bumped()' |
256 changeset: 5:5601fb93a350 | 197 5:5601fb93a350 (draft) [tip ] add new_3_c |
257 tag: tip | |
258 parent: 1:7c3bad9141dc | |
259 user: test | |
260 date: Thu Jan 01 00:00:00 1970 +0000 | |
261 summary: add new_3_c | |
262 | |
263 | 198 |
264 And that we can't push bumped changeset | 199 And that we can't push bumped changeset |
265 | 200 |
266 $ hg push ../tmpa -r 0 --force #(make repo related) | 201 $ hg push ../tmpa -r 0 --force #(make repo related) |
267 pushing to ../tmpa | 202 pushing to ../tmpa |
287 $ hg ci -m 'add n3w_3_c' | 222 $ hg ci -m 'add n3w_3_c' |
288 created new head | 223 created new head |
289 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | 224 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
290 $ hg log -r 'bumped()' | 225 $ hg log -r 'bumped()' |
291 $ hg log -G | 226 $ hg log -G |
292 @ changeset: 6:6f9641995072 | 227 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
293 | tag: tip | 228 | |
294 | parent: 1:7c3bad9141dc | 229 | o 2:245bde4270cd (public) [ ] add original_c |
295 | user: test | 230 |/ |
296 | date: Thu Jan 01 00:00:00 1970 +0000 | 231 o 1:7c3bad9141dc (public) [ ] add b |
297 | summary: add n3w_3_c | 232 | |
298 | | 233 o 0:1f0dee641bb7 (public) [ ] add a |
299 | o changeset: 2:245bde4270cd | |
300 |/ user: test | |
301 | date: Thu Jan 01 00:00:00 1970 +0000 | |
302 | summary: add original_c | |
303 | | |
304 o changeset: 1:7c3bad9141dc | |
305 | user: test | |
306 | date: Thu Jan 01 00:00:00 1970 +0000 | |
307 | summary: add b | |
308 | | |
309 o changeset: 0:1f0dee641bb7 | |
310 user: test | |
311 date: Thu Jan 01 00:00:00 1970 +0000 | |
312 summary: add a | |
313 | 234 |
314 | 235 |
315 | 236 |
316 | 237 |
317 $ cd .. | 238 $ cd .. |
326 | 247 |
327 $ hg init tmpc | 248 $ hg init tmpc |
328 $ cd tmpc | 249 $ cd tmpc |
329 $ hg incoming ../tmpb | 250 $ hg incoming ../tmpb |
330 comparing with ../tmpb | 251 comparing with ../tmpb |
331 changeset: 0:1f0dee641bb7 | 252 0:1f0dee641bb7 (public) [ ] add a |
332 user: test | 253 1:7c3bad9141dc (public) [ ] add b |
333 date: Thu Jan 01 00:00:00 1970 +0000 | 254 2:245bde4270cd (public) [ ] add original_c |
334 summary: add a | 255 6:6f9641995072 (draft) [tip ] add n3w_3_c |
335 | |
336 changeset: 1:7c3bad9141dc | |
337 user: test | |
338 date: Thu Jan 01 00:00:00 1970 +0000 | |
339 summary: add b | |
340 | |
341 changeset: 2:245bde4270cd | |
342 user: test | |
343 date: Thu Jan 01 00:00:00 1970 +0000 | |
344 summary: add original_c | |
345 | |
346 changeset: 6:6f9641995072 | |
347 tag: tip | |
348 parent: 1:7c3bad9141dc | |
349 user: test | |
350 date: Thu Jan 01 00:00:00 1970 +0000 | |
351 summary: add n3w_3_c | |
352 | |
353 | 256 |
354 Try to pull markers | 257 Try to pull markers |
355 (extinct changeset are excluded but marker are pushed) | 258 (extinct changeset are excluded but marker are pushed) |
356 | 259 |
357 $ hg pull ../tmpb | 260 $ hg pull ../tmpb |
424 | 327 |
425 $ hg clone tmpb clone-dest | 328 $ hg clone tmpb clone-dest |
426 updating to branch default | 329 updating to branch default |
427 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 330 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
428 $ hg -R clone-dest log -G --hidden | 331 $ hg -R clone-dest log -G --hidden |
429 @ changeset: 6:6f9641995072 | 332 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
430 | tag: tip | 333 | |
431 | parent: 1:7c3bad9141dc | 334 | x 5:5601fb93a350 (draft) [ ] add new_3_c |
432 | user: test | 335 |/ |
433 | date: Thu Jan 01 00:00:00 1970 +0000 | 336 | x 4:ca819180edb9 (draft) [ ] add new_2_c |
434 | summary: add n3w_3_c | 337 |/ |
435 | | 338 | x 3:cdbce2fbb163 (draft) [ ] add new_c |
436 | x changeset: 5:5601fb93a350 | 339 |/ |
437 |/ parent: 1:7c3bad9141dc | 340 | o 2:245bde4270cd (public) [ ] add original_c |
438 | user: test | 341 |/ |
439 | date: Thu Jan 01 00:00:00 1970 +0000 | 342 o 1:7c3bad9141dc (public) [ ] add b |
440 | summary: add new_3_c | 343 | |
441 | | 344 o 0:1f0dee641bb7 (public) [ ] add a |
442 | x changeset: 4:ca819180edb9 | |
443 |/ parent: 1:7c3bad9141dc | |
444 | user: test | |
445 | date: Thu Jan 01 00:00:00 1970 +0000 | |
446 | summary: add new_2_c | |
447 | | |
448 | x changeset: 3:cdbce2fbb163 | |
449 |/ parent: 1:7c3bad9141dc | |
450 | user: test | |
451 | date: Thu Jan 01 00:00:00 1970 +0000 | |
452 | summary: add new_c | |
453 | | |
454 | o changeset: 2:245bde4270cd | |
455 |/ user: test | |
456 | date: Thu Jan 01 00:00:00 1970 +0000 | |
457 | summary: add original_c | |
458 | | |
459 o changeset: 1:7c3bad9141dc | |
460 | user: test | |
461 | date: Thu Jan 01 00:00:00 1970 +0000 | |
462 | summary: add b | |
463 | | |
464 o changeset: 0:1f0dee641bb7 | |
465 user: test | |
466 date: Thu Jan 01 00:00:00 1970 +0000 | |
467 summary: add a | |
468 | 345 |
469 $ hg -R clone-dest debugobsolete | 346 $ hg -R clone-dest debugobsolete |
470 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | 347 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
471 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | 348 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
472 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | 349 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
517 detect outgoing obsolete and unstable | 394 detect outgoing obsolete and unstable |
518 --------------------------------------- | 395 --------------------------------------- |
519 | 396 |
520 | 397 |
521 $ hg log -G | 398 $ hg log -G |
522 o changeset: 3:6f9641995072 | 399 o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
523 | tag: tip | 400 | |
524 | parent: 1:7c3bad9141dc | 401 | o 2:245bde4270cd (public) [ ] add original_c |
525 | user: test | 402 |/ |
526 | date: Thu Jan 01 00:00:00 1970 +0000 | 403 o 1:7c3bad9141dc (public) [ ] add b |
527 | summary: add n3w_3_c | 404 | |
528 | | 405 o 0:1f0dee641bb7 (public) [ ] add a |
529 | o changeset: 2:245bde4270cd | |
530 |/ user: test | |
531 | date: Thu Jan 01 00:00:00 1970 +0000 | |
532 | summary: add original_c | |
533 | | |
534 o changeset: 1:7c3bad9141dc | |
535 | user: test | |
536 | date: Thu Jan 01 00:00:00 1970 +0000 | |
537 | summary: add b | |
538 | | |
539 o changeset: 0:1f0dee641bb7 | |
540 user: test | |
541 date: Thu Jan 01 00:00:00 1970 +0000 | |
542 summary: add a | |
543 | 406 |
544 $ hg up 'desc("n3w_3_c")' | 407 $ hg up 'desc("n3w_3_c")' |
545 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 408 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
546 $ mkcommit original_d | 409 $ mkcommit original_d |
547 $ mkcommit original_e | 410 $ mkcommit original_e |
548 $ hg debugobsolete `getid original_d` -d '0 0' | 411 $ hg debugobsolete `getid original_d` -d '0 0' |
549 $ hg log -r 'obsolete()' | 412 $ hg log -r 'obsolete()' |
550 changeset: 4:94b33453f93b | 413 4:94b33453f93b (draft) [ ] add original_d |
551 user: test | |
552 date: Thu Jan 01 00:00:00 1970 +0000 | |
553 summary: add original_d | |
554 | |
555 $ hg log -G -r '::unstable()' | 414 $ hg log -G -r '::unstable()' |
556 @ changeset: 5:cda648ca50f5 | 415 @ 5:cda648ca50f5 (draft) [tip ] add original_e |
557 | tag: tip | 416 | |
558 | user: test | 417 x 4:94b33453f93b (draft) [ ] add original_d |
559 | date: Thu Jan 01 00:00:00 1970 +0000 | 418 | |
560 | summary: add original_e | 419 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
561 | | 420 | |
562 x changeset: 4:94b33453f93b | 421 o 1:7c3bad9141dc (public) [ ] add b |
563 | user: test | 422 | |
564 | date: Thu Jan 01 00:00:00 1970 +0000 | 423 o 0:1f0dee641bb7 (public) [ ] add a |
565 | summary: add original_d | |
566 | | |
567 o changeset: 3:6f9641995072 | |
568 | parent: 1:7c3bad9141dc | |
569 | user: test | |
570 | date: Thu Jan 01 00:00:00 1970 +0000 | |
571 | summary: add n3w_3_c | |
572 | | |
573 o changeset: 1:7c3bad9141dc | |
574 | user: test | |
575 | date: Thu Jan 01 00:00:00 1970 +0000 | |
576 | summary: add b | |
577 | | |
578 o changeset: 0:1f0dee641bb7 | |
579 user: test | |
580 date: Thu Jan 01 00:00:00 1970 +0000 | |
581 summary: add a | |
582 | 424 |
583 | 425 |
584 refuse to push obsolete changeset | 426 refuse to push obsolete changeset |
585 | 427 |
586 $ hg push ../tmpc/ -r 'desc("original_d")' | 428 $ hg push ../tmpc/ -r 'desc("original_d")' |
605 | 447 |
606 $ hg init ../tmpf | 448 $ hg init ../tmpf |
607 $ hg out ../tmpf | 449 $ hg out ../tmpf |
608 comparing with ../tmpf | 450 comparing with ../tmpf |
609 searching for changes | 451 searching for changes |
610 changeset: 0:1f0dee641bb7 | 452 0:1f0dee641bb7 (public) [ ] add a |
611 user: test | 453 1:7c3bad9141dc (public) [ ] add b |
612 date: Thu Jan 01 00:00:00 1970 +0000 | 454 2:245bde4270cd (public) [ ] add original_c |
613 summary: add a | 455 3:6f9641995072 (draft) [ ] add n3w_3_c |
614 | 456 4:94b33453f93b (draft) [ ] add original_d |
615 changeset: 1:7c3bad9141dc | 457 5:cda648ca50f5 (draft) [tip ] add original_e |
616 user: test | |
617 date: Thu Jan 01 00:00:00 1970 +0000 | |
618 summary: add b | |
619 | |
620 changeset: 2:245bde4270cd | |
621 user: test | |
622 date: Thu Jan 01 00:00:00 1970 +0000 | |
623 summary: add original_c | |
624 | |
625 changeset: 3:6f9641995072 | |
626 parent: 1:7c3bad9141dc | |
627 user: test | |
628 date: Thu Jan 01 00:00:00 1970 +0000 | |
629 summary: add n3w_3_c | |
630 | |
631 changeset: 4:94b33453f93b | |
632 user: test | |
633 date: Thu Jan 01 00:00:00 1970 +0000 | |
634 summary: add original_d | |
635 | |
636 changeset: 5:cda648ca50f5 | |
637 tag: tip | |
638 user: test | |
639 date: Thu Jan 01 00:00:00 1970 +0000 | |
640 summary: add original_e | |
641 | |
642 $ hg push ../tmpf -f # -f because be push unstable too | 458 $ hg push ../tmpf -f # -f because be push unstable too |
643 pushing to ../tmpf | 459 pushing to ../tmpf |
644 searching for changes | 460 searching for changes |
645 adding changesets | 461 adding changesets |
646 adding manifests | 462 adding manifests |
656 [1] | 472 [1] |
657 | 473 |
658 Do not warn about new head when the new head is a successors of a remote one | 474 Do not warn about new head when the new head is a successors of a remote one |
659 | 475 |
660 $ hg log -G | 476 $ hg log -G |
661 @ changeset: 5:cda648ca50f5 | 477 @ 5:cda648ca50f5 (draft) [tip ] add original_e |
662 | tag: tip | 478 | |
663 | user: test | 479 x 4:94b33453f93b (draft) [ ] add original_d |
664 | date: Thu Jan 01 00:00:00 1970 +0000 | 480 | |
665 | summary: add original_e | 481 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
666 | | 482 | |
667 x changeset: 4:94b33453f93b | 483 | o 2:245bde4270cd (public) [ ] add original_c |
668 | user: test | 484 |/ |
669 | date: Thu Jan 01 00:00:00 1970 +0000 | 485 o 1:7c3bad9141dc (public) [ ] add b |
670 | summary: add original_d | 486 | |
671 | | 487 o 0:1f0dee641bb7 (public) [ ] add a |
672 o changeset: 3:6f9641995072 | |
673 | parent: 1:7c3bad9141dc | |
674 | user: test | |
675 | date: Thu Jan 01 00:00:00 1970 +0000 | |
676 | summary: add n3w_3_c | |
677 | | |
678 | o changeset: 2:245bde4270cd | |
679 |/ user: test | |
680 | date: Thu Jan 01 00:00:00 1970 +0000 | |
681 | summary: add original_c | |
682 | | |
683 o changeset: 1:7c3bad9141dc | |
684 | user: test | |
685 | date: Thu Jan 01 00:00:00 1970 +0000 | |
686 | summary: add b | |
687 | | |
688 o changeset: 0:1f0dee641bb7 | |
689 user: test | |
690 date: Thu Jan 01 00:00:00 1970 +0000 | |
691 summary: add a | |
692 | 488 |
693 $ hg up -q 'desc(n3w_3_c)' | 489 $ hg up -q 'desc(n3w_3_c)' |
694 $ mkcommit obsolete_e | 490 $ mkcommit obsolete_e |
695 created new head | 491 created new head |
696 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` | 492 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` |
697 $ hg outgoing ../tmpf # parasite hg outgoing testin | 493 $ hg outgoing ../tmpf # parasite hg outgoing testin |
698 comparing with ../tmpf | 494 comparing with ../tmpf |
699 searching for changes | 495 searching for changes |
700 changeset: 6:3de5eca88c00 | 496 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
701 tag: tip | |
702 parent: 3:6f9641995072 | |
703 user: test | |
704 date: Thu Jan 01 00:00:00 1970 +0000 | |
705 summary: add obsolete_e | |
706 | |
707 $ hg push ../tmpf | 497 $ hg push ../tmpf |
708 pushing to ../tmpf | 498 pushing to ../tmpf |
709 searching for changes | 499 searching for changes |
710 adding changesets | 500 adding changesets |
711 adding manifests | 501 adding manifests |
771 | 561 |
772 $ echo '[extensions]' >> $HGRCPATH | 562 $ echo '[extensions]' >> $HGRCPATH |
773 $ echo "obs=!" >> $HGRCPATH | 563 $ echo "obs=!" >> $HGRCPATH |
774 $ hg log -r tip | 564 $ hg log -r tip |
775 obsolete feature not enabled but 68 markers found! | 565 obsolete feature not enabled but 68 markers found! |
776 changeset: 68:c15e9edfca13 | 566 68:c15e9edfca13 (draft) [tip ] add celestine |
777 tag: tip | |
778 parent: 7:50c51b361e60 | |
779 user: test | |
780 date: Thu Jan 01 00:00:00 1970 +0000 | |
781 summary: add celestine | |
782 | |
783 | 567 |
784 reenable for later test | 568 reenable for later test |
785 | 569 |
786 $ echo '[extensions]' >> $HGRCPATH | 570 $ echo '[extensions]' >> $HGRCPATH |
787 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | 571 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
803 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 587 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
804 $ echo "bar" >> foo | 588 $ echo "bar" >> foo |
805 $ hg ci --amend | 589 $ hg ci --amend |
806 $ cd ../other-issue3805 | 590 $ cd ../other-issue3805 |
807 $ hg log -G | 591 $ hg log -G |
808 @ changeset: 0:193e9254ce7e | 592 @ 0:193e9254ce7e (draft) [tip ] A |
809 tag: tip | |
810 user: test | |
811 date: Thu Jan 01 00:00:00 1970 +0000 | |
812 summary: A | |
813 | 593 |
814 $ hg log -G -R ../repo-issue3805 | 594 $ hg log -G -R ../repo-issue3805 |
815 @ changeset: 2:3816541e5485 | 595 @ 2:3816541e5485 (draft) [tip ] A |
816 tag: tip | |
817 parent: -1:000000000000 | |
818 user: test | |
819 date: Thu Jan 01 00:00:00 1970 +0000 | |
820 summary: A | |
821 | 596 |
822 $ hg incoming | 597 $ hg incoming |
823 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | 598 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
824 searching for changes | 599 searching for changes |
825 changeset: 2:3816541e5485 | 600 2:3816541e5485 (draft) [tip ] A |
826 tag: tip | |
827 parent: -1:000000000000 | |
828 user: test | |
829 date: Thu Jan 01 00:00:00 1970 +0000 | |
830 summary: A | |
831 | |
832 $ hg incoming --bundle ../issue3805.hg | 601 $ hg incoming --bundle ../issue3805.hg |
833 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | 602 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
834 searching for changes | 603 searching for changes |
835 changeset: 2:3816541e5485 | 604 2:3816541e5485 (draft) [tip ] A |
836 tag: tip | |
837 parent: -1:000000000000 | |
838 user: test | |
839 date: Thu Jan 01 00:00:00 1970 +0000 | |
840 summary: A | |
841 | |
842 $ hg outgoing | 605 $ hg outgoing |
843 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | 606 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
844 searching for changes | 607 searching for changes |
845 no changes found | 608 no changes found |
846 [1] | 609 [1] |
851 $ cat hg.pid >> $DAEMON_PIDS | 614 $ cat hg.pid >> $DAEMON_PIDS |
852 | 615 |
853 $ hg incoming http://localhost:$HGPORT | 616 $ hg incoming http://localhost:$HGPORT |
854 comparing with http://localhost:$HGPORT/ | 617 comparing with http://localhost:$HGPORT/ |
855 searching for changes | 618 searching for changes |
856 changeset: 1:3816541e5485 | 619 1:3816541e5485 (public) [tip ] A |
857 tag: tip | |
858 parent: -1:000000000000 | |
859 user: test | |
860 date: Thu Jan 01 00:00:00 1970 +0000 | |
861 summary: A | |
862 | |
863 $ hg outgoing http://localhost:$HGPORT | 620 $ hg outgoing http://localhost:$HGPORT |
864 comparing with http://localhost:$HGPORT/ | 621 comparing with http://localhost:$HGPORT/ |
865 searching for changes | 622 searching for changes |
866 no changes found | 623 no changes found |
867 [1] | 624 [1] |
892 | 649 |
893 Test that a local tag blocks a changeset from being hidden | 650 Test that a local tag blocks a changeset from being hidden |
894 | 651 |
895 $ hg tag -l visible -r 0 --hidden | 652 $ hg tag -l visible -r 0 --hidden |
896 $ hg log -G | 653 $ hg log -G |
897 @ changeset: 2:3816541e5485 | 654 @ 2:3816541e5485 (draft) [tip ] A |
898 tag: tip | 655 |
899 parent: -1:000000000000 | 656 x 0:193e9254ce7e (draft) [visible ] A |
900 user: test | |
901 date: Thu Jan 01 00:00:00 1970 +0000 | |
902 summary: A | |
903 | |
904 x changeset: 0:193e9254ce7e | |
905 tag: visible | |
906 user: test | |
907 date: Thu Jan 01 00:00:00 1970 +0000 | |
908 summary: A | |
909 | 657 |
910 Test that removing a local tag does not cause some commands to fail | 658 Test that removing a local tag does not cause some commands to fail |
911 | 659 |
912 $ hg tag -l -r tip tiptag | 660 $ hg tag -l -r tip tiptag |
913 $ hg tags | 661 $ hg tags |