equal
deleted
inserted
replaced
517 if merge: |
517 if merge: |
518 raise util.Abort(_('cannot partially commit a merge ' |
518 raise util.Abort(_('cannot partially commit a merge ' |
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)) |
529 fp.seek(0) |
528 fp.seek(0) |
530 |
529 |