Mercurial > hg

diff mercurial/patch.py @ 31631:a7acda2de4b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 26 Mar 2017 20:58:21 +0530
parents 451c980a8b57
children 6c80f985a13c
line wrap: on
line diff
--- a/mercurial/patch.py	Sun Mar 26 20:54:50 2017 +0530
+++ b/mercurial/patch.py	Sun Mar 26 20:58:21 2017 +0530
@@ -2213,7 +2213,7 @@
         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):