Mercurial > hg
comparison hgext/record.py @ 16683:525fdb738975
cleanup: eradicate long lines
| author | Brodie Rao <brodie@sf.io> |
|---|---|
| date | Sat, 12 May 2012 15:54:54 +0200 |
| parents | d388c3fc8319 |
| children | 38caf405d010 |
comparison
equal
deleted
inserted
replaced
| 16676:654b9e1966f7 | 16683:525fdb738975 |
|---|---|
| 514 if merge: | 514 if merge: |
| 515 raise util.Abort(_('cannot partially commit a merge ' | 515 raise util.Abort(_('cannot partially commit a merge ' |
| 516 '(use "hg commit" instead)')) | 516 '(use "hg commit" instead)')) |
| 517 | 517 |
| 518 changes = repo.status(match=match)[:3] | 518 changes = repo.status(match=match)[:3] |
| 519 diffopts = mdiff.diffopts(git=True, nodates=True, | 519 diffopts = mdiff.diffopts( |
| 520 ignorews=opts.get('ignore_all_space'), | 520 git=True, nodates=True, |
| 521 ignorewsamount=opts.get('ignore_space_change'), | 521 ignorews=opts.get('ignore_all_space'), |
| 522 ignoreblanklines=opts.get('ignore_blank_lines')) | 522 ignorewsamount=opts.get('ignore_space_change'), |
| 523 ignoreblanklines=opts.get('ignore_blank_lines')) | |
| 523 chunks = patch.diff(repo, changes=changes, opts=diffopts) | 524 chunks = patch.diff(repo, changes=changes, opts=diffopts) |
| 524 fp = cStringIO.StringIO() | 525 fp = cStringIO.StringIO() |
| 525 fp.write(''.join(chunks)) | 526 fp.write(''.join(chunks)) |
| 526 fp.seek(0) | 527 fp.seek(0) |
| 527 | 528 |