##// END OF EJS Templates
record: don't honor format-changing diffopts (issue4459)...
Siddharth Agarwal -
r23435:486a1fe0 default
parent child Browse files
Show More
@@ -519,10 +519,9 b' def dorecord(ui, repo, commitfunc, cmdsu'
519 '(use "hg commit" instead)'))
519 '(use "hg commit" instead)'))
520
520
521 status = repo.status(match=match)
521 status = repo.status(match=match)
522 diffopts = opts.copy()
522 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
523 diffopts['nodates'] = True
523 diffopts.nodates = True
524 diffopts['git'] = True
524 diffopts.git = True
525 diffopts = patch.diffopts(ui, opts=diffopts)
526 chunks = patch.diff(repo, changes=status, opts=diffopts)
525 chunks = patch.diff(repo, changes=status, opts=diffopts)
527 fp = cStringIO.StringIO()
526 fp = cStringIO.StringIO()
528 fp.write(''.join(chunks))
527 fp.write(''.join(chunks))
@@ -559,9 +559,9 b' Add to beginning, middle, end'
559 > echo $i >> plain
559 > echo $i >> plain
560 > done
560 > done
561
561
562 Record beginning, middle
562 Record beginning, middle, and test that format-breaking diffopts are ignored
563
563
564 $ hg record -d '14 0' -m middle-only plain <<EOF
564 $ hg record --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
565 > y
565 > y
566 > y
566 > y
567 > y
567 > y
General Comments 0
You need to be logged in to leave comments. Login now