This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6226

rebase: fix bug that prevented dry-run rebases from printing failures
ClosedPublic

Authored by durin42 on Apr 12 2019, 12:07 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG1b5cec8b6a1e: rebase: fix bug that prevented dry-run rebases from printing failures
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Apr 12 2019, 12:07 PM
Closed by commit rHG1b5cec8b6a1e: rebase: fix bug that prevented dry-run rebases from printing failures (authored by durin42). · Explain WhyApr 12 2019, 1:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 14713

hgext/rebase.py

try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, action, opts, rbsrt, inmemory=True, _origrebase(ui, repo, action, opts, rbsrt, inmemory=True,
leaveunfinished=True) leaveunfinished=True)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1 return 1
except error.Abort:
needsabort = False
raise
else: else:
if confirm: if confirm:
ui.status(_('rebase completed successfully\n')) ui.status(_('rebase completed successfully\n'))
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
# finish unfinished rebase # finish unfinished rebase
rbsrt._finishrebase() rbsrt._finishrebase()
else: else:

tests/test-rebase-dest.t

BUG: cycles aren't flagged correctly when --dry-run is set: BUG: cycles aren't flagged correctly when --dry-run is set:
$ rebasewithdag -s B -d 'SRC' --dry-run <<'EOS' $ rebasewithdag -s B -d 'SRC' --dry-run <<'EOS'
> C > C
> | > |
> B > B
> | > |
> Z > Z
> EOS > EOS
abort: no rebase in progress abort: source and destination form a cycle
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
[255] [255]
Switch roots: Switch roots:
$ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS' $ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS'
> C F > C F
> | | > | |