# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1555085173 14400
# Node ID 1b5cec8b6a1ee7c3c7d431b4e72941c22cc49976
# Parent  8890fce7c13de13cb3adfd5db176eca3418c86e9
rebase: fix bug that prevented dry-run rebases from printing failures

As far as I can tell it should be fine to unconditionally skip
_prepareabortorcontinue if we're in the process of raising an Abort
here.

Differential Revision: https://phab.mercurial-scm.org/D6226

diff -r 8890fce7c13d -r 1b5cec8b6a1e hgext/rebase.py
--- a/hgext/rebase.py	Fri Apr 12 11:41:33 2019 -0400
+++ b/hgext/rebase.py	Fri Apr 12 12:06:13 2019 -0400
@@ -949,6 +949,9 @@
         except error.InMemoryMergeConflictsError:
             ui.status(_('hit a merge conflict\n'))
             return 1
+        except error.Abort:
+            needsabort = False
+            raise
         else:
             if confirm:
                 ui.status(_('rebase completed successfully\n'))
diff -r 8890fce7c13d -r 1b5cec8b6a1e tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t	Fri Apr 12 11:41:33 2019 -0400
+++ b/tests/test-rebase-dest.t	Fri Apr 12 12:06:13 2019 -0400
@@ -214,7 +214,7 @@
   > |
   > Z
   > EOS
-  abort: no rebase in progress
+  abort: source and destination form a cycle
   starting dry-run rebase; repository will not be changed
   [255]