This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6282

branch: abort if closing branch from a non-branchhead cset
ClosedPublic

Authored by khanchi97 on Apr 19 2019, 3:49 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8d14d91584f1: branch: abort if closing branch from a non-branchhead cset
Summary

This patch make sure that we abort if the user is trying to
close a branch from a cset which is not a branch head.
Changes in test file reflect the fixed behaviour.

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.Apr 19 2019, 3:49 AM
pulkit accepted this revision.Apr 25 2019, 1:51 PM
Closed by commit rHG8d14d91584f1: branch: abort if closing branch from a non-branchhead cset (authored by khanchi97). · Explain WhyApr 25 2019, 2:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 14924

mercurial/commands.py

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 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:
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'):
if ui.configbool('ui', 'commitsubrepos'): if ui.configbool('ui', 'commitsubrepos'):
raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))

tests/test-branches.t

> hg ci -m "added "$ch > hg ci -m "added "$ch
> done; > done;
$ hg up -r "desc('added b')" $ hg up -r "desc('added b')"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
trying to close branch from a cset which is not a branch head trying to close branch from a cset which is not a branch head
it should abort: it should abort:
XXX: it should have aborted here
$ hg ci -m "closing branch" --close-branch $ hg ci -m "closing branch" --close-branch
created new head abort: can only close branch heads
[255]
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n" $ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n"
_ 3: 006876ddd20e closing branch o 2: 155349b645be added c
| default | default
| |
| o 2: 155349b645be added c
|/ default
|
o 1: 5f6d8a4bf34a added b o 1: 5f6d8a4bf34a added b
| default | default
| |
@ 0: 9092f1db7931 added a @ 0: 9092f1db7931 added a
default default