Comments
Patch
@@ -519,10 +519,9 @@
'(use "hg commit" instead)'))
status = repo.status(match=match)
- diffopts = opts.copy()
- diffopts['nodates'] = True
- diffopts['git'] = True
- diffopts = patch.diffopts(ui, opts=diffopts)
+ diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
+ diffopts.nodates = True
+ diffopts.git = True
chunks = patch.diff(repo, changes=status, opts=diffopts)
fp = cStringIO.StringIO()
fp.write(''.join(chunks))
@@ -559,9 +559,9 @@
> echo $i >> plain
> done
-Record beginning, middle
+Record beginning, middle, and test that format-breaking diffopts are ignored
- $ hg record -d '14 0' -m middle-only plain <<EOF
+ $ hg record --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
> y
> y
> y