comparison hgext/evolve.py @ 1342:16017e1bb2a1 stable

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.

1340:f455ce2a3587

            while newnode.obsolete():
                newnode = newnode.parents()[0]

        if newnode.node() != wdp.node():
            commands.update(ui, repo, newnode.rev())
            ui.status(_('working directory now at %s\n') % newnode)
        # update bookmarks
        if bookmark:
            _deletebookmark(ui, marks, bookmark)
        for ctx in repo.unfiltered().set('bookmark() and %ld', precs):
            # used to be:

1342:16017e1bb2a1

            while newnode.obsolete():
                newnode = newnode.parents()[0]

        if newnode.node() != wdp.node():
            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)
        for ctx in repo.unfiltered().set('bookmark() and %ld', precs):
            # used to be: