mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
50c7f6c256
Summary: Automatically rebase unstable commits left behind after a split or fold in the middle of a stack. Previously, users had to run `hg restack` to fix their stacks after the fact. This change also fixes the issue identified in t14560234 whereby the old stack (entirely obsolete) stack would be left visible after splitting or folding a head commit due to the inhibit extension not correctly deinhibiting the old stack. Test Plan: Create a stack of commits and perform `hg split` or `hg fold` on a commit (or set of commits) that have descendants. After the operation these commits should be rebased, preserving the linearity of the stack. See unit tests for specific test cases. Reviewers: #mercurial, durham Reviewed By: durham Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4432833 Tasks: 14560234, 15266009 Signature: t1:4432833:1484880689:1e07e421c8871dfef8bd016454aaed5a88a4a7d1
128 lines
3.8 KiB
Perl
128 lines
3.8 KiB
Perl
Set up test environment.
|
|
$ . $TESTDIR/require-ext.sh directaccess evolve inhibit
|
|
$ extpath=`dirname $TESTDIR`
|
|
$ cp $extpath/hgext3rd/fbamend.py $TESTTMP # use $TESTTMP substitution in message
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> directaccess=
|
|
> evolve=
|
|
> fbamend=$TESTTMP/fbamend.py
|
|
> inhibit=
|
|
> rebase=
|
|
> [experimental]
|
|
> evolution = createmarkers
|
|
> evolutioncommands = previous next split fold
|
|
> EOF
|
|
$ hg init fbamendprevious && cd fbamendprevious
|
|
|
|
Check help text for new options and removal of unsupported options.
|
|
$ hg previous --help
|
|
hg previous [OPTION]... [NUM_STEPS]
|
|
|
|
update to parent revision
|
|
|
|
Displays the summary line of the destination for clarity.
|
|
|
|
options:
|
|
|
|
-B --move-bookmark move active bookmark after update
|
|
--merge bring uncommitted change along
|
|
--newest always pick the newest parent when a changeset has
|
|
multiple parents
|
|
--bottom update to the lowest non-public ancestor of the
|
|
current changeset
|
|
--bookmark update to the first ancestor with a bookmark
|
|
--no-activate-bookmark do not activate the bookmark on the destination
|
|
changeset
|
|
|
|
(some details hidden, use --verbose to show complete help)
|
|
|
|
Create stack of commits and go to the top.
|
|
$ hg debugbuilddag +6
|
|
$ hg up c8d03c
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg book top
|
|
|
|
Test invalid argument combinations.
|
|
$ hg previous --bottom 1
|
|
abort: cannot use both number and --bottom
|
|
[255]
|
|
$ hg previous --bookmark 1
|
|
abort: cannot use both number and --bookmark
|
|
[255]
|
|
$ hg previous --bottom --bookmark
|
|
abort: cannot use both --bottom and --bookmark
|
|
[255]
|
|
|
|
Test basic usage.
|
|
$ hg previous
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark top)
|
|
[bebd16] r4
|
|
|
|
With positional argument.
|
|
$ hg previous 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[012414] r2
|
|
|
|
Overshoot bottom of repo.
|
|
$ hg previous 5
|
|
reached root changeset
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[1ea734] r0
|
|
|
|
Test --bottom flag.
|
|
$ hg up top
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark top)
|
|
$ hg previous --bottom
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[1ea734] r0
|
|
|
|
Test bookmark navigation.
|
|
$ hg book -r 1ea734 root
|
|
$ hg book -r 012414 bookmark
|
|
$ hg up top
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg previous --bookmark
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark top)
|
|
[012414] (bookmark) r2
|
|
(activating bookmark bookmark)
|
|
$ hg previous --bookmark
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[1ea734] (root) r0
|
|
(activating bookmark root)
|
|
|
|
Test bookmark activation.
|
|
$ hg up top
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark top)
|
|
$ hg previous 3
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark top)
|
|
[012414] (bookmark) r2
|
|
(activating bookmark bookmark)
|
|
$ hg previous 2 --no-activate-bookmark
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[1ea734] (root) r0
|
|
|
|
Test dirty working copy and --merge.
|
|
$ hg up top
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark top)
|
|
$ touch test
|
|
$ hg add test
|
|
$ hg st
|
|
A test
|
|
$ hg previous
|
|
abort: uncommitted changes
|
|
(use --merge to bring along uncommitted changes)
|
|
[255]
|
|
$ hg previous --merge
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(leaving bookmark top)
|
|
[bebd16] r4
|
|
$ hg st
|
|
A test
|