D1629: py3: handle keyword arguments correctly in context.py
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Dec 9 21:06:40 EST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8384553b1684: py3: handle keyword arguments correctly in context.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1629?vs=4296&id=4309
REVISION DETAIL
https://phab.mercurial-scm.org/D1629
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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):
To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list