Mercurial > hg
changeset 42765:0770e221d24b
transplant: unnest --stop case
It should be aligned with --continue.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 17 Aug 2019 15:43:41 +0900 |
| parents | 798b7d4b463e |
| children | e94c8f584ee2 |
| files | hgext/transplant.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Fri Aug 16 18:34:05 2019 +0900 +++ b/hgext/transplant.py Sat Aug 17 15:43:41 2019 +0900 @@ -692,11 +692,11 @@ if opts.get('continue'): if not tp.canresume(): raise error.Abort(_('no transplant to continue')) + elif opts.get('stop'): + if not tp.canresume(): + raise error.Abort(_('no interrupted transplant found')) + return tp.stop(ui, repo) else: - if opts.get('stop'): - if not tp.canresume(): - raise error.Abort(_('no interrupted transplant found')) - return tp.stop(ui, repo) cmdutil.checkunfinished(repo) cmdutil.bailifchanged(repo)