py3: handle keyword arguments correctly in context.py
authorPulkit Goyal <7895pulkit@gmail.com>
Sun, 10 Dec 2017 04:45:56 +0530
changeset 35362 8384553b1684
parent 35361 920cca6c8462
child 35363 08f28f58f863
py3: handle keyword arguments correctly in context.py Differential Revision: https://phab.mercurial-scm.org/D1629
mercurial/context.py
--- a/mercurial/context.py	Sun Dec 10 04:45:41 2017 +0530
+++ b/mercurial/context.py	Sun Dec 10 04:45:56 2017 +0530
@@ -354,7 +354,7 @@
             ctx2 = self.p1()
         if ctx2 is not None:
             ctx2 = self._repo[ctx2]
-        diffopts = patch.diffopts(self._repo.ui, opts)
+        diffopts = patch.diffopts(self._repo.ui, pycompat.byteskwargs(opts))
         return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
 
     def dirs(self):