mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
936199e02d
This patch migrates rebase to use scmutil.cleanupnodes API. It simplifies the code and makes rebase code reusable inside a transaction. This is a BC because the backup file is no longer strip-backup/*-backup.hg, but strip-backup/*-rebase.hg. The latter looks more reasonable since the directory name is "strip-backup" so there is no need to repeat "backup". I think the backup file name change is probably fine as a BC, since we have changed it before (2e51c9a7a08f) and didn't get complains. The end result of this series will be a much more consistent and unified backup names: command | old backup file suffix | new backup file suffix ------------------------------------------------------------------- amend | amend-backup.hg | amend.hg histedit | backup.hg (could be 2 files) | histedit.hg (single file) rebase | backup.hg | rebase.hg strip | backup.hg | backup.hg (note: backup files are under .hg/strip-backup) It also fixes issue5606 as a side effect because the new "delayedstrip" code path will carefully examine nodes (safestriproots) to make sure orphaned changesets won't get stripped by accident. Some warning messages are changed to the new "warning: orphaned descendants detected, not stripping HASHES", which provides more information about exactly what changesets are left behind. Another minor behavior change is when there is an obsoleted changeset with a successor in the destination branch, bookmarks pointing to that obsoleted changeset will not be moved. I have commented in test-rebase-obsolete.t explaining why that is more desirable.
131 lines
1.6 KiB
Raku
131 lines
1.6 KiB
Raku
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> rebase=
|
|
>
|
|
> [phases]
|
|
> publish=False
|
|
>
|
|
> [alias]
|
|
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
|
|
> EOF
|
|
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo c1 > c1
|
|
$ hg ci -Am c1
|
|
adding c1
|
|
|
|
$ echo c2 > c2
|
|
$ hg ci -Am c2
|
|
adding c2
|
|
|
|
$ echo l1 > l1
|
|
$ hg ci -Am l1
|
|
adding l1
|
|
|
|
$ hg up -q -C 1
|
|
|
|
$ echo r1 > r1
|
|
$ hg ci -Am r1
|
|
adding r1
|
|
created new head
|
|
|
|
$ echo r2 > r2
|
|
$ hg ci -Am r2
|
|
adding r2
|
|
|
|
$ hg tglog
|
|
@ 4: 'r2'
|
|
|
|
|
o 3: 'r1'
|
|
|
|
|
| o 2: 'l1'
|
|
|/
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
Rebase with no arguments - single revision in source branch:
|
|
|
|
$ hg up -q -C 2
|
|
|
|
$ hg rebase
|
|
rebasing 2:87c180a611f2 "l1"
|
|
saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg (glob)
|
|
|
|
$ hg tglog
|
|
@ 4: 'l1'
|
|
|
|
|
o 3: 'r2'
|
|
|
|
|
o 2: 'r1'
|
|
|
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
$ cd ..
|
|
|
|
|
|
$ hg init b
|
|
$ cd b
|
|
|
|
$ echo c1 > c1
|
|
$ hg ci -Am c1
|
|
adding c1
|
|
|
|
$ echo c2 > c2
|
|
$ hg ci -Am c2
|
|
adding c2
|
|
|
|
$ echo l1 > l1
|
|
$ hg ci -Am l1
|
|
adding l1
|
|
|
|
$ echo l2 > l2
|
|
$ hg ci -Am l2
|
|
adding l2
|
|
|
|
$ hg up -q -C 1
|
|
|
|
$ echo r1 > r1
|
|
$ hg ci -Am r1
|
|
adding r1
|
|
created new head
|
|
|
|
$ hg tglog
|
|
@ 4: 'r1'
|
|
|
|
|
| o 3: 'l2'
|
|
| |
|
|
| o 2: 'l1'
|
|
|/
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
Rebase with no arguments - single revision in target branch:
|
|
|
|
$ hg up -q -C 3
|
|
|
|
$ hg rebase
|
|
rebasing 2:87c180a611f2 "l1"
|
|
rebasing 3:1ac923b736ef "l2"
|
|
saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg (glob)
|
|
|
|
$ hg tglog
|
|
@ 4: 'l2'
|
|
|
|
|
o 3: 'l1'
|
|
|
|
|
o 2: 'r1'
|
|
|
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
|
|
$ cd ..
|