mercurial/context.py
changeset 35353 8384553b1684
parent 35327 777cb4497d8d
child 35400 8a0cac20a1ad
equal deleted inserted replaced
35352:920cca6c8462 35353:8384553b1684
   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