diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str

mercurial/mdiff.py

@@ -17,6 +17,7 b' from . import ('
     bdiff,
     error,
     mpatch,
+    pycompat,
     util,
 )
 
@@ -61,6 +62,7 b' class diffopts(object):'
         }
 
     def __init__(self, **opts):
+        opts = pycompat.byteskwargs(opts)
         for k in self.defaults.keys():
             v = opts.get(k)
             if v is None:

mercurial/patch.py

@@ -2213,7 +2213,7 b' def difffeatureopts(ui, opts=None, untru'
         buildopts['nobinary'] = get('nobinary', forceplain=False)
         buildopts['noprefix'] = get('noprefix', forceplain=False)
 
-    return mdiff.diffopts(**buildopts)
+    return mdiff.diffopts(**pycompat.strkwargs(buildopts))
 
 def diff(repo, node1=None, node2=None, match=None, changes=None,
          opts=None, losedatafn=None, prefix='', relroot='', copy=None):