rebase: suppress warning thrown when aborting rebase in case of dryrun

Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user prespective.

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

hgext/rebase.py

@@ -325,7 +325,7 b' class rebaseruntime(object):'
         skippedset.update(obsoleteextinctsuccessors)
         _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
 
-    def _prepareabortorcontinue(self, isabort, backup=True):
+    def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False):
         try:
             self.restorestatus()
             self.collapsemsg = restorecollapsemsg(self.repo, isabort)
@@ -342,7 +342,8 b' class rebaseruntime(object):'
                 raise error.Abort(msg, hint=hint)
         if isabort:
             return abort(self.repo, self.originalwd, self.destmap, self.state,
-                         activebookmark=self.activebookmark, backup=backup)
+                         activebookmark=self.activebookmark, backup=backup,
+                         suppwarns=suppwarns)
 
     def _preparenewrebase(self, destmap):
         if not destmap:
@@ -851,7 +852,8 b' def _dryrunrebase(ui, repo, **opts):'
             return 0
         finally:
             # no need to store backup in case of dryrun
-            rbsrt._prepareabortorcontinue(isabort=True, backup=False)
+            rbsrt._prepareabortorcontinue(isabort=True, backup=False,
+                                          suppwarns=True)
 
 def _dorebase(ui, repo, inmemory=False, **opts):
     rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts))
@@ -1554,7 +1556,8 b' def needupdate(repo, state):'
 
     return False
 
-def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True):
+def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True,
+          suppwarns=False):
     '''Restore the repository to its original state.  Additional args:
 
     activebookmark: the name of the bookmark that should be active after the
@@ -1607,7 +1610,8 b' def abort(repo, originalwd, destmap, sta'
     finally:
         clearstatus(repo)
         clearcollapsemsg(repo)
-        repo.ui.warn(_('rebase aborted\n'))
+        if not suppwarns:
+            repo.ui.warn(_('rebase aborted\n'))
     return 0
 
 def sortsource(destmap):

tests/test-rebase-inmemory.t

@@ -212,7 +212,6 b' Check dryrun gives correct results when '
   rebasing 3:055a42cdd887 "d"
   rebasing 4:e860deea161a "e"
   there will be no conflict, you can rebase
-  rebase aborted
 
   $ hg diff
   $ hg status
@@ -245,7 +244,6 b' Check dryrun working with --collapse whe'
   rebasing 3:055a42cdd887 "d"
   rebasing 4:e860deea161a "e"
   there will be no conflict, you can rebase
-  rebase aborted
 
 Check dryrun gives correct results when there is conflict in rebasing
 Make a conflict:
@@ -285,7 +283,6 b' Make a conflict:'
   transaction abort!
   rollback completed
   hit a merge conflict
-  rebase aborted
   [1]
   $ hg diff
   $ hg status
@@ -321,5 +318,4 b' Check dryrun working with --collapse whe'
   rebasing 4:e860deea161a "e"
   merging e
   hit a merge conflict
-  rebase aborted
   [1]