diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -1558,10 +1558,12 @@ def changedfiles(ui, repo, patchpath, st class GitDiffRequired(Exception): pass -def diffopts(ui, opts=None, untrusted=False, section='diff'): +def diffallopts(ui, opts=None, untrusted=False, section='diff'): '''return diffopts with all features supported and parsed''' return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section) +diffopts = diffallopts + def difffeatureopts(ui, opts=None, untrusted=False, section='diff'): '''return diffopts with only opted-in features parsed''' def get(key, name=None, getter=ui.configbool, forceplain=None):