Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/context.py @ 38570:62249cfe02d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: no longer accept diff options as dictionnary Since we already broke the API earlier in this stack, there are no point to introducing a new deprecation warning.
author Boris Feld <boris.feld@octobus.net>
date Sat, 23 Jun 2018 15:03:05 +0200
parents c1a7bbf9984d
children 7f4bf8110150
comparison
equal deleted inserted replaced
38569:f65e6095c5ac 38570:62249cfe02d2
28 dagop, 28 dagop,
29 encoding, 29 encoding,
30 error, 30 error,
31 fileset, 31 fileset,
32 match as matchmod, 32 match as matchmod,
33 mdiff,
34 obsolete as obsmod, 33 obsolete as obsmod,
35 patch, 34 patch,
36 pathutil, 35 pathutil,
37 phases, 36 phases,
38 pycompat, 37 pycompat,
302 if ctx2 is None: 301 if ctx2 is None:
303 ctx2 = self.p1() 302 ctx2 = self.p1()
304 if ctx2 is not None: 303 if ctx2 is not None:
305 ctx2 = self._repo[ctx2] 304 ctx2 = self._repo[ctx2]
306 305
307 if isinstance(opts, mdiff.diffopts): 306 diffopts = opts
308 diffopts = opts
309 else:
310 diffopts = patch.diffopts(self._repo.ui, opts)
311 return patch.diff(self._repo, ctx2, self, match=match, changes=changes, 307 return patch.diff(self._repo, ctx2, self, match=match, changes=changes,
312 opts=diffopts, losedatafn=losedatafn, prefix=prefix, 308 opts=diffopts, losedatafn=losedatafn, prefix=prefix,
313 relroot=relroot, copy=copy, 309 relroot=relroot, copy=copy,
314 hunksfilterfn=hunksfilterfn) 310 hunksfilterfn=hunksfilterfn)
315 311