This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9658

rebase: add test to demonstrate an issue in dry-run
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG11f3d4458e3a: rebase: add test to demonstrate an issue in dry-run
Summary

In dry-run mode, the case when there is nothing to rebase
is not handled correctly. Added test show that it try to
abort a rebase while there is no rebase in progress.

This will be fixed in next patch.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

khanchi97 created this revision.Dec 26 2020, 8:00 AM
pulkit accepted this revision.Dec 28 2020, 3:04 AM
This revision is now accepted and ready to land.Dec 28 2020, 3:04 AM
khanchi97 added a commit: rHG11f3d4458e3a: rebase: add test to demonstrate an issue in dry-run.Dec 28 2020, 7:46 AM
Closed by commit rHG11f3d4458e3a: rebase: add test to demonstrate an issue in dry-run (authored by khanchi97). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (8 lines)

Diff 24510

tests/test-rebase-inmemory.t

Make sure it throws error while passing --continue or --abort with --dry-run Make sure it throws error while passing --continue or --abort with --dry-run
$ hg rebase -s 2 -d 6 -n --continue $ hg rebase -s 2 -d 6 -n --continue
abort: cannot specify both --continue and --dry-run abort: cannot specify both --continue and --dry-run
[10] [10]
$ 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
$ hg reb -r . -d '.^' -n
starting dry-run rebase; repository will not be changed
nothing to rebase
dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
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