[PATCH evolve-ext-V2] prune: with active bookmark should stay active
Laurent Charignon
lcharignon at fb.com
Tue May 19 16:59:59 UTC 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1431995078 25200
# Mon May 18 17:24:38 2015 -0700
# Node ID d171ff2815345e7d2dc0cca88220750aca5bb628
# Parent 0e2eb196923ab8f2735dfebae018ef37e6ef1808
prune: with active bookmark should stay active
hg prune with an active bookmark was deactivating the bookmark after the prune.
This patch makes sure that if a bookmark was active before a "prune" operation
(except prune -B) then the bookmark stays activate afterwards.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1902,8 +1902,19 @@
repo.dirstate.rebuild(newnode.node(), newnode.manifest(), changedfiles)
repo.dirstate.write()
else:
+ bookactive = bmactive(repo)
+ # Active bookmark that we don't want to delete (with -B option)
+ # we deactivate and move it before the update and reactivate it
+ # after
+ movebookmark = bookactive and not bookmark
+ if movebookmark:
+ bookmarks.deactivate(repo)
+ repo._bookmarks[bookactive] = newnode.node()
+ repo._bookmarks.write()
commands.update(ui, repo, newnode.rev())
ui.status(_('working directory now at %s\n') % newnode)
+ if movebookmark:
+ bookmarks.activate(repo, bookactive)
# update bookmarks
if bookmark:
_deletebookmark(ui, marks, bookmark)
diff --git a/tests/test-prune.t b/tests/test-prune.t
--- a/tests/test-prune.t
+++ b/tests/test-prune.t
@@ -39,9 +39,11 @@
$ hg prune --user blah --date '1979-12-15' .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- (leaving bookmark BABAR)
working directory now at 47d2a3944de8
1 changesets pruned
+ $ hg bookmark
+ * BABAR 3:47d2a3944de8
+ $ hg bookmark BABAR -r 0 -f
$ hg debugobsolete
9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'user': 'blah'}
More information about the Mercurial-devel
mailing list