This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	khanchi97	D6493 commit: make the error message more specific while aborting branch closing
Abandoned	khanchi97	D6492 branch: add test covering the case when we have no branchheads to close
Closed	khanchi97	D6491 commit: add a check if it is trying to close an already closed branch head
Closed	khanchi97	D6490 commit: add --force-close-branch flag to close a non-head changeset

Diff 15365

	without --force			without --force
	$ hg ci -m "branch closed" --close-branch			$ hg ci -m "branch closed" --close-branch
	abort: can only close branch heads			abort: can only close branch heads
	[255]			[255]

	with --force			with --force
	$ hg ci -m "branch closed" --close-branch --force			$ hg ci -m "branch closed" --close-branch --force
	created new head			created new head

				Test which adds coverage for the case when we got no heads from branchheads():
				-----------------------------------------------------------------------------

				$ hg up -r "desc('added c')"
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg branch feature
				marked working directory as branch feature
				(branches are permanent and global, did you want a bookmark?)

				$ hg log -GT "{rev}: {node\|short} {desc\|firstline}\n\t{branch}\n\n"
				_ 3: 0c72c83f0f75 branch closed
				\| default
				\|
				\| @ 2: 155349b645be added c
				\| \| default
				\| \|
				\| o 1: 5f6d8a4bf34a added b
				\|/ default
				\|
				o 0: 9092f1db7931 added a
				default

				XXX: we could have a more specific message here that current branch has no heads
				$ hg ci -m "closing branch" --close-branch
				abort: can only close branch heads
				[255]

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	15365			Jun 7 2019, 9:56 AM	★	★