# HG changeset patch # User Yuya Nishihara # Date 2019-08-17 06:43:41 # Node ID 0770e221d24b5da264866ecb1429d058861a2de5 # Parent 798b7d4b463e106f437c6992a4c75addd61c7740 transplant: unnest --stop case It should be aligned with --continue. diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -692,11 +692,11 @@ def _dotransplant(ui, repo, *revs, **opt 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)