# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1675694279 -14400
# Node ID 0baef8dde96b96ba4c12f413a60c2b7fffe7a32d
# Parent  a87abe69a2f85bd6b5c54e9d4e0796654f0d8daf# Parent  9b5660737b528370f8da6b7f604ef7d894fe96b5
branching: merge into stable in preparation for release

diff -r 9b5660737b52 -r 0baef8dde96b hgext3rd/topic/server.py
--- a/hgext3rd/topic/server.py	Sun Feb 05 19:55:48 2023 +0400
+++ b/hgext3rd/topic/server.py	Mon Feb 06 18:37:59 2023 +0400
@@ -3,6 +3,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 from mercurial import (
+    branchmap,
     extensions,
     repoview,
     wireprototypes,
@@ -10,15 +11,6 @@
     wireprotov1server,
 )
 
-try:
-    from mercurial.utils import (
-        repoviewutil,
-    )
-    repoviewutil.subsettable
-except (AttributeError, ImportError):
-    # hg <= 4.9 (caebe5e7f4bd)
-    from mercurial import branchmap as repoviewutil
-
 from . import (
     common,
     constants,
@@ -102,5 +94,6 @@
 
     if FILTERNAME not in repoview.filtertable:
         repoview.filtertable[FILTERNAME] = computeunservedtopic
-        repoviewutil.subsettable[FILTERNAME] = b'immutable'
-        repoviewutil.subsettable[b'served'] = FILTERNAME
+        # hg <= 4.9 (caebe5e7f4bd)
+        branchmap.subsettable[FILTERNAME] = b'immutable'
+        branchmap.subsettable[b'served'] = FILTERNAME
diff -r 9b5660737b52 -r 0baef8dde96b hgext3rd/topic/topicmap.py
--- a/hgext3rd/topic/topicmap.py	Sun Feb 05 19:55:48 2023 +0400
+++ b/hgext3rd/topic/topicmap.py	Mon Feb 06 18:37:59 2023 +0400
@@ -45,6 +45,7 @@
 def _setuptopicfilter(ui):
     """extend the filter related mapping with topic related one"""
     funcmap = repoview.filtertable
+    # hg <= 4.9 (caebe5e7f4bd)
     partialmap = branchmap.subsettable
 
     # filter level not affected by topic that we should not override