diff hgext3rd/topic/__init__.py @ 7038:395798a9eb1a mercurial-5.9

test-compat: merge mercurial-6.0 into mercurial-5.9
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 10 Mar 2025 17:42:43 +0400
parents e45b2d251704 270dcc61b9f0
children
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Wed Feb 05 14:55:23 2025 +0100
+++ b/hgext3rd/topic/__init__.py	Mon Mar 10 17:42:43 2025 +0400
@@ -238,9 +238,9 @@
               b'log.topic': b'green_background',
               }
 
-__version__ = b'1.1.7.dev0'
+__version__ = b'1.1.8.dev0'
 
-testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9'
+testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0'
 minimumhgversion = b'4.9'
 buglink = b'https://bz.mercurial-scm.org/'
 
@@ -719,8 +719,8 @@
             self._topic_namespaces = namespaces
             return namespaces
 
-        def wlock(self, wait=True):
-            wlock = super(topicrepo, self).wlock(wait=wait)
+        def wlock(self, wait=True, **kwargs):
+            wlock = super(topicrepo, self).wlock(wait=wait, **kwargs)
             # we should definitely drop this at some point, but it depends on
             # our own release schedule, not core's, so here's hg 1.0
             # hg <= 1.0 (cfa08c88a5c4)