changeset 6698:c329bd4beaa6

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 07 Feb 2024 16:31:44 -0300
parents e0712a00154e (current diff) 4c6d35f92469 (diff)
children a7d94f235488
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)