Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 38582:7f4bf8110150
context: remove unneeded alias of diffopts
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 06 Jul 2018 21:28:02 +0900 |
parents | 62249cfe02d2 |
children | 91618801d5c3 |
comparison
equal
deleted
inserted
replaced
38581:6467286b829c | 38582:7f4bf8110150 |
---|---|
300 """Returns a diff generator for the given contexts and matcher""" | 300 """Returns a diff generator for the given contexts and matcher""" |
301 if ctx2 is None: | 301 if ctx2 is None: |
302 ctx2 = self.p1() | 302 ctx2 = self.p1() |
303 if ctx2 is not None: | 303 if ctx2 is not None: |
304 ctx2 = self._repo[ctx2] | 304 ctx2 = self._repo[ctx2] |
305 | |
306 diffopts = opts | |
307 return patch.diff(self._repo, ctx2, self, match=match, changes=changes, | 305 return patch.diff(self._repo, ctx2, self, match=match, changes=changes, |
308 opts=diffopts, losedatafn=losedatafn, prefix=prefix, | 306 opts=opts, losedatafn=losedatafn, prefix=prefix, |
309 relroot=relroot, copy=copy, | 307 relroot=relroot, copy=copy, |
310 hunksfilterfn=hunksfilterfn) | 308 hunksfilterfn=hunksfilterfn) |
311 | 309 |
312 def dirs(self): | 310 def dirs(self): |
313 return self._manifest.dirs() | 311 return self._manifest.dirs() |