This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6491

commit: add a check if it is trying to close an already closed branch head
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9f7cb777b654: commit: add a check if it is trying to close an already closed branch head
Summary

It would check if the revision we are going to close is already a
closed branch head and print the error message accordingly.

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 15381.Jun 8 2019, 6:22 AM
pulkit added a subscriber: pulkit.Jun 11 2019, 10:03 AM

This should also be commit: .. instead of branch: ...

khanchi97 retitled this revision from branch: add a check if it is trying to close an already closed branch head to commit: add a check if it is trying to close an already closed branch head.Jun 15 2019, 8:00 AM
khanchi97 updated this revision to Diff 15532.
pulkit accepted this revision.Jun 18 2019, 7:27 AM
This revision is now accepted and ready to land.Jun 18 2019, 7:27 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mtests/test-branches.t (2 lines)

Diff 15567

mercurial/commands.py

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:
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'))

tests/test-branches.t

$ 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