# HG changeset patch # User Sushil khanchi # Date 1555363408 -19800 # Node ID abd4783db5a7fe68e67af6a52a23283149e43317 # Parent 9f7cb777b6540b55703940c26bf05d666164c1dd commit: make the error message more specific while aborting branch closing Differential Revision: https://phab.mercurial-scm.org/D6493 diff -r 9f7cb777b654 -r abd4783db5a7 mercurial/commands.py --- a/mercurial/commands.py Tue Apr 16 02:33:54 2019 +0530 +++ b/mercurial/commands.py Tue Apr 16 02:53:28 2019 +0530 @@ -1677,7 +1677,7 @@ raise error.Abort(_('current revision is already a branch closing' ' head')) elif not bheads: - raise error.Abort(_('can only close branch heads')) + raise error.Abort(_('branch "%s" has no heads to close') % branch) elif branch == repo['.'].branch() and repo['.'].node() not in bheads: raise error.Abort(_('can only close branch heads')) elif opts.get('amend'): diff -r 9f7cb777b654 -r abd4783db5a7 tests/test-commit-amend.t --- a/tests/test-commit-amend.t Tue Apr 16 02:33:54 2019 +0530 +++ b/tests/test-commit-amend.t Tue Apr 16 02:53:28 2019 +0530 @@ -892,7 +892,7 @@ marked working directory as branch silliness $ echo b >> b $ hg ci --close-branch -m'open and close' - abort: can only close branch heads + abort: branch "silliness" has no heads to close [255] Test that amend with --secret creates new secret changeset forcibly