##// END OF EJS Templates
record: use patch.diffopts to account for user diffopts...
Denis Laxalde -
r18266:09a2b674 default
parent child Browse files
Show More
@@ -520,11 +520,11 b' def dorecord(ui, repo, commitfunc, cmdsu'
520 '(use "hg commit" instead)'))
520 '(use "hg commit" instead)'))
521
521
522 changes = repo.status(match=match)[:3]
522 changes = repo.status(match=match)[:3]
523 diffopts = mdiff.diffopts(
523 diffopts = patch.diffopts(ui, opts=dict(
524 git=True, nodates=True,
524 git=True, nodates=True,
525 ignorews=opts.get('ignore_all_space'),
525 ignorews=opts.get('ignore_all_space'),
526 ignorewsamount=opts.get('ignore_space_change'),
526 ignorewsamount=opts.get('ignore_space_change'),
527 ignoreblanklines=opts.get('ignore_blank_lines'))
527 ignoreblanklines=opts.get('ignore_blank_lines')))
528 chunks = patch.diff(repo, changes=changes, opts=diffopts)
528 chunks = patch.diff(repo, changes=changes, opts=diffopts)
529 fp = cStringIO.StringIO()
529 fp = cStringIO.StringIO()
530 fp.write(''.join(chunks))
530 fp.write(''.join(chunks))
@@ -255,18 +255,18 b' Modify end of plain file with username u'
255 [255]
255 [255]
256
256
257
257
258 Modify end of plain file
258 Modify end of plain file, also test that diffopts are accounted for
259
259
260 $ HGUSER="test"
260 $ HGUSER="test"
261 $ export HGUSER
261 $ export HGUSER
262 $ hg record -d '8 0' -m end plain <<EOF
262 $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF
263 > y
263 > y
264 > y
264 > y
265 > EOF
265 > EOF
266 diff --git a/plain b/plain
266 diff --git a/plain b/plain
267 1 hunks, 1 lines changed
267 1 hunks, 1 lines changed
268 examine changes to 'plain'? [Ynesfdaq?]
268 examine changes to 'plain'? [Ynesfdaq?]
269 @@ -8,3 +8,4 @@
269 @@ -8,3 +8,4 @@ 7
270 8
270 8
271 9
271 9
272 10
272 10
General Comments 0
You need to be logged in to leave comments. Login now