# HG changeset patch # User Anton Shestakov # Date 1699037065 10800 # Node ID ff2ba083f8b47cd8383b2ae192d1eb9565b0d758 # Parent c7083ba82d5fdf864f08cb505e9b4cb85c9d05a2 topic: drop compatibility for branchinfo(..., changelog=None) for hg 4.8 diff -r c7083ba82d5f -r ff2ba083f8b4 hgext3rd/topic/discovery.py --- a/hgext3rd/topic/discovery.py Fri Nov 03 15:20:53 2023 -0300 +++ b/hgext3rd/topic/discovery.py Fri Nov 03 15:44:25 2023 -0300 @@ -325,11 +325,9 @@ caps.append(b'topics-namespaces') return caps -# **kwargs is for accommodating an optional changelog argument -# hg <= 4.8 (5e5c8f2a1eb5) -def wrapbranchinfo(orig, self, rev, **kwargs): +def wrapbranchinfo(orig, self, rev): # NOTE: orig can be either branchinfo() or _branchinfo()! - b, close = orig(self, rev, **kwargs) + b, close = orig(self, rev) if common.hastopicext(self._repo): if self._repo.ui.configbool(b'_internal', b'tns-disable-fqbn'): # the config option prevents this function from doing anything, @@ -344,16 +342,14 @@ b = ctx.fqbn() return b, close -# **kwargs is for accommodating an optional changelog argument -# hg <= 4.8 (5e5c8f2a1eb5) -def wrapslowbranchinfo(orig, self, rev, **kwargs): +def wrapslowbranchinfo(orig, self, rev): if self.branchinfo == self._branchinfo: # _branchinfo() gets called directly and needs to do the conversion - return wrapbranchinfo(orig, self, rev, **kwargs) + return wrapbranchinfo(orig, self, rev) else: # _branchinfo() gets called through branchinfo(), the latter will need # to do the conversion - return orig(self, rev, **kwargs) + return orig(self, rev) def wrapaddpartrevbranchcache(orig, repo, bundler, outgoing): """making sure we send rev-branch-cache that only has bare branches"""