[Updated] D10880: amend: work mostly with str-type **opts for simplicity

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG6ce89165eaa0: amend: work mostly with str-type **opts for simplicity (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10880?vs=28601&id=28631

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10880/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10880

AFFECTED FILES
  hgext/amend.py

CHANGE DETAILS

diff --git a/hgext/amend.py b/hgext/amend.py
--- a/hgext/amend.py
+++ b/hgext/amend.py
@@ -66,11 +66,10 @@
 
     See :hg:`help commit` for more details.
     """
-    opts = pycompat.byteskwargs(opts)
-    cmdutil.checknotesize(ui, opts)
+    cmdutil.checknotesize(ui, pycompat.byteskwargs(opts))
 
     with repo.wlock(), repo.lock():
-        if not opts.get(b'logfile'):
-            opts[b'message'] = opts.get(b'message') or repo[b'.'].description()
-        opts[b'amend'] = True
-        return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))
+        if not opts.get('logfile'):
+            opts['message'] = opts.get('message') or repo[b'.'].description()
+        opts['amend'] = True
+        return commands._docommit(ui, repo, *pats, **opts)



To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210621/a17b751d/attachment-0002.html>