This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9659

rebase: handle the case when nothing to rebase (dry-run)
ClosedPublic

Authored by khanchi97 on Dec 26 2020, 8:00 AM.

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb7ccdb52e0f9: rebase: handle the case when nothing to rebase (dry-run)
Summary

In dry-run mode, even when there was no rebase in progress it tried
to abort (for context, at the end of dry-run mode we abort the in-memory
performed rebase) because we were not early checking if there was any rebase
started.

Changes in test file reflect the fixed behavior.

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.Dec 26 2020, 8:00 AM
pulkit accepted this revision.Dec 28 2020, 3:06 AM
This revision is now accepted and ready to land.Dec 28 2020, 3:06 AM

Revision Contents
Changeset List

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

Diff 24520

hgext/rebase.py

ui.status( ui.status(
_(b'starting dry-run rebase; repository will not be changed\n') _(b'starting dry-run rebase; repository will not be changed\n')
) )
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
needsabort = True needsabort = True
try: try:
overrides = {(b'rebase', b'singletransaction'): True} overrides = {(b'rebase', b'singletransaction'): True}
with ui.configoverride(overrides, b'rebase'): with ui.configoverride(overrides, b'rebase'):
_origrebase( res = _origrebase(
ui, ui,
repo, repo,
action, action,
opts, opts,
rbsrt, rbsrt,
) )
if res == _nothingtorebase():
needsabort = False
return res
except error.ConflictResolutionRequired: except error.ConflictResolutionRequired:
ui.status(_(b'hit a merge conflict\n')) ui.status(_(b'hit a merge conflict\n'))
return 1 return 1
except error.Abort: except error.Abort:
needsabort = False needsabort = False
raise raise
else: else:
if confirm: if confirm:

tests/test-rebase-inmemory.t

$ hg rebase -s 2 -d 6 -n --abort $ hg rebase -s 2 -d 6 -n --abort
abort: cannot specify both --abort and --dry-run abort: cannot specify both --abort and --dry-run
[10] [10]
When nothing to rebase When nothing to rebase
$ hg reb -r . -d '.^' -n $ hg reb -r . -d '.^' -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
nothing to rebase nothing to rebase
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase [1]
abort: no rebase in progress
[20]
Check dryrun gives correct results when there is no conflict in rebasing Check dryrun gives correct results when there is no conflict in rebasing
$ hg rebase -s 2 -d 6 -n $ hg rebase -s 2 -d 6 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase