# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1707334304 10800
# Node ID c329bd4beaa64a219ed20e52788f7e57768a677e
# Parent  e0712a00154e5e62718122b26b3555a8efba67f7# Parent  4c6d35f924697c41e6a9fb5ac7019d6a0527559c
branching: merge with stable

diff -r e0712a00154e -r c329bd4beaa6 hgext3rd/topic/compat.py
--- a/hgext3rd/topic/compat.py	Wed Feb 07 14:57:11 2024 -0300
+++ b/hgext3rd/topic/compat.py	Wed Feb 07 16:31:44 2024 -0300
@@ -59,6 +59,8 @@
             def _orig(repo, node, branch, bheads=None, tip=None, **opts):
                 opts = pycompat.byteskwargs(opts)
                 return orig(repo, node, branch, bheads=bheads, tip=tip, opts=opts)
+            if opts is None:
+                opts = {}
             opts = pycompat.strkwargs(opts)
             return overridefn(_orig, repo, node, branch, bheads=bheads, tip=tip, **opts)
         extensions.wrapfunction(cmdutil, 'commitstatus', _override)