Mercurial > hg
diff mercurial/context.py @ 38569:62249cfe02d2
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 |
line wrap: on
line diff
--- a/mercurial/context.py Sat Jun 23 15:00:16 2018 +0200 +++ b/mercurial/context.py Sat Jun 23 15:03:05 2018 +0200 @@ -30,7 +30,6 @@ error, fileset, match as matchmod, - mdiff, obsolete as obsmod, patch, pathutil, @@ -304,10 +303,7 @@ if ctx2 is not None: ctx2 = self._repo[ctx2] - if isinstance(opts, mdiff.diffopts): - diffopts = opts - else: - diffopts = patch.diffopts(self._repo.ui, opts) + diffopts = opts return patch.diff(self._repo, ctx2, self, match=match, changes=changes, opts=diffopts, losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,