# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1587603990 -7200
# Node ID 426f2800b793bac1447ead24c5a823a3b410247a
# Parent  4da1d21231ae7cf6e7794f95e138d698395d3cb1# Parent  a828c7a7ace1858fac9b55cd20c0bb4430ecd19a
branching: merge with stable

diff -r 4da1d21231ae -r 426f2800b793 MANIFEST.in
--- a/MANIFEST.in	Wed Apr 15 21:52:29 2020 +0800
+++ b/MANIFEST.in	Thu Apr 23 03:06:30 2020 +0200
@@ -1,31 +1,11 @@
-prune contrib
-prune debian
-prune .gitlab
-prune hgext3rd/evolve/hack
-
-exclude .hg-format-source
-exclude .gitlab-ci.yml
-exclude hgext3rd/evolve/legacy.py
-exclude Makefile
-exclude tests/test-drop.t
-exclude tests/test-inhibit.t
-exclude tests/test-oldconvert.t
 include CHANGELOG
 include COPYING
-include hgext3rd/__init__.py
-include hgext3rd/evolve/*.py
-include hgext3rd/evolve/thirdparty/*.py
-include hgext3rd/topic/*.py
 include hgext3rd/topic/README
 include MANIFEST.in
 include README
 include setup.py
-include tests/*.py
-include tests/*.sh
-include tests/testlib/*.sh
-include tests/*.t
+recursive-include tests *.py *.sh *.t
 
-exclude docs/tutorial/.netlify
 include docs/makefile
 include docs/*.py
 include docs/README
@@ -35,3 +15,17 @@
 include docs/tutorial/standalone.html
 recursive-include docs/figures *.svg *.png
 recursive-include docs/tutorial *.css *.js *.md *.py *.rst *.sh *.t
+
+exclude docs/tutorial/.netlify
+exclude .gitlab-ci.yml
+exclude ./hgext3rd/evolve/legacy.py
+exclude .hg-format-source
+exclude Makefile
+exclude tests/test-drop.t
+exclude tests/test-inhibit.t
+exclude tests/test-oldconvert.t
+
+prune contrib
+prune debian
+prune .gitlab
+prune hgext3rd/evolve/hack
diff -r 4da1d21231ae -r 426f2800b793 debian/changelog
--- a/debian/changelog	Wed Apr 15 21:52:29 2020 +0800
+++ b/debian/changelog	Thu Apr 23 03:06:30 2020 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (9.3.1-2) unstable; urgency=medium
+
+  * update minimum required version of mercurial in debian/control
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Thu, 16 Apr 2020 18:30:35 +0800
+
 mercurial-evolve (9.3.1-1) unstable; urgency=medium
 
   * new upstream release
diff -r 4da1d21231ae -r 426f2800b793 debian/control
--- a/debian/control	Wed Apr 15 21:52:29 2020 +0800
+++ b/debian/control	Thu Apr 23 03:06:30 2020 +0200
@@ -7,7 +7,7 @@
  Pierre-Yves David <pierre-yves.david@logilab.fr>,
 Standards-Version: 3.9.3
 Build-Depends:
- mercurial (>= 4.5),
+ mercurial (>= 4.6),
  python,
  python3,
  debhelper (>= 10),
@@ -28,7 +28,7 @@
  ${python3:Depends},
  ${misc:Depends},
  ${sphinxdoc:Depends},
- mercurial (>= 4.5),
+ mercurial (>= 4.6),
 Built-Using: ${sphinxdoc:Built-Using}
 Description: evolve extension for Mercurial
  This package provides the experimental "evolve" extension for the Mercurial
diff -r 4da1d21231ae -r 426f2800b793 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Wed Apr 15 21:52:29 2020 +0800
+++ b/hgext3rd/topic/__init__.py	Thu Apr 23 03:06:30 2020 +0200
@@ -406,9 +406,14 @@
         def _restrictcapabilities(self, caps):
             caps = super(topicrepo, self)._restrictcapabilities(caps)
             caps.add(b'topics')
-            if self.ui.configbool(b'experimental',
-                                  b'topic.publish-bare-branch'):
-                caps.add(b'ext-topics-publish=auto')
+            if self.ui.configbool(b'phases', b'publish'):
+                mode = b'all'
+            elif self.ui.configbool(b'experimental',
+                                    b'topic.publish-bare-branch'):
+                mode = b'auto'
+            else:
+                mode = b'none'
+            caps.add(b'ext-topics-publish=%s' % mode)
             return caps
 
         def commit(self, *args, **kwargs):
diff -r 4da1d21231ae -r 426f2800b793 hgext3rd/topic/revset.py
--- a/hgext3rd/topic/revset.py	Wed Apr 15 21:52:29 2020 +0800
+++ b/hgext3rd/topic/revset.py	Thu Apr 23 03:06:30 2020 +0200
@@ -165,7 +165,10 @@
 
     def topicrel(repo, subset, x, *args):
         subset &= topicset(repo, subset, x)
-        return revset.generationsrel(repo, subset, x, *args)
+        # not using revset.generationssubrel directly because it was renamed
+        # hg <= 5.3 (8859de3e83dc)
+        generationssubrel = revset.subscriptrelations[b'generations']
+        return generationssubrel(repo, subset, x, *args)
 
     revset.subscriptrelations[b'topic'] = topicrel
     revset.subscriptrelations[b't'] = topicrel