| durin42 |
| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
| 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) | ||||