comparison tests/test-log.t @ 35571:265cd9e19d26

visibility: improve the message when accessing filtered obsolete rev When trying to access filtered revision, it is likely because they have been obsoleted by an obs-marker. The current message shows how to access the revision anyway: abort: hidden revision '13bedc178fce'! But in the case of an obsoleted revision, the user is likely to want to update to or use the successor of the revision. We update the message to display more information about the obsolescence fate of the revision in the following cases: abort: hidden revision '13bedc178fce' is pruned! abort: hidden revision '13bedc178fce' has diverged! abort: hidden revision '13bedc178fce' was rewritten as X, Y and 2 more! Differential Revision: https://phab.mercurial-scm.org/D1591
author Boris Feld <boris.feld@octobus.net>
date Fri, 05 Jan 2018 09:12:08 +0100
parents b6dbc860570d
children 7336ac5e786e
comparison
equal deleted inserted replaced
35570:3e3f4c03876b 35571:265cd9e19d26
1825 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 1825 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1826 $ hg log --template='{rev}:{node}\n' --hidden 1826 $ hg log --template='{rev}:{node}\n' --hidden
1827 1:a765632148dc55d38c35c4f247c618701886cb2f 1827 1:a765632148dc55d38c35c4f247c618701886cb2f
1828 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 1828 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1829 $ hg log -r a 1829 $ hg log -r a
1830 abort: hidden revision 'a'! 1830 abort: hidden revision 'a' is pruned!
1831 (use --hidden to access hidden revisions) 1831 (use --hidden to access hidden revisions)
1832 [255] 1832 [255]
1833 1833
1834 test that parent prevent a changeset to be hidden 1834 test that parent prevent a changeset to be hidden
1835 1835
1883 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e 1883 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
1884 $ hg log -T'{rev}:{node}\n' -r:tip 1884 $ hg log -T'{rev}:{node}\n' -r:tip
1885 2:94375ec45bddd2a824535fc04855bd058c926ec0 1885 2:94375ec45bddd2a824535fc04855bd058c926ec0
1886 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e 1886 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
1887 $ hg log -T'{rev}:{node}\n' -r:0 1887 $ hg log -T'{rev}:{node}\n' -r:0
1888 abort: hidden revision '0'! 1888 abort: hidden revision '0' is pruned!
1889 (use --hidden to access hidden revisions) 1889 (use --hidden to access hidden revisions)
1890 [255] 1890 [255]
1891 $ hg log -T'{rev}:{node}\n' -f 1891 $ hg log -T'{rev}:{node}\n' -f
1892 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e 1892 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
1893 2:94375ec45bddd2a824535fc04855bd058c926ec0 1893 2:94375ec45bddd2a824535fc04855bd058c926ec0