equal
deleted
inserted
replaced
377 |
377 |
378 d - done, skip remaining changes and files |
378 d - done, skip remaining changes and files |
379 a - record all changes to all remaining files |
379 a - record all changes to all remaining files |
380 q - quit, recording no changes |
380 q - quit, recording no changes |
381 |
381 |
382 ? - display help''' |
382 ? - display help |
|
383 |
|
384 This command is not available when committing a merge.''' |
383 |
385 |
384 dorecord(ui, repo, commands.commit, *pats, **opts) |
386 dorecord(ui, repo, commands.commit, *pats, **opts) |
385 |
387 |
386 |
388 |
387 def qrecord(ui, repo, patch, *pats, **opts): |
389 def qrecord(ui, repo, patch, *pats, **opts): |
419 state is restored to original. |
421 state is restored to original. |
420 |
422 |
421 In the end we'll record interesting changes, and everything else will be |
423 In the end we'll record interesting changes, and everything else will be |
422 left in place, so the user can continue his work. |
424 left in place, so the user can continue his work. |
423 """ |
425 """ |
|
426 |
|
427 merge = len(repo[None].parents()) > 1 |
|
428 if merge: |
|
429 raise util.Abort(_('cannot partially commit a merge ' |
|
430 '(use hg commit instead)')) |
424 |
431 |
425 changes = repo.status(match=match)[:3] |
432 changes = repo.status(match=match)[:3] |
426 diffopts = mdiff.diffopts(git=True, nodates=True) |
433 diffopts = mdiff.diffopts(git=True, nodates=True) |
427 chunks = patch.diff(repo, changes=changes, opts=diffopts) |
434 chunks = patch.diff(repo, changes=changes, opts=diffopts) |
428 fp = cStringIO.StringIO() |
435 fp = cStringIO.StringIO() |