This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3829

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

Authored by khanchi97 on Jun 22 2018, 11:30 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe6b643ccf87d: rebase: make dry-run return 1 or 0 according to result
Summary

In dry-run mode, if there is no conflict return 0, if any then return 1

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jun 22 2018, 11:30 PM
yuja added a subscriber: yuja.Jun 23 2018, 11:12 PM
  • 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

retcode may be undefined depending on the error type occurred in
_origrebase(). Instead, you can simply return 1 and 0 in the except
and else clauses respectively.

khanchi97 updated this revision to Diff 9270.Jun 24 2018, 6:31 AM
pulkit accepted this revision.Jun 24 2018, 12:30 PM
Closed by commit rHGe6b643ccf87d: rebase: make dry-run return 1 or 0 according to result (authored by khanchi97). · Explain WhyJun 24 2018, 1:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
Mtests/test-rebase-inmemory.t (2 lines)

Diff 9271

hgext/rebase.py

if dryrun: if dryrun:
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, inmemory=True, leaveunfinished=True, _origrebase(ui, repo, inmemory=True, leaveunfinished=True,
**opts) **opts)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1
else: else:
ui.status(_('there will be no conflict, you can rebase\n')) ui.status(_('there will be no conflict, you can rebase\n'))
return 0
finally: finally:
_origrebase(ui, repo, abort=True) _origrebase(ui, repo, abort=True)
elif inmemory: elif inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):

tests/test-rebase-inmemory.t

rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
transaction abort! transaction abort!
rollback completed rollback completed
hit a merge conflict hit a merge conflict
rebase aborted rebase aborted
[1]
$ hg diff $ hg diff
$ hg status $ hg status
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@ 7:d2c195b28050 test @ 7:d2c195b28050 test
| conflict with e | conflict with e
| |
o 6:baf10c5166d4 test o 6:baf10c5166d4 test
| g | g
Check dryrun working with --collapse when there is conflicts Check dryrun working with --collapse when there is conflicts
$ hg rebase -s 2 -d 7 -n --collapse $ hg rebase -s 2 -d 7 -n --collapse
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
hit a merge conflict hit a merge conflict
rebase aborted rebase aborted
[1]