From patchwork Fri Jul 13 12:23:46 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D3938: rebase: make sure we don't loose the return code in --confirm
 option
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 32834
Message-Id: <480d14a226c851ff1b1e388da1465666@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 13 Jul 2018 12:23:46 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa50482254b0a: rebase: make sure we don&#039;t loose the return code in --confirm option (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3938?vs=9574&id=9586

REVISION DETAIL
  https://phab.mercurial-scm.org/D3938

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: khanchi97, #hg-reviewers
Cc: mercurial-devel

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -874,7 +874,7 @@
                 needsabort = False
                 if not ui.promptchoice(_(b'apply changes (yn)?'
                                          b'$$ &Yes $$ &No')):
-                    _dorebase(ui, repo, opts, inmemory=False)
+                    return _dorebase(ui, repo, opts, inmemory=False)
             return 1
         else:
             if confirm: