equal
deleted
inserted
replaced
254 if ctx2 is None: |
254 if ctx2 is None: |
255 ctx2 = self.p1() |
255 ctx2 = self.p1() |
256 if ctx2 is not None: |
256 if ctx2 is not None: |
257 ctx2 = self._repo[ctx2] |
257 ctx2 = self._repo[ctx2] |
258 diffopts = patch.diffopts(self._repo.ui, opts) |
258 diffopts = patch.diffopts(self._repo.ui, opts) |
259 return patch.diff(self._repo, ctx2.node(), self.node(), |
259 return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) |
260 match=match, opts=diffopts) |
|
261 |
260 |
262 @propertycache |
261 @propertycache |
263 def _dirs(self): |
262 def _dirs(self): |
264 return scmutil.dirs(self._manifest) |
263 return scmutil.dirs(self._manifest) |
265 |
264 |