# HG changeset patch # User Pierre-Yves David # Date 1434676344 25200 # Node ID 87aceaed5c69e05ce3a7944d18dde2b0f5658f0d # Parent eb044bcf342d105ede49a7e56fcb6a68a28824bd prune: use the bookmark wrapper for 3.4 compatibility diff -r eb044bcf342d -r 87aceaed5c69 hgext/evolve.py --- a/hgext/evolve.py Thu Jun 18 17:56:02 2015 -0700 +++ b/hgext/evolve.py Thu Jun 18 18:12:24 2015 -0700 @@ -897,6 +897,11 @@ return bookmarks.deactivate(repo) except AttributeError: return bookmarks.unsetcurrent(repo) +def bmactivate(repo, book): + try: + return bookmarks.activate(repo, book) + except AttributeError: + return bookmarks.setcurrent(repo, book) def bmactive(repo): try: @@ -1832,13 +1837,13 @@ # after movebookmark = bookactive and not bookmark if movebookmark: - bookmarks.deactivate(repo) + bmdeactivate(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) + bmactivate(repo, bookactive) # update bookmarks if bookmark: