mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
e7a2ea79bc
Summary: This change enables "allowunstable" for the `hg rebase` command, which lets it create unstable changesets without full evolution enabled. Test Plan: Create a stack of commits and attempt to rebase a commit in the middle of the stack, using a command like `hg rebase -r REV1 -d REV2` without the `--keep` flag. This will now work, and the old version of the rebased commit (with descendants) will render as an X in smartlog. Reviewers: #sourcecontrol, quark, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4287989 Signature: t1:4287989:1481074215:80103f6bfd150e51cc152bc257146d3f9369b175
69 lines
1.6 KiB
Perl
69 lines
1.6 KiB
Perl
Set up test environment.
|
|
$ . $TESTDIR/require-ext.sh directaccess evolve inhibit
|
|
$ extpath=`dirname $TESTDIR`
|
|
$ cp $extpath/hgext3rd/allowunstable.py $TESTTMP # use $TESTTMP substitution in message
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> allowunstable=$TESTTMP/allowunstable.py
|
|
> directaccess=
|
|
> evolve=
|
|
> histedit=
|
|
> inhibit=
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers
|
|
> evolutioncommands = fold split
|
|
> EOF
|
|
$ showgraph() {
|
|
> hg log --graph -T "{rev} {desc|firstline}"
|
|
> }
|
|
$ hg init allowunstable && cd allowunstable
|
|
$ hg debugbuilddag +5
|
|
|
|
Test that we can perform a splits and histedits in the middle of a stack.
|
|
Since these are interactive commands, just ensure that we don't get
|
|
an error message.
|
|
$ hg up 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg split
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg histedit
|
|
|
|
Test that we can perform a fold in the middle of a stack.
|
|
$ hg up 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg fold ".^"
|
|
2 changesets folded
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ showgraph
|
|
@ 5 r1
|
|
|
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
Test that we can perform a rebase in the middle of a stack.
|
|
$ hg rebase -r 3 -d 5
|
|
rebasing 3:2dc09a01254d "r3"
|
|
note: rebase of 3:2dc09a01254d created no changes to commit
|
|
1 new unstable changesets
|
|
$ showgraph
|
|
@ 5 r1
|
|
|
|
|
| o 4 r4
|
|
| |
|
|
| x 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|