2713 message.append('* * *') |
2713 message.append('* * *') |
2714 message.extend(msg) |
2714 message.extend(msg) |
2715 message = '\n'.join(message) |
2715 message = '\n'.join(message) |
2716 |
2716 |
2717 diffopts = q.patchopts(q.diffopts(), *patches) |
2717 diffopts = q.patchopts(q.diffopts(), *patches) |
2718 wlock = repo.wlock() |
2718 with repo.wlock(): |
2719 try: |
|
2720 q.refresh(repo, msg=message, git=diffopts.git, edit=opts.get('edit'), |
2719 q.refresh(repo, msg=message, git=diffopts.git, edit=opts.get('edit'), |
2721 editform='mq.qfold') |
2720 editform='mq.qfold') |
2722 q.delete(repo, patches, opts) |
2721 q.delete(repo, patches, opts) |
2723 q.savedirty() |
2722 q.savedirty() |
2724 finally: |
|
2725 wlock.release() |
|
2726 |
2723 |
2727 @command("qgoto", |
2724 @command("qgoto", |
2728 [('', 'keep-changes', None, |
2725 [('', 'keep-changes', None, |
2729 _('tolerate non-conflicting local changes')), |
2726 _('tolerate non-conflicting local changes')), |
2730 ('f', 'force', None, _('overwrite any local changes')), |
2727 ('f', 'force', None, _('overwrite any local changes')), |