--- a/tests/test-evolution.t Mon Dec 19 14:05:25 2011 +0100
+++ b/tests/test-evolution.t Mon Dec 19 14:37:24 2011 +0100
@@ -1,16 +1,20 @@
$ cat >> $HGRCPATH <<EOF
+ > [defaults]
+ > amend=-d "0 0"
> [web]
> push_ssl = false
> allow_push = *
+ > [phases]
+ > publish = False
> [alias]
- > qlog = log --template='{rev} - {node|short} {desc} ({state})\n'
+ > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
> [diff]
> git = 1
> unified = 0
> [extensions]
> hgext.rebase=
+ > hgext.graphlog=
> EOF
- $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH
$ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolution=$(echo $(dirname $TESTDIR))/hgext/evolution.py" >> $HGRCPATH
$ mkcommit() {
@@ -23,9 +27,14 @@
$ hg init local
$ cd local
- $ hg states ready # XXX should be put in default config when state support it
$ mkcommit a
$ mkcommit b
+ $ cat >> .hg/hgrc << EOF
+ > [phases]
+ > publish = True
+ > EOF
+ $ hg pull -q . # make 1 public
+ $ rm .hg/hgrc
$ mkcommit c
$ mkcommit d
$ hg up 1
@@ -33,14 +42,13 @@
$ mkcommit e -q
created new head
$ mkcommit f
- $ hg published 1
$ hg qlog
- 5 - e44648563c73 add f (ready)
- 4 - fbb94e3a0ecf add e (ready)
- 3 - 47d2a3944de8 add d (ready)
- 2 - 4538525df7e2 add c (ready)
- 1 - 7c3bad9141dc add b (published)
- 0 - 1f0dee641bb7 add a (published)
+ 5 - e44648563c73 add f (1)
+ 4 - fbb94e3a0ecf add e (1)
+ 3 - 47d2a3944de8 add d (1)
+ 2 - 4538525df7e2 add c (1)
+ 1 - 7c3bad9141dc add b (0)
+ 0 - 1f0dee641bb7 add a (0)
test simple kill
@@ -48,11 +56,11 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at fbb94e3a0ecf
$ hg qlog
- 4 - fbb94e3a0ecf add e (ready)
- 3 - 47d2a3944de8 add d (ready)
- 2 - 4538525df7e2 add c (ready)
- 1 - 7c3bad9141dc add b (published)
- 0 - 1f0dee641bb7 add a (published)
+ 4 - fbb94e3a0ecf add e (1)
+ 3 - 47d2a3944de8 add d (1)
+ 2 - 4538525df7e2 add c (1)
+ 1 - 7c3bad9141dc add b (0)
+ 0 - 1f0dee641bb7 add a (0)
test multiple kill
@@ -60,9 +68,9 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 7c3bad9141dc
$ hg qlog
- 2 - 4538525df7e2 add c (ready)
- 1 - 7c3bad9141dc add b (published)
- 0 - 1f0dee641bb7 add a (published)
+ 2 - 4538525df7e2 add c (1)
+ 1 - 7c3bad9141dc add b (0)
+ 0 - 1f0dee641bb7 add a (0)
$ cd ..
##########################
@@ -83,7 +91,6 @@
We start with a plain base repo::
$ hg init main; cd main
- $ hg states ready
$ cat >main-file-1 <<-EOF
> One
>
@@ -104,7 +111,6 @@
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd work
- $ hg states ready
Create First Patch
@@ -202,7 +208,7 @@
1 : a nifty feature - test
0 : base - test
$ hg evolve
- hg relocate --rev 8c7704f377af 1075109f9999
+ hg relocate --rev f8111a076f09 23409eba69a0
$ hg up feature-B -q #prevent feature-A bookmark to move grml
$ hg relocate -r 4 6 --traceback
merging main-file-1