##// END OF EJS Templates
update: print warning about hidden changeset after update...
Martin von Zweigbergk -
r37939:ea63a200 default
parent child Browse files
Show More
@@ -5583,18 +5583,19 def update(ui, repo, node=None, **opts):
5583 5583 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5584 5584 ctx = scmutil.revsingle(repo, rev, rev)
5585 5585 rev = ctx.rev()
5586 if ctx.hidden():
5586 hidden = ctx.hidden()
5587 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5588
5589 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
5590 updatecheck=updatecheck)
5591 if hidden:
5587 5592 ctxstr = ctx.hex()[:12]
5588 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr)
5593 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
5589 5594
5590 5595 if ctx.obsolete():
5591 5596 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
5592 5597 ui.warn("(%s)\n" % obsfatemsg)
5593
5594 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update')
5595
5596 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5597 updatecheck=updatecheck)
5598 return ret
5598 5599
5599 5600 @command('verify', [])
5600 5601 def verify(ui, repo):
@@ -156,9 +156,9 This should not throw error
156 156 `hg update`
157 157
158 158 $ hg up 28ad74
159 updating to a hidden changeset 28ad74487de9
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
160 updated to hidden changeset 28ad74487de9
160 161 (hidden revision '28ad74487de9' was rewritten as: 2443a0e66469)
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
162 162
163 163 $ hg up 3
164 164 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1943,7 +1943,7 enable obsolete to test hidden feature
1943 1943 test that parent prevent a changeset to be hidden
1944 1944
1945 1945 $ hg up 1 -q --hidden
1946 updating to a hidden changeset a765632148dc
1946 updated to hidden changeset a765632148dc
1947 1947 (hidden revision 'a765632148dc' is pruned)
1948 1948 $ hg log --template='{rev}:{node}\n'
1949 1949 1:a765632148dc55d38c35c4f247c618701886cb2f
@@ -55,9 +55,9 Actual test
55 55 (use --hidden to access hidden revisions)
56 56 [255]
57 57 $ hg update --hidden "desc(A0)"
58 updating to a hidden changeset 471f378eab4c
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 updated to hidden changeset 471f378eab4c
59 60 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 61
62 62 Test output with pruned commit
63 63 ==============================
@@ -118,9 +118,9 Actual test
118 118 (use --hidden to access hidden revisions)
119 119 [255]
120 120 $ hg up --hidden -r 'desc(B0)'
121 updating to a hidden changeset 0dec01379d3b
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
122 updated to hidden changeset 0dec01379d3b
122 123 (hidden revision '0dec01379d3b' is pruned)
123 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
124 124
125 125 Test output with splitted commit
126 126 ================================
@@ -195,9 +195,9 Actual test
195 195 (use --hidden to access hidden revisions)
196 196 [255]
197 197 $ hg update --hidden 'min(desc(A0))'
198 updating to a hidden changeset 471597cad322
198 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
199 updated to hidden changeset 471597cad322
199 200 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
200 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
201 201
202 202 Test output with lots of splitted commit
203 203 ========================================
@@ -294,9 +294,9 Actual test
294 294 (use --hidden to access hidden revisions)
295 295 [255]
296 296 $ hg update --hidden 'min(desc(A0))'
297 updating to a hidden changeset de7290d8b885
297 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
298 updated to hidden changeset de7290d8b885
298 299 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
299 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
300 300
301 301 Test output with folded commit
302 302 ==============================
@@ -373,17 +373,17 Test setup
373 373 (use --hidden to access hidden revisions)
374 374 [255]
375 375 $ hg update --hidden 'desc(A0)'
376 updating to a hidden changeset 471f378eab4c
376 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
377 updated to hidden changeset 471f378eab4c
377 378 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
378 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
379 379 $ hg update 0dec01379d3b
380 380 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
381 381 (use --hidden to access hidden revisions)
382 382 [255]
383 383 $ hg update --hidden 'desc(B0)'
384 updating to a hidden changeset 0dec01379d3b
384 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
385 updated to hidden changeset 0dec01379d3b
385 386 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
386 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
387 387
388 388 Test output with divergence
389 389 ===========================
@@ -416,9 +416,9 Test setup
416 416 summary: ROOT
417 417
418 418 $ hg update --hidden 'desc(A0)'
419 updating to a hidden changeset 471f378eab4c
419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
420 updated to hidden changeset 471f378eab4c
420 421 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
421 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
422 422 $ hg commit --amend -m "A2"
423 423 2 new content-divergent changesets
424 424 $ hg log --hidden -G
@@ -456,9 +456,9 Actual test
456 456 (use --hidden to access hidden revisions)
457 457 [255]
458 458 $ hg update --hidden 'desc(A0)'
459 updating to a hidden changeset 471f378eab4c
459 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
460 updated to hidden changeset 471f378eab4c
460 461 (hidden revision '471f378eab4c' has diverged)
461 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
462 462
463 463 Test output with amended + folded commit
464 464 ========================================
@@ -551,13 +551,13 Test setup
551 551 (use --hidden to access hidden revisions)
552 552 [255]
553 553 $ hg update --hidden 'desc(A0)'
554 updating to a hidden changeset 471f378eab4c
554 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
555 updated to hidden changeset 471f378eab4c
555 556 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
556 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
557 557 $ hg update --hidden 0dec01379d3b
558 updating to a hidden changeset 0dec01379d3b
558 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
559 updated to hidden changeset 0dec01379d3b
559 560 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
560 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
561 561 $ hg update 0dec01379d3b
562 562 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
563 563 $ hg update --hidden 'desc(B0)'
@@ -75,9 +75,9 Test setup
75 75 Check templates
76 76 ---------------
77 77 $ hg up 'desc(A0)' --hidden
78 updating to a hidden changeset 471f378eab4c
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 updated to hidden changeset 471f378eab4c
79 80 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
81 81
82 82 Predecessors template should show current revision as it is the working copy
83 83 $ hg tlog
@@ -148,9 +148,9 Predecessors template should show curren
148 148 summary: ROOT
149 149
150 150 $ hg up 'desc(A1)' --hidden
151 updating to a hidden changeset a468dc9b3633
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 updated to hidden changeset a468dc9b3633
152 153 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
154 154
155 155 Predecessors template should show current revision as it is the working copy
156 156 $ hg tlog
@@ -417,9 +417,9 Check templates
417 417 ---------------
418 418
419 419 $ hg up 'obsolete()' --hidden
420 updating to a hidden changeset 471597cad322
420 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
421 updated to hidden changeset 471597cad322
421 422 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
422 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
423 423
424 424 Predecessors template should show current revision as it is the working copy
425 425 $ hg tlog
@@ -627,9 +627,9 Check templates
627 627 ---------------
628 628
629 629 $ hg up 'desc(A0)' --hidden
630 updating to a hidden changeset 471f378eab4c
630 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
631 updated to hidden changeset 471f378eab4c
631 632 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
632 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
633 633
634 634 Predecessors template should show current revision as it is the working copy
635 635 $ hg tlog
@@ -653,9 +653,9 Predecessors template should show curren
653 653 o ea207398892e
654 654
655 655 $ hg up 'desc(B0)' --hidden
656 updating to a hidden changeset 0dec01379d3b
656 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
657 updated to hidden changeset 0dec01379d3b
657 658 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
658 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
659 659
660 660 Predecessors template should show both predecessors as they should be both
661 661 displayed
@@ -820,9 +820,9 Test setup
820 820 summary: ROOT
821 821
822 822 $ hg update --hidden 'desc(A0)'
823 updating to a hidden changeset 471f378eab4c
823 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
824 updated to hidden changeset 471f378eab4c
824 825 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
825 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
826 826 $ hg commit --amend -m "A2"
827 827 2 new content-divergent changesets
828 828 $ hg log --hidden -G
@@ -894,9 +894,9 Check templates
894 894 ---------------
895 895
896 896 $ hg up 'desc(A0)' --hidden
897 updating to a hidden changeset 471f378eab4c
897 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
898 updated to hidden changeset 471f378eab4c
898 899 (hidden revision '471f378eab4c' has diverged)
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
900 900
901 901 Predecessors template should show current revision as it is the working copy
902 902 $ hg tlog
@@ -1161,9 +1161,9 Check templates
1161 1161 ---------------
1162 1162
1163 1163 $ hg up 'desc(A0)' --hidden
1164 updating to a hidden changeset 471f378eab4c
1164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1165 updated to hidden changeset 471f378eab4c
1165 1166 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1166 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1167 1167
1168 1168 Predecessors template should show current revision as it is the working copy
1169 1169 $ hg tlog
@@ -1187,9 +1187,9 Predecessors template should show curren
1187 1187 o ea207398892e
1188 1188
1189 1189 $ hg up 'desc(B0)' --hidden
1190 updating to a hidden changeset 0dec01379d3b
1190 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1191 updated to hidden changeset 0dec01379d3b
1191 1192 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1193 1193
1194 1194 Predecessors template should both predecessors as they are visible
1195 1195 $ hg tlog
@@ -1219,9 +1219,9 Predecessors template should both predec
1219 1219 o ea207398892e
1220 1220
1221 1221 $ hg up 'desc(B1)' --hidden
1222 updating to a hidden changeset b7ea6d14e664
1222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1223 updated to hidden changeset b7ea6d14e664
1223 1224 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
1224 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1225 1225
1226 1226 Predecessors template should both predecessors as they are visible
1227 1227 $ hg tlog
@@ -1623,9 +1623,9 Check templates
1623 1623
1624 1624
1625 1625 $ hg up -r "desc(B0)" --hidden
1626 updating to a hidden changeset 0dec01379d3b
1626 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1627 updated to hidden changeset 0dec01379d3b
1627 1628 (hidden revision '0dec01379d3b' is pruned)
1628 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1629 1629 $ hg tlog
1630 1630 o f897c6137566
1631 1631 | Predecessors: 2:0dec01379d3b
@@ -2087,9 +2087,9 Check templates
2087 2087 o ea207398892e
2088 2088
2089 2089 $ hg up --hidden 4
2090 updating to a hidden changeset 9bd10a0775e4
2090 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2091 updated to hidden changeset 9bd10a0775e4
2091 2092 (hidden revision '9bd10a0775e4' has diverged)
2092 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2093 2093 $ hg rebase -r 7 -d 8 --config extensions.rebase=
2094 2094 rebasing 7:ba2ed02b0c9a "Add A,B,C"
2095 2095 $ hg tlog
@@ -2333,9 +2333,9 Test setup
2333 2333 obsoleted 1 changesets
2334 2334
2335 2335 $ hg up -r "desc(A0)" --hidden
2336 updating to a hidden changeset 471f378eab4c
2336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2337 updated to hidden changeset 471f378eab4c
2337 2338 (hidden revision '471f378eab4c' is pruned)
2338 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2339 2339 $ hg commit --amend -m "A2"
2340 2340 $ hg debugobsolete --record-parent `getid "."`
2341 2341 obsoleted 1 changesets
@@ -2344,9 +2344,9 Check output
2344 2344 ------------
2345 2345
2346 2346 $ hg up "desc(A0)" --hidden
2347 updating to a hidden changeset 471f378eab4c
2347 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2348 updated to hidden changeset 471f378eab4c
2348 2349 (hidden revision '471f378eab4c' is pruned)
2349 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2350 2350 $ hg tlog
2351 2351 @ 471f378eab4c
2352 2352 |
@@ -2499,9 +2499,9 Check templates
2499 2499 ---------------
2500 2500
2501 2501 $ hg up 'desc("A0")' --hidden
2502 updating to a hidden changeset 471597cad322
2502 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2503 updated to hidden changeset 471597cad322
2503 2504 (hidden revision '471597cad322' is pruned)
2504 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2505 2505
2506 2506 # todo: the obsfate output is not ideal
2507 2507 $ hg fatelog
@@ -2512,9 +2512,9 Check templates
2512 2512 o ea207398892e
2513 2513
2514 2514 $ hg up -r 'desc("A2")' --hidden
2515 updating to a hidden changeset 0d0ef4bdf70e
2515 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2516 updated to hidden changeset 0d0ef4bdf70e
2516 2517 (hidden revision '0d0ef4bdf70e' is pruned)
2517 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2518 2518
2519 2519 $ hg fatelog --hidden
2520 2520 @ 0d0ef4bdf70e
@@ -62,7 +62,7 Killing a single changeset without repla
62 62 $ hg tip
63 63 -1:000000000000 (public) [tip ]
64 64 $ hg up --hidden tip --quiet
65 updating to a hidden changeset 97b7c2d76b18
65 updated to hidden changeset 97b7c2d76b18
66 66 (hidden revision '97b7c2d76b18' is pruned)
67 67
68 68 Killing a single changeset with itself should fail
@@ -281,7 +281,7 a working copy parent. We should be move
281 281 even though it is hidden (until we're moved there).
282 282
283 283 $ hg --hidden up -qr 'first(hidden())'
284 updating to a hidden changeset 42ccdea3bb16
284 updated to hidden changeset 42ccdea3bb16
285 285 (hidden revision '42ccdea3bb16' is pruned)
286 286 $ hg rebase --rev 13 --dest 15
287 287 rebasing 13:98f6af4ee953 "C"
@@ -642,9 +642,9 test on rebase dropping a merge
642 642 Test hidden changesets in the rebase set (issue4504)
643 643
644 644 $ hg up --hidden 9
645 updating to a hidden changeset 4bde274eefcf
645 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
646 updated to hidden changeset 4bde274eefcf
646 647 (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39)
647 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
648 648 $ echo J > J
649 649 $ hg add J
650 650 $ hg commit -m J
@@ -764,9 +764,9 setup
764 764 $ hg commit --amend -m B1
765 765 $ hg commit --amend -m B2
766 766 $ hg up --hidden 'desc(B0)'
767 updating to a hidden changeset a8b11f55fb19
767 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
768 updated to hidden changeset a8b11f55fb19
768 769 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
769 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
770 770 $ echo C > C
771 771 $ hg add C
772 772 $ hg commit -m C
@@ -790,9 +790,9 Rebase finds its way in a chain of marke
790 790 Even when the chain include missing node
791 791
792 792 $ hg up --hidden 'desc(B0)'
793 updating to a hidden changeset a8b11f55fb19
793 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
794 updated to hidden changeset a8b11f55fb19
794 795 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
795 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
796 796 $ echo D > D
797 797 $ hg add D
798 798 $ hg commit -m D
@@ -909,9 +909,9 If a rebase is going to create divergenc
909 909 $ hg add bar
910 910 $ hg commit --amend -m "10'"
911 911 $ hg up 10 --hidden
912 updating to a hidden changeset 121d9e3bc4c6
912 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
913 updated to hidden changeset 121d9e3bc4c6
913 914 (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
914 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
915 915 $ echo "bar" > foo
916 916 $ hg add foo
917 917 $ hg commit -m "bar foo"
@@ -1706,7 +1706,7 rebasestate may contain hidden hashes. "
1706 1706 $ rm .hg/localtags
1707 1707
1708 1708 $ hg update -q $C --hidden
1709 updating to a hidden changeset 7829726be4dc
1709 updated to hidden changeset 7829726be4dc
1710 1710 (hidden revision '7829726be4dc' is pruned)
1711 1711 $ hg rebase -s $B -d $D
1712 1712 rebasing 1:2ec65233581b "B"
@@ -516,11 +516,33 the bookmark (issue4015)
516 516 $ hg bookmarks
517 517 * bm 5:ff252e8273df
518 518
519 Test that we abort before we warn about the hidden commit if the working
520 directory is dirty
521 $ echo conflict > a
522 $ hg up --hidden 3
523 abort: uncommitted changes
524 (commit or update --clean to discard changes)
525 [255]
526
527 Test that we still warn also when there are conflicts
528 $ hg up -m --hidden 3
529 merging a
530 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
531 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
532 use 'hg resolve' to retry unresolved file merges
533 (leaving bookmark bm)
534 updated to hidden changeset 6efa171f091b
535 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
536 [1]
537 $ hg revert -r . a
538 $ hg resolve -m
539 (no more unresolved files)
540
519 541 Test that 4 is detected as the no-argument destination from 3 and also moves
520 542 the bookmark with it
521 543 $ hg up --quiet 0 # we should be able to update to 3 directly
522 544 $ hg up --quiet --hidden 3 # but not implemented yet.
523 updating to a hidden changeset 6efa171f091b
545 updated to hidden changeset 6efa171f091b
524 546 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
525 547 $ hg book -f bm
526 548 $ hg up
@@ -532,7 +554,7 the bookmark with it
532 554 Test that 5 is detected as a valid destination from 1
533 555 $ hg up --quiet 0 # we should be able to update to 3 directly
534 556 $ hg up --quiet --hidden 3 # but not implemented yet.
535 updating to a hidden changeset 6efa171f091b
557 updated to hidden changeset 6efa171f091b
536 558 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
537 559 $ hg up 5
538 560 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now