Mercurial > hg
comparison mercurial/cmdutil.py @ 38667:572dff5c946e
rebase: add --confirm option
This feature adds a functionality in rebase to confirm before applying
changes.
When there is no conflict and user confirm to apply actions, we just
finish the unfinished rebase. But when there is a conflict and user
confirm to apply actions then we can't just finish rebasing using
rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so
we have to abort and run on-disk merge in this case.
And if user doesn't confirm to apply actions then simply abort the rebase.
Differential Revision: https://phab.mercurial-scm.org/D3870
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 30 Jun 2018 12:42:49 +0530 |
| parents | ffd08ec22955 |
| children | 6b5ca1d0aa1e |
comparison
equal
deleted
inserted
replaced
| 38666:a06b2b032557 | 38667:572dff5c946e |
|---|---|
| 58 # templates of common command options | 58 # templates of common command options |
| 59 | 59 |
| 60 dryrunopts = [ | 60 dryrunopts = [ |
| 61 ('n', 'dry-run', None, | 61 ('n', 'dry-run', None, |
| 62 _('do not perform actions, just print output')), | 62 _('do not perform actions, just print output')), |
| 63 ] | |
| 64 | |
| 65 confirmopts = [ | |
| 66 ('', 'confirm', None, | |
| 67 _('ask before applying actions')), | |
| 63 ] | 68 ] |
| 64 | 69 |
| 65 remoteopts = [ | 70 remoteopts = [ |
| 66 ('e', 'ssh', '', | 71 ('e', 'ssh', '', |
| 67 _('specify ssh command to use'), _('CMD')), | 72 _('specify ssh command to use'), _('CMD')), |