This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1629

py3: handle keyword arguments correctly in context.py
ClosedPublic

Authored by pulkit on Dec 9 2017, 8:08 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8384553b1684: py3: handle keyword arguments correctly in context.py
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 9 2017, 8:08 PM
durin42 accepted this revision.Dec 9 2017, 9:00 PM
This revision is now accepted and ready to land.Dec 9 2017, 9:00 PM
Closed by commit rHG8384553b1684: py3: handle keyword arguments correctly in context.py (authored by pulkit). · Explain WhyDec 9 2017, 9:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)

Diff 4309

mercurial/context.py

listsubrepos=listsubrepos, badfn=badfn) listsubrepos=listsubrepos, badfn=badfn)
def diff(self, ctx2=None, match=None, **opts): def diff(self, ctx2=None, match=None, **opts):
"""Returns a diff generator for the given contexts and matcher""" """Returns a diff generator for the given contexts and matcher"""
if ctx2 is None: if ctx2 is None:
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):
return self._manifest.dirs() return self._manifest.dirs()
def hasdir(self, dir): def hasdir(self, dir):
return self._manifest.hasdir(dir) return self._manifest.hasdir(dir)