D3829: rebase: make dry-run return 1 or 0 according to result
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sat Jun 23 03:30:51 UTC 2018
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
In dry-run mode, if there is no conflict return 0, if any then return 1
REPOSITORY
rHG Mercurial
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,10 +825,13 @@
**opts)
except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n'))
+ retcode = 1
else:
+ retcode = 0
ui.status(_('there will be no conflict, you can rebase\n'))
finally:
_origrebase(ui, repo, abort=True)
+ return retcode
elif inmemory:
try:
# in-memory merge doesn't support conflicts, so if we hit any, abort
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list