Mercurial > hg-stable

changeset 50972:206d7fad2a1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugpickmergetool: migrate `opts` to native kwargs
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 21 Aug 2023 17:31:53 -0400
parents 1e2be2c9a74d
children a0fcdcc53618
files mercurial/debugcommands.py
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Mon Aug 21 17:29:56 2023 -0400
+++ b/mercurial/debugcommands.py	Mon Aug 21 17:31:53 2023 -0400
@@ -3008,11 +3008,10 @@
     information, even with --debug. In such case, information above is
     useful to know why a merge tool is chosen.
     """
-    opts = pycompat.byteskwargs(opts)
     overrides = {}
-    if opts[b'tool']:
-        overrides[(b'ui', b'forcemerge')] = opts[b'tool']
-        ui.notenoi18n(b'with --tool %r\n' % (pycompat.bytestr(opts[b'tool'])))
+    if opts['tool']:
+        overrides[(b'ui', b'forcemerge')] = opts['tool']
+        ui.notenoi18n(b'with --tool %r\n' % (pycompat.bytestr(opts['tool'])))
 
     with ui.configoverride(overrides, b'debugmergepatterns'):
         hgmerge = encoding.environ.get(b"HGMERGE")
@@ -3022,9 +3021,9 @@
         if uimerge:
             ui.notenoi18n(b'with ui.merge=%r\n' % (pycompat.bytestr(uimerge)))
 
-        ctx = scmutil.revsingle(repo, opts.get(b'rev'))
-        m = scmutil.match(ctx, pats, opts)
-        changedelete = opts[b'changedelete']
+        ctx = scmutil.revsingle(repo, opts.get('rev'))
+        m = scmutil.match(ctx, pats, pycompat.byteskwargs(opts))
+        changedelete = opts['changedelete']
         for path in ctx.walk(m):
             fctx = ctx[path]
             with ui.silent(