mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
97ed6a8afa
Summary: This diff replaces the `hg previous` and `hg next` commands from the evolve extension with new implementations. The new commands have several features not found in evolve: - Users can now move by multiple commits at a time. Example: `hg next 3` - Users can move all the way to the top or bottom of the current stack with the following new flags: `hg next --top` and `hg prev --bottom` - Users can rebase child commits on demand with `hg next --rebase`. This flag can be combined with the others to specify exactly how many commits to rebase. Example: `hg next --rebase 4` (move 4 commits up the stack, rebasing as needed) `hg next --rebase --top` (rebase all the way to the top of the stack) - When a user lands on a particular commit, if there is a bookmark it will be automatically activated. The user can also move to the previous or next commit with a bookmark with the `--bookmark` flag. - The user can pass the `--newest` flag to resolve ambiguity in situations where history is nonlinear. With the flag the command will always choose the commit with the higher rev number at each step. - The commands now show commit hashes instead of rev numbers when showing the user what commit they landed on. Apologies in advance for the large diff. I've tried splitting it up as best as I could, but the unit tests introduced here significantly increase the size. I figured the unit tests should be part of this diff instead of being added in a separate one. This diff is almost entirely new code, so I hope that helps a little bit. Let me know if there's a better way to split this up. Test Plan: See the new unit tests for an extensive look at the new commands in action. Essentially, all of the features mentioned above should work as expected. Reviewers: quark, #sourcecontrol, durham Reviewed By: durham Subscribers: stash, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4121778 Tasks: 14119420 Signature: t1:4121778:1478774243:a7131593222bc329f541e77e1d3ebd8222e47e79
404 lines
7.7 KiB
Perl
404 lines
7.7 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
|
|
> EOF
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> echo "add $1" > msg
|
|
> hg ci -l msg
|
|
> }
|
|
$ reset() {
|
|
> cd ..
|
|
> rm -rf nextrebase
|
|
> hg init nextrebase
|
|
> cd nextrebase
|
|
> }
|
|
$ showgraph() {
|
|
> hg log --graph -T "{rev} {desc|firstline}"
|
|
> }
|
|
$ hg init nextrebase && cd nextrebase
|
|
|
|
Cannot --rebase and --merge.
|
|
$ hg next --rebase --merge
|
|
abort: cannot use both --merge and --rebase
|
|
[255]
|
|
|
|
Rebasing single changeset.
|
|
$ hg debugbuilddag -n +4
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg next
|
|
abort: current changeset has no children
|
|
[255]
|
|
$ hg next --rebase
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[fe8ffc] r2
|
|
$ showgraph
|
|
@ 5 r2
|
|
|
|
|
o 4 amended
|
|
|
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
|
|
Rebasing multiple changesets at once.
|
|
$ reset
|
|
$ hg debugbuilddag -n +5
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg next --rebase --top
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
rebasing 3:137d867d71d5 "r3"
|
|
rebasing 4:daa37004f338 "r4"
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[55b98e] r4
|
|
$ showgraph
|
|
@ 8 r4
|
|
|
|
|
o 7 r3
|
|
|
|
|
o 6 r2
|
|
|
|
|
o 5 amended
|
|
|
|
|
o 0 r0
|
|
|
|
|
|
Rebasing a stack one changeset at a time.
|
|
$ reset
|
|
$ hg debugbuilddag -n +5
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg next --rebase
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[fe8ffc] r2
|
|
$ hg next --rebase
|
|
rebasing 3:137d867d71d5 "r3"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[7d603c] r3
|
|
$ showgraph
|
|
@ 7 r3
|
|
|
|
|
o 6 r2
|
|
|
|
|
o 5 amended
|
|
|
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
|
|
$ hg next --rebase
|
|
rebasing 4:daa37004f338 "r4"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[55b98e] r4
|
|
$ showgraph
|
|
@ 8 r4
|
|
|
|
|
o 7 r3
|
|
|
|
|
o 6 r2
|
|
|
|
|
o 5 amended
|
|
|
|
|
o 0 r0
|
|
|
|
|
|
Rebasing a stack two changesets at a time.
|
|
$ reset
|
|
$ hg debugbuilddag -n +6
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg next --rebase 2
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
rebasing 3:137d867d71d5 "r3"
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[7d603c] r3
|
|
$ showgraph
|
|
@ 8 r3
|
|
|
|
|
o 7 r2
|
|
|
|
|
o 6 amended
|
|
|
|
|
| o 5 r5
|
|
| |
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
$ hg next --rebase 2
|
|
rebasing 4:daa37004f338 "r4"
|
|
rebasing 5:5f333e6f7274 "r5"
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[c01a35] r5
|
|
$ showgraph
|
|
@ 10 r5
|
|
|
|
|
o 9 r4
|
|
|
|
|
o 8 r3
|
|
|
|
|
o 7 r2
|
|
|
|
|
o 6 amended
|
|
|
|
|
o 0 r0
|
|
|
|
|
|
Rebasing after multiple amends.
|
|
$ reset
|
|
$ hg debugbuilddag -n +5
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amend 1"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg amend -m "amend 2"
|
|
$ hg amend -m "amend 3"
|
|
$ showgraph
|
|
@ 7 amend 3
|
|
|
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
$ hg next --rebase --top
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
rebasing 3:137d867d71d5 "r3"
|
|
rebasing 4:daa37004f338 "r4"
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[66772e] r4
|
|
$ showgraph
|
|
@ 10 r4
|
|
|
|
|
o 9 r3
|
|
|
|
|
o 8 r2
|
|
|
|
|
o 7 amend 3
|
|
|
|
|
o 0 r0
|
|
|
|
|
|
Rebasing from below the amended changeset with the --newest flag.
|
|
$ reset
|
|
$ hg debugbuilddag -n +6
|
|
$ hg up 2
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ showgraph
|
|
o 6 amended
|
|
|
|
|
| o 5 r5
|
|
| |
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
|/
|
|
o 1 r1
|
|
|
|
|
@ 0 r0
|
|
|
|
$ hg next --rebase --top --newest
|
|
rebasing 3:137d867d71d5 "r3"
|
|
rebasing 4:daa37004f338 "r4"
|
|
rebasing 5:5f333e6f7274 "r5"
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
[bd05f8] r5
|
|
$ showgraph
|
|
@ 9 r5
|
|
|
|
|
o 8 r4
|
|
|
|
|
o 7 r3
|
|
|
|
|
o 6 amended
|
|
|
|
|
o 1 r1
|
|
|
|
|
o 0 r0
|
|
|
|
|
|
Test aborting due to ambiguity caused by a rebase. The rebase should be
|
|
rolled back and the final state should be as it was before `hg next --rebase`.
|
|
$ reset
|
|
$ hg debugbuilddag -n +6
|
|
$ hg up 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "amended"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ mkcommit a
|
|
$ hg prev
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
[dc00ac] amended
|
|
$ showgraph
|
|
o 7 add a
|
|
|
|
|
@ 6 amended
|
|
|
|
|
| o 5 r5
|
|
| |
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
$ hg next --rebase
|
|
rebasing 2:776c07fa2b12 "r2"
|
|
changeset dc00accb61d3 has multiple children, namely:
|
|
[4e13d3] add a
|
|
[fe8ffc] r2
|
|
transaction abort!
|
|
rollback completed
|
|
abort: ambiguous next changeset
|
|
(use the --newest flag to always pick the newest child at each step)
|
|
[255]
|
|
$ showgraph
|
|
o 7 add a
|
|
|
|
|
@ 6 amended
|
|
|
|
|
| o 5 r5
|
|
| |
|
|
| o 4 r4
|
|
| |
|
|
| o 3 r3
|
|
| |
|
|
| o 2 r2
|
|
| |
|
|
| o 1 r1
|
|
|/
|
|
o 0 r0
|
|
|
|
|
|
Test a situation where there is a conflict.
|
|
$ reset
|
|
$ mkcommit a
|
|
$ mkcommit b
|
|
$ mkcommit c
|
|
$ mkcommit d
|
|
$ hg up 1
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ echo "conflict" > c
|
|
$ hg add c
|
|
$ hg amend -m "amended to add c"
|
|
warning: the changeset's children were left behind
|
|
(use 'hg amend --fixup' to rebase them)
|
|
$ showgraph
|
|
@ 5 amended to add c
|
|
|
|
|
| o 3 add d
|
|
| |
|
|
| o 2 add c
|
|
| |
|
|
| o 1 add b
|
|
|/
|
|
o 0 add a
|
|
|
|
$ hg next --rebase --top
|
|
rebasing 2:4538525df7e2 "add c"
|
|
merging c
|
|
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ showgraph
|
|
@ 5 amended to add c
|
|
|
|
|
| o 3 add d
|
|
| |
|
|
| @ 2 add c
|
|
| |
|
|
| o 1 add b
|
|
|/
|
|
o 0 add a
|
|
|
|
In this mid-rebase state, we can't use `hg previous` or `hg next`:
|
|
$ hg previous
|
|
abort: rebase in progress
|
|
(use 'hg rebase --continue' or 'hg rebase --abort')
|
|
[255]
|
|
Now resolve the conflict and resume the rebase.
|
|
$ rm c
|
|
$ echo "resolved" > c
|
|
$ hg resolve --mark c
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
rebasing 2:4538525df7e2 "add c"
|
|
$ showgraph
|
|
o 6 add c
|
|
|
|
|
@ 5 amended to add c
|
|
|
|
|
| o 3 add d
|
|
| |
|
|
| o 2 add c
|
|
| |
|
|
| o 1 add b
|
|
|/
|
|
o 0 add a
|
|
|