[PATCH evolve-ext] bookmarks: update to use new readactive api
Ryan McElroy
rmcelroy at fb.com
Thu May 7 20:21:40 UTC 2015
# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1431030011 25200
# Thu May 07 13:20:11 2015 -0700
# Branch stable
# Node ID f46022cc0652894e6ae8808f1207a76d88abf6cc
# Parent 1218ad94a351b8294a4627a0ec9a27b68206c5b9
bookmarks: update to use new readactive api
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -864,7 +864,7 @@ def _bookmarksupdater(repo, oldid):
"""Return a callable update(newid) updating the current bookmark
and bookmarks bound to oldid to newid.
"""
- bm = bookmarks.readcurrent(repo)
+ bm = bookmarks.readactive(repo)
def updatebookmarks(newid):
dirty = False
if bm:
@@ -1606,7 +1606,7 @@ def cmdprevious(ui, repo, **opts):
displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
if len(parents) == 1:
p = parents[0]
- bm = bookmarks.readcurrent(repo)
+ bm = bookmarks.readactive(repo)
shouldmove = opts.get('move_bookmark') and bm is not None
ret = hg.update(repo, p.rev())
if not ret:
@@ -1641,7 +1641,7 @@ def cmdnext(ui, repo, **opts):
return 1
if len(children) == 1:
c = children[0]
- bm = bookmarks.readcurrent(repo)
+ bm = bookmarks.readactive(repo)
shouldmove = opts.get('move_bookmark') and bm is not None
ret = hg.update(repo, c.rev())
if not ret:
More information about the Mercurial-devel
mailing list