diff --git a/hgext/rebase.py b/hgext/rebase.py index 5c0d5b95b8249796a57ff2ff2db49b46f087624c_aGdleHQvcmViYXNlLnB5..cb4223c65f7912f74806d6f25c3f7c0be5b446d7_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -222,8 +222,9 @@ if revf: rebaseset = scmutil.revrange(repo, revf) if not rebaseset: - raise util.Abort(_('empty "rev" revision set - ' - 'nothing to rebase')) + ui.status(_('empty "rev" revision set - ' + 'nothing to rebase\n')) + return 1 elif srcf: src = scmutil.revrange(repo, [srcf]) if not src: diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t index 5c0d5b95b8249796a57ff2ff2db49b46f087624c_dGVzdHMvdGVzdC1yZWJhc2UtcGFyYW1ldGVycy50..cb4223c65f7912f74806d6f25c3f7c0be5b446d7_dGVzdHMvdGVzdC1yZWJhc2UtcGFyYW1ldGVycy50 100644 --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -80,8 +80,8 @@ [255] $ hg rebase --rev '1 & !1' - abort: empty "rev" revision set - nothing to rebase - [255] + empty "rev" revision set - nothing to rebase + [1] $ hg rebase --source '1 & !1' abort: empty "source" revision set - nothing to rebase