Show More
@@ -294,14 +294,19 b' class basectx(object):' | |||||
294 | auditor=r.nofsauditor, ctx=self, |
|
294 | auditor=r.nofsauditor, ctx=self, | |
295 | listsubrepos=listsubrepos, badfn=badfn) |
|
295 | listsubrepos=listsubrepos, badfn=badfn) | |
296 |
|
296 | |||
297 |
def diff(self, ctx2=None, match=None, opts=None |
|
297 | def diff(self, ctx2=None, match=None, changes=None, opts=None, | |
|
298 | losedatafn=None, prefix='', relroot='', copy=None, | |||
|
299 | hunksfilterfn=None): | |||
298 | """Returns a diff generator for the given contexts and matcher""" |
|
300 | """Returns a diff generator for the given contexts and matcher""" | |
299 | if ctx2 is None: |
|
301 | if ctx2 is None: | |
300 | ctx2 = self.p1() |
|
302 | ctx2 = self.p1() | |
301 | if ctx2 is not None: |
|
303 | if ctx2 is not None: | |
302 | ctx2 = self._repo[ctx2] |
|
304 | ctx2 = self._repo[ctx2] | |
303 | diffopts = patch.diffopts(self._repo.ui, opts) |
|
305 | diffopts = patch.diffopts(self._repo.ui, opts) | |
304 |
return patch.diff(self._repo, ctx2, self, match=match, |
|
306 | return patch.diff(self._repo, ctx2, self, match=match, changes=changes, | |
|
307 | opts=diffopts, losedatafn=losedatafn, prefix=prefix, | |||
|
308 | relroot=relroot, copy=copy, | |||
|
309 | hunksfilterfn=hunksfilterfn) | |||
305 |
|
310 | |||
306 | def dirs(self): |
|
311 | def dirs(self): | |
307 | return self._manifest.dirs() |
|
312 | return self._manifest.dirs() |
General Comments 0
You need to be logged in to leave comments.
Login now