--- a/tests/test-obsolete-rebase.t Tue Aug 21 12:43:21 2012 +0200
+++ b/tests/test-obsolete-rebase.t Fri Aug 24 11:53:55 2012 +0200
@@ -5,7 +5,7 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
> hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n'\
@@ -30,6 +30,15 @@
created new head
$ echo e > e
$ hg ci -Am adde e
+
+(phase compliance)
+
+ $ hg phase --public 3
+ $ hg rebase -d 1 -r 3
+ abort: can't rebase immutable changeset 98e4a024635e
+ (see hg help phases for details)
+ [255]
+ $ hg phase --draft --force 0
$ hg rebase -d 1 -r 3 --detach --keep
$ glog
@ 4:9c5494949763@default(draft) adde
@@ -53,7 +62,7 @@
|/
o 0:07f494440405@default(draft) adda
- $ hg debugsuccessors
+ $ hg debugobsolete
$ hg --config extensions.hgext.mq= strip tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg
@@ -70,7 +79,7 @@
$ glog --hidden
@ 4:9c5494949763@default(draft) adde
|
- | o 3:98e4a024635e@default(secret) adde
+ | x 3:98e4a024635e@default(draft) adde
| |
| o 2:102a90ea7b4a@default(draft) addb
| |
@@ -78,8 +87,8 @@
|/
o 0:07f494440405@default(draft) adda
- $ hg debugsuccessors
- 98e4a024635e 9c5494949763
+ $ hg debugobsolete
+ 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
Test rebase with deleted empty revision
@@ -92,11 +101,11 @@
$ hg ci -m changea
$ hg rebase -d 1
$ glog --hidden
- o 5:4e322f7ce8e3@foo(secret) changea
+ x 5:4e322f7ce8e3@foo(draft) changea
|
| o 4:9c5494949763@default(draft) adde
| |
- | | o 3:98e4a024635e@default(secret) adde
+ | | x 3:98e4a024635e@default(draft) adde
| | |
+---o 2:102a90ea7b4a@default(draft) addb
| |
@@ -104,9 +113,9 @@
|/
o 0:07f494440405@default(draft) adda
- $ hg debugsuccessors
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
+ $ hg debugobsolete
+ 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
+ 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob)
Test rebase --collapse
@@ -123,15 +132,15 @@
$ glog --hidden
@ 8:a7773ffa7edc@default(draft) Collapsed revision
|
- | o 7:03f31481307a@default(secret) changec
+ | x 7:03f31481307a@default(draft) changec
| |
- | o 6:076e9b2ffbe1@default(secret) addc
+ | x 6:076e9b2ffbe1@default(draft) addc
| |
- | | o 5:4e322f7ce8e3@foo(secret) changea
+ | | x 5:4e322f7ce8e3@foo(draft) changea
| |/
+---o 4:9c5494949763@default(draft) adde
| |
- | | o 3:98e4a024635e@default(secret) adde
+ | | x 3:98e4a024635e@default(draft) adde
| | |
| | o 2:102a90ea7b4a@default(draft) addb
| |/
@@ -139,15 +148,15 @@
|/
o 0:07f494440405@default(draft) adda
- $ hg debugsuccessors
- 03f31481307a a7773ffa7edc
- 076e9b2ffbe1 a7773ffa7edc
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
+ $ hg debugobsolete
+ 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob)
+ 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob)
+ 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
+ 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
Test rebase --abort
- $ hg debugsuccessors > ../successors.old
+ $ hg debugobsolete > ../successors.old
$ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo d > d
@@ -164,7 +173,7 @@
$ hg rebase --abort
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
rebase aborted
- $ hg debugsuccessors > ../successors.new
+ $ hg debugobsolete > ../successors.new
$ diff -u ../successors.old ../successors.new
Test rebase --continue
@@ -182,21 +191,21 @@
|
o 11:03f165c84ea8@default(draft) addd
|
- | o 10:4b9d80f48523@default(secret) appendab
+ | x 10:4b9d80f48523@default(draft) appendab
| |
- | o 9:a31943eabc43@default(secret) addd
+ | x 9:a31943eabc43@default(draft) addd
| |
+---o 8:a7773ffa7edc@default(draft) Collapsed revision
| |
- | | o 7:03f31481307a@default(secret) changec
+ | | x 7:03f31481307a@default(draft) changec
| | |
- | | o 6:076e9b2ffbe1@default(secret) addc
+ | | x 6:076e9b2ffbe1@default(draft) addc
| |/
- | | o 5:4e322f7ce8e3@foo(secret) changea
+ | | x 5:4e322f7ce8e3@foo(draft) changea
| |/
+---o 4:9c5494949763@default(draft) adde
| |
- | | o 3:98e4a024635e@default(secret) adde
+ | | x 3:98e4a024635e@default(draft) adde
| | |
| | o 2:102a90ea7b4a@default(draft) addb
| |/
@@ -204,15 +213,14 @@
|/
o 0:07f494440405@default(draft) adda
- $ hg debugsuccessors > ../successors.new
+ $ hg debugobsolete > ../successors.new
$ diff -u ../successors.old ../successors.new
--- ../successors.old* (glob)
+++ ../successors.new* (glob)
- @@ -1,4 +1,6 @@
- 03f31481307a a7773ffa7edc
- 076e9b2ffbe1 a7773ffa7edc
- +4b9d80f48523 1951ead97108
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
- +a31943eabc43 03f165c84ea8
+ @@ -2,3 +2,5 @@
+ 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob)
+ 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
+ 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob)
+ +a31943eabc4327df16f9eca71bf7779c32f815f7 03f165c84ea8889fc35a64a392caa7a0084dd212 0 {'date': '* *', 'user': 'test'} (glob)
+ +4b9d80f48523e296f4402cc8e37236b768dfb981 1951ead9710803dbf117e95901954d5ed717f80b 0 {'date': '* *', 'user': 'test'} (glob)
[1]