D3829: rebase: make dry-run return 1 or 0 according to result

[khanchi97 (Sushil khanchi)]

khanchi97 updated this revision to Diff 9270.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3829?vs=9261&id=9270

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

AFFECTED FILES
  hgext/rebase.py
  tests/test-rebase-inmemory.t

CHANGE DETAILS

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -287,6 +287,7 @@
   rollback completed
   hit a merge conflict
   rebase aborted
+  [1]
   $ hg diff
   $ hg status
   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@@ -322,3 +323,4 @@
   merging e
   hit a merge conflict
   rebase aborted
+  [1]
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -825,8 +825,10 @@
                             **opts)
         except error.InMemoryMergeConflictsError:
             ui.status(_('hit a merge conflict\n'))
+            return 1
         else:
             ui.status(_('there will be no conflict, you can rebase\n'))
+            return 0
         finally:
             _origrebase(ui, repo, abort=True)
     elif inmemory:



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