Comments
Patch
@@ -22,7 +22,6 @@ from mercurial import error
from mercurial import scmutil
from mercurial import commands
from mercurial import lock as lockmod
-from mercurial import bookmarks
from mercurial import util
from mercurial.i18n import _
@@ -73,13 +72,6 @@ def _update(orig, ui, repo, *args, **kwa
finally:
lockmod.release(wlock)
-def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
- """ Add inhibition markers to every obsolete bookmarks """
- repo = bkmstoreinst._repo
- bkmstorenodes = [repo[v].node() for v in bkmstoreinst.values()]
- _inhibitmarkers(repo, bkmstorenodes)
- return orig(bkmstoreinst, *args, **kwargs)
-
def _bookmark(orig, ui, repo, *bookmarks, **opts):
""" Add a -D option to the bookmark command, map it to prune -B """
haspruneopt = opts.get('prune', False)
@@ -228,10 +220,6 @@ def extsetup(ui):
# wrap update to make sure that no obsolete commit is visible after an
# update
extensions.wrapcommand(commands.table, 'update', _update)
- # There are two ways to save bookmark changes during a transation, we
- # wrap both to add inhibition markers.
- extensions.wrapfunction(bookmarks.bmstore, 'recordchange', _bookmarkchanged)
- extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged)
# Add bookmark -D option
entry = extensions.wrapcommand(commands.table, 'bookmark', _bookmark)
entry[1].append(('D','prune',None,
@@ -686,7 +686,7 @@ check that pruning and inhibited node do
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
- (run 'hg heads' to see heads, 'hg merge' to merge)
+ (run 'hg heads .' to see heads, 'hg merge' to merge)
Only allow direct access and check that evolve works like before
(also disable evolve commands to avoid hint about using evolve)