--- a/mercurial/context.py Tue May 22 15:02:52 2018 +0200
+++ b/mercurial/context.py Wed May 23 15:31:40 2018 +0200
@@ -294,14 +294,19 @@
auditor=r.nofsauditor, ctx=self,
listsubrepos=listsubrepos, badfn=badfn)
- def diff(self, ctx2=None, match=None, opts=None):
+ def diff(self, ctx2=None, match=None, changes=None, opts=None,
+ losedatafn=None, prefix='', relroot='', copy=None,
+ hunksfilterfn=None):
"""Returns a diff generator for the given contexts and matcher"""
if ctx2 is None:
ctx2 = self.p1()
if ctx2 is not None:
ctx2 = self._repo[ctx2]
diffopts = patch.diffopts(self._repo.ui, opts)
- return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
+ return patch.diff(self._repo, ctx2, self, match=match, changes=changes,
+ opts=diffopts, losedatafn=losedatafn, prefix=prefix,
+ relroot=relroot, copy=copy,
+ hunksfilterfn=hunksfilterfn)
def dirs(self):
return self._manifest.dirs()