| yuja |
| hg-reviewers |
Display the same message we added recently to the filtered error message
create a bookmark on an hidden revision.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bookmarks.py (5 lines) | |||
| M | tests/test-directaccess.t (1 line) | |||
| M | tests/test-log.t (2 lines) | |||
| M | tests/test-obsolete.t (1 line) | |||
| M | tests/test-rebase-obsolete.t (1 line) |
| Status | Author | Revision | |
|---|---|---|---|
| Abandoned | lothiraldan | ||
| Abandoned | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan |
| hiddenrev = ctx.hex()[:12] | hiddenrev = ctx.hex()[:12] | ||||
| tgt = ctx.node() | tgt = ctx.node() | ||||
| for bm in marks.checkconflict(mark, force, tgt): | for bm in marks.checkconflict(mark, force, tgt): | ||||
| changes.append((bm, None)) | changes.append((bm, None)) | ||||
| changes.append((mark, tgt)) | changes.append((mark, tgt)) | ||||
| if hiddenrev: | if hiddenrev: | ||||
| repo.ui.warn(_("bookmarking hidden changeset %s\n") % hiddenrev) | repo.ui.warn(_("bookmarking hidden changeset %s\n") % hiddenrev) | ||||
| if ctx.obsolete(): | |||||
| msg = obsutil._getfilteredreason(repo, "%s" % hiddenrev, ctx) | |||||
| repo.ui.warn("(%s)\n" % msg) | |||||
| marks.applychanges(repo, tr, changes) | marks.applychanges(repo, tr, changes) | ||||
| if not inactive and cur == marks[newact] and not rev: | if not inactive and cur == marks[newact] and not rev: | ||||
| activate(repo, newact) | activate(repo, newact) | ||||
| elif cur != tgt and newact == repo._activebookmark: | elif cur != tgt and newact == repo._activebookmark: | ||||
| deactivate(repo) | deactivate(repo) | ||||
| def _printbookmarks(ui, repo, bmarks, **opts): | def _printbookmarks(ui, repo, bmarks, **opts): | ||||
| """private method to print bookmarks | """private method to print bookmarks | ||||
| abort: hidden revision '2' was rewritten as: 2443a0e66469! | abort: hidden revision '2' was rewritten as: 2443a0e66469! | ||||
| (use --hidden to access hidden revisions) | (use --hidden to access hidden revisions) | ||||
| [255] | [255] | ||||
| Setting a bookmark will make that changeset unhidden, so this should come in end | Setting a bookmark will make that changeset unhidden, so this should come in end | ||||
| $ hg bookmarks -r 28ad74 book | $ hg bookmarks -r 28ad74 book | ||||
| bookmarking hidden changeset 28ad74487de9 | bookmarking hidden changeset 28ad74487de9 | ||||
| (hidden revision '28ad74487de9' was rewritten as: 2443a0e66469) | |||||
| $ hg bookmarks | $ hg bookmarks | ||||
| book 2:28ad74487de9 | book 2:28ad74487de9 | ||||
| 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | ||||
| $ hg debugsetparents 1 | $ hg debugsetparents 1 | ||||
| $ hg up -q null | $ hg up -q null | ||||
| bookmarks prevent a changeset being hidden | bookmarks prevent a changeset being hidden | ||||
| $ hg bookmark --hidden -r 1 X | $ hg bookmark --hidden -r 1 X | ||||
| bookmarking hidden changeset a765632148dc | bookmarking hidden changeset a765632148dc | ||||
| (hidden revision 'a765632148dc' is pruned) | |||||
| $ hg log --template '{rev}:{node}\n' | $ hg log --template '{rev}:{node}\n' | ||||
| 1:a765632148dc55d38c35c4f247c618701886cb2f | 1:a765632148dc55d38c35c4f247c618701886cb2f | ||||
| 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | ||||
| $ hg bookmark -d X | $ hg bookmark -d X | ||||
| divergent bookmarks are not hidden | divergent bookmarks are not hidden | ||||
| $ hg bookmark --hidden -r 1 X@foo | $ hg bookmark --hidden -r 1 X@foo | ||||
| bookmarking hidden changeset a765632148dc | bookmarking hidden changeset a765632148dc | ||||
| (hidden revision 'a765632148dc' is pruned) | |||||
| $ hg log --template '{rev}:{node}\n' | $ hg log --template '{rev}:{node}\n' | ||||
| 1:a765632148dc55d38c35c4f247c618701886cb2f | 1:a765632148dc55d38c35c4f247c618701886cb2f | ||||
| 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | ||||
| test hidden revision 0 (issue5385) | test hidden revision 0 (issue5385) | ||||
| $ hg bookmark -d X@foo | $ hg bookmark -d X@foo | ||||
| $ hg up null -q | $ hg up null -q | ||||
| a already tracked! | a already tracked! | ||||
| $ mkcommit b | $ mkcommit b | ||||
| $ hg id | $ hg id | ||||
| 13bedc178fce tip | 13bedc178fce tip | ||||
| $ echo "hello" > b | $ echo "hello" > b | ||||
| $ hg commit --amend -m "message" | $ hg commit --amend -m "message" | ||||
| $ hg book bookb -r 13bedc178fce --hidden | $ hg book bookb -r 13bedc178fce --hidden | ||||
| bookmarking hidden changeset 13bedc178fce | bookmarking hidden changeset 13bedc178fce | ||||
| (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753) | |||||
| $ hg log -r 13bedc178fce | $ hg log -r 13bedc178fce | ||||
| 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] | ||||
| $ hg book -d bookb | $ hg book -d bookb | ||||
| $ hg log -r 13bedc178fce | $ hg log -r 13bedc178fce | ||||
| abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753! | abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753! | ||||
| (use --hidden to access hidden revisions) | (use --hidden to access hidden revisions) | ||||
| [255] | [255] | ||||
| adding b | adding b | ||||
| created new head | created new head | ||||
| $ hg rebase -r 2 -d 1 | $ hg rebase -r 2 -d 1 | ||||
| rebasing 2:1e9a3c00cbe9 "b" (tip) | rebasing 2:1e9a3c00cbe9 "b" (tip) | ||||
| $ hg log -r . # working dir is at rev 3 (successor of 2) | $ hg log -r . # working dir is at rev 3 (successor of 2) | ||||
| 3:be1832deae9a b (no-eol) | 3:be1832deae9a b (no-eol) | ||||
| $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now | $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now | ||||
| bookmarking hidden changeset 1e9a3c00cbe9 | bookmarking hidden changeset 1e9a3c00cbe9 | ||||
| (hidden revision '1e9a3c00cbe9' was rewritten as: be1832deae9a) | |||||
| $ hg up 2 && hg log -r . # working dir is at rev 2 again | $ hg up 2 && hg log -r . # working dir is at rev 2 again | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) | 2:1e9a3c00cbe9 b (rewritten using rebase as 3:be1832deae9a) (no-eol) | ||||
| $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 | $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 | ||||
| note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) | ||||
| Check that working directory and bookmark was updated to rev 3 although rev 2 | Check that working directory and bookmark was updated to rev 3 although rev 2 | ||||
| was skipped | was skipped | ||||
| $ hg log -r . | $ hg log -r . | ||||