cmdutil: migrate `opts` on commitstatus() to native kwargs

mercurial/cmdutil.py

@@ -3329,9 +3329,7 b' def buildcommittext(repo, ctx, subs, ext'
     return b"\n".join(edittext)
 
 
-def commitstatus(repo, node, branch, bheads=None, tip=None, opts=None):
-    if opts is None:
-        opts = {}
+def commitstatus(repo, node, branch, bheads=None, tip=None, **opts):
     ctx = repo[node]
     parents = ctx.parents()
 
@@ -3341,7 +3339,7 b' def commitstatus(repo, node, branch, bhe'
         # for most instances
         repo.ui.warn(_(b"warning: commit already existed in the repository!\n"))
     elif (
-        not opts.get(b'amend')
+        not opts.get('amend')
         and bheads
         and node not in bheads
         and not any(
@@ -3378,7 +3376,7 b' def commitstatus(repo, node, branch, bhe'
         #
         # H H  n  head merge: head count decreases
 
-    if not opts.get(b'close_branch'):
+    if not opts.get('close_branch'):
         for r in parents:
             if r.closesbranch() and r.branch() == branch:
                 repo.ui.status(

mercurial/commands.py

@@ -2175,7 +2175,6 b' def _docommit(ui, repo, *pats, **opts):'
             cmdutil.checkunfinished(repo)
 
         node = cmdutil.amend(ui, repo, old, extra, pats, opts)
-        opts = pycompat.byteskwargs(opts)
         if node == old.node():
             ui.status(_(b"nothing changed\n"))
             return 1
@@ -2206,11 +2205,14 b' def _docommit(ui, repo, *pats, **opts):'
                         extra=extra,
                     )
 
-        opts = pycompat.byteskwargs(opts)
-        node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
+        node = cmdutil.commit(
+            ui, repo, commitfunc, pats, pycompat.byteskwargs(opts)
+        )
 
         if not node:
-            stat = cmdutil.postcommitstatus(repo, pats, opts)
+            stat = cmdutil.postcommitstatus(
+                repo, pats, pycompat.byteskwargs(opts)
+            )
             if stat.deleted:
                 ui.status(
                     _(
@@ -2223,7 +2225,7 b' def _docommit(ui, repo, *pats, **opts):'
                 ui.status(_(b"nothing changed\n"))
             return 1
 
-    cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
+    cmdutil.commitstatus(repo, node, branch, bheads, tip, **opts)
 
     if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
         status(
@@ -2234,7 +2236,7 b' def _docommit(ui, repo, *pats, **opts):'
             removed=True,
             deleted=True,
             unknown=True,
-            subrepos=opts.get(b'subrepos'),
+            subrepos=opts.get('subrepos'),
         )