facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

py3: handle keyword arguments correctly in context.py

Browse Source 
Differential Revision: https://phab.mercurial-scm.org/D1629
This commit is contained in:
Pulkit Goyal 2017-12-10 04:45:56 +05:30
parent b642a8adf8
commit 56f56fc9fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/context.py
View File

@ -354,7 +354,7 @@ class basectx(object):
ctx2 = self.p1() ctx2 = self.p1()
if ctx2 is not None: if ctx2 is not None:
ctx2 = self._repo[ctx2] 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) return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
def dirs(self): def dirs(self):