| pulkit |
| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (2 lines) | |||
| M | tests/test-commit-amend.t (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 40d7cce7d96b | cb86a4b779f7 | Sushil khanchi | Apr 15 2019, 5:23 PM |
| 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 | ||||
| and not opts.get('force')): | and not opts.get('force')): | ||||
| hint = _("use --force to close a non-head changeset") | hint = _("use --force to close a non-head changeset") | ||||
| raise error.Abort(_('can only close branch heads'), hint=hint) | raise error.Abort(_('can only close branch heads'), hint=hint) | ||||
| 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')) | ||||
| [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 | ||||