This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1813

bookmarks: add bookmarks to hidden revs if directaccess config is set
ClosedPublic

Authored by pulkit on Jan 5 2018, 12:14 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG7336ac5e786e: bookmarks: add bookmarks to hidden revs if directaccess config is set
rHG53c0526b6484: bookmarks: add bookmarks to hidden revs if directaccess config is set
Summary

This patch adds support to add bookmarks to hidden revs if
experimental.directaccessi=True config is set. A warning is also printed
saying "accessing hidden changeset <revhash>".

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jan 5 2018, 12:14 PM
yuja requested changes to this revision.Jan 5 2018, 9:36 PM
yuja added a subscriber: yuja.

Needs some warning since a hidden revision may be revived?

This revision now requires changes to proceed.Jan 5 2018, 9:36 PM
pulkit edited the summary of this revision. (Show Details)Jan 6 2018, 1:48 AM
pulkit retitled this revision from bookmarks: add support to specify hidden revs if directaccess config is set to bookmarks: add bookmarks to hidden revs if directaccess config is set.
pulkit updated this revision to Diff 4732.
yuja requested changes to this revision.Jan 10 2018, 7:55 AM
yuja added inline comments.
mercurial/bookmarks.py
843

_("adding ... changeset")

844

Accessing hidden revisions here doesn't mean they will be bookmarked.

Perhaps we should instead warn if tgt is a hidden (or obsolete?) revision.

This revision now requires changes to proceed.Jan 10 2018, 7:55 AM
pulkit edited the summary of this revision. (Show Details)Jan 10 2018, 12:48 PM
pulkit updated this revision to Diff 4754.
yuja requested changes to this revision.Jan 11 2018, 7:47 AM
yuja added inline comments.
mercurial/bookmarks.py
846

Perhaps we can say "bookmarking" or "reviving" instead of "accessing"? I don't know which is better, though.

Another minor problem I found is this warning will be repeated if
you pass more than one bookmark names.

This revision now requires changes to proceed.Jan 11 2018, 7:47 AM
pulkit updated this revision to Diff 4803.Jan 12 2018, 7:36 AM
yuja accepted this revision.Jan 12 2018, 8:27 AM
This revision is now accepted and ready to land.Jan 12 2018, 8:27 AM
yuja added a comment.Jan 12 2018, 8:31 AM

Queued, thanks.

mercurial/bookmarks.py
853

FYI, it loops over bookmark names with the same rev, so
hiddenrevs would have at most one element, and the second
unhidehashlikerevs() call would be unnecessary.

Closed by commit rHG53c0526b6484: bookmarks: add bookmarks to hidden revs if directaccess config is set (authored by pulkit). · Explain WhyJan 12 2018, 8:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4807

mercurial/bookmarks.py

first bookmark is activated. first bookmark is activated.
Raises an abort error if old is not in the bookmark store. Raises an abort error if old is not in the bookmark store.
""" """
marks = repo._bookmarks marks = repo._bookmarks
cur = repo.changectx('.').node() cur = repo.changectx('.').node()
newact = None newact = None
changes = [] changes = []
hiddenrevs = set()
for mark in names: for mark in names:
mark = checkformat(repo, mark) mark = checkformat(repo, mark)
if newact is None: if newact is None:
newact = mark newact = mark
if inactive and mark == repo._activebookmark: if inactive and mark == repo._activebookmark:
deactivate(repo) deactivate(repo)
return return
tgt = cur tgt = cur
if rev: if rev:
tgt = scmutil.revsingle(repo, rev).node() repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
yujaUnsubmitted
Not Done

_("adding ... changeset")

yuja: `_("adding ... changeset")`
ctx = scmutil.revsingle(repo, rev)
yujaUnsubmitted
Not Done

Accessing hidden revisions here doesn't mean they will be bookmarked.

Perhaps we should instead warn if tgt is a hidden (or obsolete?) revision.

yuja: Accessing hidden revisions here doesn't mean they will be bookmarked. Perhaps we should…
if ctx.hidden():
hiddenrevs.add(ctx.hex()[:12])
yujaUnsubmitted
Not Done

Perhaps we can say "bookmarking" or "reviving" instead of "accessing"? I don't know which is better, though.

Another minor problem I found is this warning will be repeated if
you pass more than one bookmark names.

yuja: Perhaps we can say "bookmarking" or "reviving" instead of "accessing"? I don't know which is…
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 hiddenrevs:
repo.ui.warn(_("bookmarking hidden changeset %s\n") %
', '.join(hiddenrevs))
yujaUnsubmitted
Not Done

FYI, it loops over bookmark names with the same rev, so
hiddenrevs would have at most one element, and the second
unhidehashlikerevs() call would be unnecessary.

yuja: FYI, it loops over bookmark names with the same `rev`, so `hiddenrevs` would have at most one…
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

tests/test-directaccess.t

abort: hidden revision '28ad74' was rewritten as: 2443a0e66469! abort: hidden revision '28ad74' was rewritten as: 2443a0e66469!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg phase -r 2 $ hg phase -r 2
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
$ hg bookmarks -r 28ad74 book
bookmarking hidden changeset 28ad74487de9
$ hg bookmarks
book 2:28ad74487de9

tests/test-log.t

1:a765632148dc55d38c35c4f247c618701886cb2f 1:a765632148dc55d38c35c4f247c618701886cb2f
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
$ 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
$ 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

tests/test-obsolete.t

$ mkcommit a $ mkcommit a
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
$ 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]

tests/test-rebase-obsolete.t

$ echo b > b && hg ci -Am b $ echo b > b && hg ci -Am b
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
$ 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 .