| pulkit |
| hg-reviewers |
It would check if the revision we are going to close is already a
closed branch head and print the error message accordingly.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (5 lines) | |||
| M | tests/test-branches.t (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| b469e9bf9381 | 417fd2827d8f | Sushil khanchi | Apr 15 2019, 5:03 PM |
| branch = repo[None].branch() | branch = repo[None].branch() | ||||
| bheads = repo.branchheads(branch) | bheads = repo.branchheads(branch) | ||||
| extra = {} | extra = {} | ||||
| if opts.get('close_branch'): | if opts.get('close_branch'): | ||||
| extra['close'] = '1' | extra['close'] = '1' | ||||
| if not bheads: | if repo['.'].closesbranch(): | ||||
| 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(_('can only close branch heads')) | ||||
| 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')): | ||||
| 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')) | ||||
| $ hg commit -d '9 0' --close-branch -m 'prune bad branch' | $ hg commit -d '9 0' --close-branch -m 'prune bad branch' | ||||
| $ hg branches -a | $ hg branches -a | ||||
| b 8:eebb944467c9 | b 8:eebb944467c9 | ||||
| a branch name much longer than the default justification used by branches 7:10ff5895aa57 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | ||||
| $ hg up -C b | $ hg up -C b | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg commit -d '9 0' --close-branch -m 'close this part branch too' | $ hg commit -d '9 0' --close-branch -m 'close this part branch too' | ||||
| $ hg commit -d '9 0' --close-branch -m 're-closing this branch' | $ hg commit -d '9 0' --close-branch -m 're-closing this branch' | ||||
| abort: can only close branch heads | abort: current revision is already a branch closing head | ||||
| [255] | [255] | ||||
| $ hg log -r tip --debug | $ hg log -r tip --debug | ||||
| changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f | changeset: 12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f | ||||
| branch: b | branch: b | ||||
| tag: tip | tag: tip | ||||
| phase: draft | phase: draft | ||||
| parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 | parent: 8:eebb944467c9fb9651ed232aeaf31b3c0a7fc6c1 | ||||