--- a/hgext/mq.py Fri Jun 30 03:39:32 2017 +0200
+++ b/hgext/mq.py Tue Sep 12 11:18:35 2017 -0400
@@ -504,8 +504,11 @@
self.guardsdirty = False
self.activeguards = None
- def diffopts(self, opts=None, patchfn=None):
- diffopts = patchmod.diffopts(self.ui, opts)
+ def diffopts(self, opts=None, patchfn=None, plain=False):
+ """Return diff options tweaked for this mq use, possibly upgrading to
+ git format, and possibly plain and without lossy options."""
+ diffopts = patchmod.difffeatureopts(self.ui, opts,
+ git=True, whitespace=not plain, formatchanging=not plain)
if self.gitmode == 'auto':
diffopts.upgrade = True
elif self.gitmode == 'keep':
@@ -1178,7 +1181,7 @@
date = opts.get('date')
if date:
date = util.parsedate(date)
- diffopts = self.diffopts({'git': opts.get('git')})
+ diffopts = self.diffopts({'git': opts.get('git')}, plain=True)
if opts.get('checkname', True):
self.checkpatchname(patchfn)
inclsubs = checksubstate(repo)
@@ -1643,7 +1646,8 @@
substatestate = repo.dirstate['.hgsubstate']
ph = patchheader(self.join(patchfn), self.plainmode)
- diffopts = self.diffopts({'git': opts.get('git')}, patchfn)
+ diffopts = self.diffopts({'git': opts.get('git')}, patchfn,
+ plain=True)
if newuser:
ph.setuser(newuser)
if newdate: