This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6281

branch: add tests which shows branch can be closed from a non-branchhead cset
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG258821f2d465: branch: add tests which shows branch can be closed from a non-branchhead cset
Summary

This patch shows that we can close a branch even from a cset which is not
a branch head. It was supposed to abort this operation.
Next patch will be fixing the issue.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Apr 19 2019, 3:48 AM
khanchi97 added inline comments.Apr 25 2019, 1:47 PM
tests/test-branches.t
961

I created this patch assuming that hg should not allow to create a branch closing commit from a cset which is not a branch head. Let me know if I am missing something here.

pulkit accepted this revision.Apr 25 2019, 1:51 PM
pulkit added a subscriber: pulkit.

Queueing this, many thanks!

tests/test-branches.t
961

I think that the assumption is correct. hg help commit says --close-branch mark a branch head as closed.

So it should definitely be a head.

Closed by commit rHG258821f2d465: branch: add tests which shows branch can be closed 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
Mtests/test-branches.t (35 lines)

Diff 14858

tests/test-branches.t

$ f --size --hexdump .hg/cache/rbc-* $ f --size --hexdump .hg/cache/rbc-*
.hg/cache/rbc-names-v1: size=14 .hg/cache/rbc-names-v1: size=14
0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch| 0000: 64 65 66 61 75 6c 74 00 62 72 61 6e 63 68 |default.branch|
.hg/cache/rbc-revs-v1: size=24 .hg/cache/rbc-revs-v1: size=24
0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......| 0000: 66 e5 f5 aa 00 00 00 00 fa 4c 04 e5 00 00 00 00 |f........L......|
0010: 56 46 78 69 00 00 00 01 |VFxi....| 0010: 56 46 78 69 00 00 00 01 |VFxi....|
$ cd .. $ cd ..
Test to make sure that `--close-branch` only works on a branch head:
--------------------------------------------------------------------
$ hg init closebranch
$ cd closebranch
$ for ch in a b c; do
> echo $ch > $ch
> hg add $ch
> hg ci -m "added "$ch
> done;
$ hg up -r "desc('added b')"
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
it should abort:
XXX: it should have aborted here
$ hg ci -m "closing branch" --close-branch
created new head
khanchi97AuthorUnsubmitted
Not Done

I created this patch assuming that hg should not allow to create a branch closing commit from a cset which is not a branch head. Let me know if I am missing something here.

khanchi97: I created this patch assuming that hg should not allow to create a branch closing commit from a…
pulkitUnsubmitted
Not Done

I think that the assumption is correct. hg help commit says --close-branch mark a branch head as closed.

So it should definitely be a head.

pulkit: I think that the assumption is correct. `hg help commit` says `--close-branch mark a branch…
$ hg up 0
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"
_ 3: 006876ddd20e closing branch
| default
|
| o 2: 155349b645be added c
|/ default
|
o 1: 5f6d8a4bf34a added b
| default
|
@ 0: 9092f1db7931 added a
default