This is an archive of the discontinued Mercurial Phabricator instance.

Differential D70

hiddenoverride: unhide permanently by bookmark and working parent
ClosedPublic

Authored by quark on Jul 12 2017, 9:13 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX123c1b729592: hiddenoverride: unhide permanently by bookmark and working parent
Summary

We want these behaviors:

  • Checking out an obsoleted revision makes it visible even if another revision was checked out later
  • Putting a bookmark on an obsoleted revision makes it visible even if the bookmark was removed later
  • Strip/prune could make them hidden again

This is basically a lightweight version of independent hidden.

Diff Detail

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

Event Timeline

quark created this revision.Jul 12 2017, 9:13 PM
quark added reviewers: durham, Restricted Project.Jul 12 2017, 9:14 PM
durham accepted this revision.Jul 13 2017, 1:59 PM
This revision is now accepted and ready to land.Jul 13 2017, 1:59 PM
Closed by commit rFBHGX123c1b729592: hiddenoverride: unhide permanently by bookmark and working parent (authored by quark). · Explain WhyJul 13 2017, 3:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 113

hgext3rd/fbamend/__init__.py

from mercurial import lock as lockmod from mercurial import lock as lockmod
from mercurial.i18n import _ from mercurial.i18n import _
from hgext import rebase as rebasemod from hgext import rebase as rebasemod
from . import ( from . import (
common, common,
fold, fold,
hiddenoverride,
metaedit, metaedit,
movement, movement,
prune, prune,
restack, restack,
revsets, revsets,
split, split,
unamend, unamend,
) )
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
amendopts = [ amendopts = [
('', 'rebase', None, _('rebases children after the amend')), ('', 'rebase', None, _('rebases children after the amend')),
('', 'fixup', None, _('rebase children from a previous amend')), ('', 'fixup', None, _('rebase children from a previous amend')),
] ]
def uisetup(ui): def uisetup(ui):
hiddenoverride.uisetup(ui)
prune.uisetup(ui) prune.uisetup(ui)
entry = extensions.wrapcommand(commands.table, 'commit', commit) entry = extensions.wrapcommand(commands.table, 'commit', commit)
for opt in amendopts: for opt in amendopts:
opt = (opt[0], opt[1], opt[2], "(with --amend) " + opt[3]) opt = (opt[0], opt[1], opt[2], "(with --amend) " + opt[3])
entry[1].append(opt) entry[1].append(opt)
# manual call of the decorator # manual call of the decorator
command('^amend', [ command('^amend', [

hgext3rd/fbamend/hiddenoverride.py

  • This file was added.
# hiddenoverride.py - lightweight hidden-ness override
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from mercurial import (
dispatch,
error,
extensions,
obsolete,
repoview,
)
def uisetup(ui):
extensions.wrapfunction(repoview, 'pinnedrevs', pinnedrevs)
extensions.wrapfunction(dispatch, 'runcommand', runcommand)
extensions.wrapfunction(obsolete, 'createmarkers', createmarkers)
def pinnedrevs(orig, repo):
revs = orig(repo)
nodemap = repo.changelog.nodemap
pinned = list(nodemap[n] for n in loadpinnednodes(repo) if n in nodemap)
revs.update(pinned)
return revs
def loadpinnednodes(repo):
"""yield pinned nodes that should be visible"""
if repo is None or not repo.local():
return
# the "pinned nodes" file name is "obsinhibit" for compatibility reason
content = repo.svfs.tryread('obsinhibit') or ''
nodemap = repo.unfiltered().changelog.nodemap
offset = 0
while True:
node = content[offset:offset + 20]
if not node:
break
if node in nodemap:
yield node
offset += 20
def savepinnednodes(repo, nodes):
with repo.svfs.open('obsinhibit', 'wb', atomictemp=True) as f:
f.write(''.join(nodes))
def runcommand(orig, lui, repo, cmd, fullargs, *args):
result = orig(lui, repo, cmd, fullargs, *args)
# after a command completes, make sure working copy parent and all
# bookmarks get "pinned".
if repo and repo.local():
unfi = repo.unfiltered()
wnode = None
try:
# read dirstate directly to avoid dirstate object overhead
wnode = repo.vfs('dirstate').read(20)
except Exception:
pass
tounpin = getattr(unfi, '_tounpinnodes', set())
pinned = set(loadpinnednodes(repo)) - tounpin
if wnode:
pinned.add(wnode)
pinned.update(unfi._bookmarks.values())
savepinnednodes(repo, pinned)
return result
def createmarkers(orig, repo, rels, *args, **kwargs):
# this is a way to unpin revs - precursors are unpinned
unfi = repo.unfiltered()
tounpin = getattr(unfi, '_tounpinnodes', set())
for r in rels:
try:
tounpin.add(r[0].node())
except error.RepoLookupError:
pass
unfi._tounpinnodes = tounpin
return orig(repo, rels, *args, **kwargs)

tests/test-fbamend-hiddenoverride.t

  • This file was added.
$ cat >> $HGRCPATH << EOF
> [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend
> drawdag=$RUNTESTDIR/drawdag.py
> [experimental]
> evolution = all
> EOF
$ hg init
$ hg debugdrawdag <<'EOS'
> B C # amend: B -> C
> |/
> A
> EOS
$ rm .hg/localtags
$ hg log -G -T '{rev} {desc}\n'
o 2 C
|
o 0 A
$ hg log -G -T '{rev} {desc}\n' --hidden
o 2 C
|
| x 1 B
|/
o 0 A
Changing working copy parent pins a node
$ hg update 1 --hidden -q
$ hg update 0 -q
$ hg log -G -T '{rev} {desc}\n'
o 2 C
|
| x 1 B
|/
@ 0 A
Strip/prune unpins a node
$ hg prune 1 -q
$ hg log -G -T '{rev} {desc}\n'
o 2 C
|
@ 0 A
Bookmark pins nodes even after removed
$ hg bookmark -ir 1 BOOK --hidden -q
$ hg bookmark -d BOOK -q
$ hg log -G -T '{rev} {desc}\n'
o 2 C
|
| x 1 B
|/
@ 0 A

tests/test-fbamend-restack.t

$ hg rebase --restack $ hg rebase --restack
rebasing 2:4538525df7e2 "add c" rebasing 2:4538525df7e2 "add c"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ showgraph $ showgraph
o 7 add c o 7 add c
| |
@ 4 Amended @ 4 Amended
| |
| x 1 add b
|/
o 0 add a o 0 add a
Test situation with divergence. Restack should rebase unstable children Test situation with divergence. Restack should rebase unstable children
onto the newest successor of their parent. onto the newest successor of their parent.
$ reset $ reset
$ mkcommit a $ mkcommit a
$ mkcommit b $ mkcommit b
$ mkcommit c $ mkcommit c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ showgraph $ showgraph
o 5 add c o 5 add c
| |
@ 4 successor 2 @ 4 successor 2
| |
| o 3 successor 1 | o 3 successor 1
|/ |/
| x 1 add b
|/
o 0 add a o 0 add a
Test situation with divergence due to an unamend. This should actually succeed Test situation with divergence due to an unamend. This should actually succeed
since the successor is obsolete. since the successor is obsolete.
$ reset $ reset
$ mkcommit a $ mkcommit a
$ mkcommit b $ mkcommit b
$ mkcommit c $ mkcommit c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ showgraph $ showgraph
o 10 add d o 10 add d
| |
o 9 add c o 9 add c
| |
@ 5 add b @ 5 add b
| |
| x 1 add b
|/
o 0 add a o 0 add a
Test recursive restacking -- more complex case. This test is designed to Test recursive restacking -- more complex case. This test is designed to
to check for a bug encountered if rebasing is performed naively from the to check for a bug encountered if rebasing is performed naively from the
bottom-up wherein obsolescence information for commits further up the bottom-up wherein obsolescence information for commits further up the
stack is lost upon rebasing lower levels. stack is lost upon rebasing lower levels.
$ reset $ reset
$ mkcommit a $ mkcommit a
o 19 add c o 19 add c
| |
| o 17 add f | o 17 add f
| | | |
| o 9 add e | o 9 add e
|/ |/
@ 5 add b @ 5 add b
| |
| x 1 add b
|/
o 0 add a o 0 add a

tests/test-fbamend.t

rebasing 4:01dd7a39383a "bar" rebasing 4:01dd7a39383a "bar"
$ hg log -G -T '{rev} {node|short} {desc} {bookmarks}\n' $ hg log -G -T '{rev} {node|short} {desc} {bookmarks}\n'
o 8 9752120dcffe bar o 8 9752120dcffe bar
| |
o 7 bc3b6a46cdb4 commit --amend message o 7 bc3b6a46cdb4 commit --amend message
| |
@ 6 3a4d2824efc1 message from exec @ 6 3a4d2824efc1 message from exec
| |
| x 2 048e86baa19d message from exec
|/
| o 1 3f6197b00eba extra commit to test multiple heads | o 1 3f6197b00eba extra commit to test multiple heads
|/ |/
o 0 cb9a9f314b8b a o 0 cb9a9f314b8b a
$ echo "cc" > cc $ echo "cc" > cc
$ hg add cc $ hg add cc
$ hg amend --rebase --traceback $ hg amend --rebase --traceback
rebasing the children of 1c16dd8e35d2.preamend rebasing the children of 1c16dd8e35d2.preamend