##// END OF EJS Templates
bookmarks: display the obsfate of hidden revision we create a bookmark on...
Boris Feld -
r35730:a1a5c384 default
parent child Browse files
Show More
@@ -861,6 +861,11 b' def addbookmarks(repo, tr, names, rev=No'
861
861
862 if hiddenrev:
862 if hiddenrev:
863 repo.ui.warn(_("bookmarking hidden changeset %s\n") % hiddenrev)
863 repo.ui.warn(_("bookmarking hidden changeset %s\n") % hiddenrev)
864
865 if ctx.obsolete():
866 msg = obsutil._getfilteredreason(repo, "%s" % hiddenrev, ctx)
867 repo.ui.warn("(%s)\n" % msg)
868
864 marks.applychanges(repo, tr, changes)
869 marks.applychanges(repo, tr, changes)
865 if not inactive and cur == marks[newact] and not rev:
870 if not inactive and cur == marks[newact] and not rev:
866 activate(repo, newact)
871 activate(repo, newact)
@@ -195,6 +195,7 b' Setting a bookmark will make that change'
195
195
196 $ hg bookmarks -r 28ad74 book
196 $ hg bookmarks -r 28ad74 book
197 bookmarking hidden changeset 28ad74487de9
197 bookmarking hidden changeset 28ad74487de9
198 (hidden revision '28ad74487de9' was rewritten as: 2443a0e66469)
198
199
199 $ hg bookmarks
200 $ hg bookmarks
200 book 2:28ad74487de9
201 book 2:28ad74487de9
@@ -1959,6 +1959,7 b' bookmarks prevent a changeset being hidd'
1959
1959
1960 $ hg bookmark --hidden -r 1 X
1960 $ hg bookmark --hidden -r 1 X
1961 bookmarking hidden changeset a765632148dc
1961 bookmarking hidden changeset a765632148dc
1962 (hidden revision 'a765632148dc' is pruned)
1962 $ hg log --template '{rev}:{node}\n'
1963 $ hg log --template '{rev}:{node}\n'
1963 1:a765632148dc55d38c35c4f247c618701886cb2f
1964 1:a765632148dc55d38c35c4f247c618701886cb2f
1964 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1965 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
@@ -1968,6 +1969,7 b' divergent bookmarks are not hidden'
1968
1969
1969 $ hg bookmark --hidden -r 1 X@foo
1970 $ hg bookmark --hidden -r 1 X@foo
1970 bookmarking hidden changeset a765632148dc
1971 bookmarking hidden changeset a765632148dc
1972 (hidden revision 'a765632148dc' is pruned)
1971 $ hg log --template '{rev}:{node}\n'
1973 $ hg log --template '{rev}:{node}\n'
1972 1:a765632148dc55d38c35c4f247c618701886cb2f
1974 1:a765632148dc55d38c35c4f247c618701886cb2f
1973 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1975 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
@@ -1352,6 +1352,7 b' bookmarks change'
1352 $ hg commit --amend -m "message"
1352 $ hg commit --amend -m "message"
1353 $ hg book bookb -r 13bedc178fce --hidden
1353 $ hg book bookb -r 13bedc178fce --hidden
1354 bookmarking hidden changeset 13bedc178fce
1354 bookmarking hidden changeset 13bedc178fce
1355 (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753)
1355 $ hg log -r 13bedc178fce
1356 $ hg log -r 13bedc178fce
1356 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1357 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1357 $ hg book -d bookb
1358 $ hg book -d bookb
@@ -1531,6 +1531,7 b' equivalents in destination'
1531 3:be1832deae9a b (no-eol)
1531 3:be1832deae9a b (no-eol)
1532 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
1532 $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
1533 bookmarking hidden changeset 1e9a3c00cbe9
1533 bookmarking hidden changeset 1e9a3c00cbe9
1534 (hidden revision '1e9a3c00cbe9' was rewritten as: be1832deae9a)
1534 $ hg up 2 && hg log -r . # working dir is at rev 2 again
1535 $ hg up 2 && hg log -r . # working dir is at rev 2 again
1535 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1536 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1536 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
1537 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol)
General Comments 0
You need to be logged in to leave comments. Login now