equal
deleted
inserted
replaced
352 """Returns a diff generator for the given contexts and matcher""" |
352 """Returns a diff generator for the given contexts and matcher""" |
353 if ctx2 is None: |
353 if ctx2 is None: |
354 ctx2 = self.p1() |
354 ctx2 = self.p1() |
355 if ctx2 is not None: |
355 if ctx2 is not None: |
356 ctx2 = self._repo[ctx2] |
356 ctx2 = self._repo[ctx2] |
357 diffopts = patch.diffopts(self._repo.ui, opts) |
357 diffopts = patch.diffopts(self._repo.ui, pycompat.byteskwargs(opts)) |
358 return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) |
358 return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) |
359 |
359 |
360 def dirs(self): |
360 def dirs(self): |
361 return self._manifest.dirs() |
361 return self._manifest.dirs() |
362 |
362 |