518 if merge: |
518 if merge: |
519 raise util.Abort(_('cannot partially commit a merge ' |
519 raise util.Abort(_('cannot partially commit a merge ' |
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)) |
531 fp.seek(0) |
531 fp.seek(0) |
532 |
532 |