Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: make sure we don't loose the return code in --confirm option
authorSushil khanchi <sushilkhanchi97@gmail.com>
Thu, 12 Jul 2018 22:23:51 +0530
changeset 38674 a50482254b0a
parent 38673 20a30bb8f276
child 38675 35b3f686157a
rebase: make sure we don't loose the return code in --confirm option return _dorebase() to make sure it returns 'return code'. Differential Revision: https://phab.mercurial-scm.org/D3938
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Wed Jul 11 15:12:01 2018 -0700
+++ b/hgext/rebase.py	Thu Jul 12 22:23:51 2018 +0530
@@ -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:
Mercurial