# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1559639324 -7200
# Node ID b62ed7c69561be42357541d4aa217a1abd0ee7f2
# Parent  4d2f8c99f23a836a13fcf8d00a4fe66d655246b4# Parent  89c1b739fabe0ed3bcce54acf03d9b8656c24758
branching: merge with stable

diff -r 89c1b739fabe -r b62ed7c69561 debian/rules
--- a/debian/rules	Tue May 28 16:46:18 2019 +0800
+++ b/debian/rules	Tue Jun 04 11:08:44 2019 +0200
@@ -7,7 +7,7 @@
 override_dh_auto_build:
 	dh_auto_build
 	# Workaround for Sphinx in Debian Buster defaulting to Python 3
-	SPHINXBUILD=/usr/share/sphinx/scripts/python2/sphinx-build $(MAKE) -C docs
+	SPHINXBUILD="python -m sphinx -bhtml" $(MAKE) -C docs
 
 hgsrc_defined:
 	# Use "! -z" instead of "-n", because "-n" without arguments is true
diff -r 89c1b739fabe -r b62ed7c69561 hgext3rd/evolve/templatekw.py
--- a/hgext3rd/evolve/templatekw.py	Tue May 28 16:46:18 2019 +0800
+++ b/hgext3rd/evolve/templatekw.py	Tue Jun 04 11:08:44 2019 +0200
@@ -54,14 +54,24 @@
         return templatekw.showlist('trouble', ctx.instabilities(), args,
                                    plural='troubles')
 
-templatekw.keywords["precursors"] = templatekw.showpredecessors
+_sp = templatekw.showpredecessors
+def showprecursors(context, mapping):
+    return _sp(context, mapping)
+showprecursors.__doc__ = _sp._origdoc
+_tk = templatekw.templatekeyword("precursors", requires=_sp._requires)
+_tk(showprecursors)
 
 def closestsuccessors(repo, nodeid):
     """ returns the closest visible successors sets instead.
     """
     return directsuccessorssets(repo, nodeid)
 
-templatekw.keywords["successors"] = templatekw.showsuccessorssets
+_ss = templatekw.showsuccessorssets
+def showsuccessors(context, mapping):
+    return _ss(context, mapping)
+showsuccessors.__doc__ = _ss._origdoc
+_tk = templatekw.templatekeyword("successors", requires=_ss._requires)
+_tk(showsuccessors)
 
 def _getusername(ui):
     """the default username in the config or None"""
diff -r 89c1b739fabe -r b62ed7c69561 tests/test-evolve-orphan-corner-cases.t
diff -r 89c1b739fabe -r b62ed7c69561 tests/test-evolve-public-content-divergent-corner-cases.t
diff -r 89c1b739fabe -r b62ed7c69561 tests/test-evolve-public-content-divergent-discard.t
diff -r 89c1b739fabe -r b62ed7c69561 tests/test-evolve-public-content-divergent-main.t