diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -37,6 +37,7 @@ hg, merge as mergemod, mergeutil, + node as nodemod, obsolete, obsutil, patch, @@ -1265,8 +1266,7 @@ if not src: ui.status(_(b'empty "source" revision set - nothing to rebase\n')) return None - rebaseset = repo.revs(b'(%ld)::', src) - assert rebaseset + rebaseset = repo.revs(b'(%ld)::', src) or src else: base = scmutil.revrange(repo, [basef or b'.']) if not base: @@ -1341,6 +1341,8 @@ ) return None + if nodemod.wdirrev in rebaseset: + raise error.Abort(_(b'cannot rebase the working copy')) rebasingwcp = repo[b'.'].rev() in rebaseset ui.log( b"rebase", diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -93,11 +93,12 @@ [1] $ hg rebase --rev 'wdir()' --dest 6 - abort: working directory revision cannot be specified + abort: cannot rebase the working copy [255] - $ hg rebase --source 'wdir()' --dest 6 2>&1 | grep assert - assert rebaseset + $ hg rebase --source 'wdir()' --dest 6 + abort: cannot rebase the working copy + [255] $ hg rebase --source '1 & !1' --dest 8 empty "source" revision set - nothing to rebase