This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6493

commit: make the error message more specific while aborting branch closing
ClosedPublic

Authored by khanchi97 on Jun 7 2019, 9:56 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGabd4783db5a7: commit: make the error message more specific while aborting branch closing
Summary

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.Jun 7 2019, 9:56 AM
khanchi97 updated this revision to Diff 15382.Jun 8 2019, 6:22 AM
pulkit accepted this revision.Jun 11 2019, 10:04 AM
pulkit added a comment.Jun 11 2019, 10:06 AM

This one fails to apply, seems like dependent on other related patches.

khanchi97 retitled this revision from branch: make the error message more specific while aborting branch closing to commit: make the error message more specific while aborting branch closing.Jun 15 2019, 8:00 AM
khanchi97 updated this revision to Diff 15533.
pulkit accepted this revision.Jun 18 2019, 7:23 AM
This revision is now accepted and ready to land.Jun 18 2019, 7:23 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mtests/test-commit-amend.t (2 lines)

Diff 15568

mercurial/commands.py

extra = {} extra = {}
if opts.get('close_branch'): if opts.get('close_branch'):
extra['close'] = '1' extra['close'] = '1'
if repo['.'].closesbranch(): if repo['.'].closesbranch():
raise error.Abort(_('current revision is already a branch closing' raise error.Abort(_('current revision is already a branch closing'
' head')) ' head'))
elif not bheads: 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: elif branch == repo['.'].branch() and repo['.'].node() not in bheads:
raise error.Abort(_('can only close branch heads')) raise error.Abort(_('can only close branch heads'))
elif opts.get('amend'): elif opts.get('amend'):
if (repo['.'].p1().branch() != branch and if (repo['.'].p1().branch() != branch and
repo['.'].p2().branch() != branch): repo['.'].p2().branch() != branch):
raise error.Abort(_('can only close branch heads')) raise error.Abort(_('can only close branch heads'))
if opts.get('amend'): if opts.get('amend'):

tests/test-commit-amend.t

[255] [255]
This silliness fails: This silliness fails:
$ hg branch silliness $ hg branch silliness
marked working directory as branch silliness marked working directory as branch silliness
$ echo b >> b $ echo b >> b
$ hg ci --close-branch -m'open and close' $ hg ci --close-branch -m'open and close'
abort: can only close branch heads abort: branch "silliness" has no heads to close
[255] [255]
Test that amend with --secret creates new secret changeset forcibly Test that amend with --secret creates new secret changeset forcibly
--------------------------------------------------------------------- ---------------------------------------------------------------------
$ hg phase '.^::.' $ hg phase '.^::.'
29: draft 29: draft
30: draft 30: draft