Mercurial > hg-stable

changeset 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 f65e6095c5ac
children 2523c0200df4
files mercurial/context.py
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
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,