phases: update exchange test to include node hash.
This will be easier for exchange test.
--- a/tests/test-phases-exchange.t Thu Dec 15 11:57:33 2011 +0100
+++ b/tests/test-phases-exchange.t Wed Oct 26 14:30:43 2011 +0200
@@ -2,7 +2,7 @@
> [extensions]
> graphlog=
> EOF
- $ alias hgph='hg log --template "{rev} {phase} {desc}\n"'
+ $ alias hgph='hg log --template "{rev} {phase} {desc} - {node|short}\n"'
$ mkcommit() {
> echo "$1" > "$1"
@@ -17,10 +17,10 @@
$ mkcommit a-C
$ mkcommit a-D
$ hgph
- 3 1 a-D
- 2 1 a-C
- 1 1 a-B
- 0 1 a-A
+ 3 1 a-D - b555f63b6063
+ 2 1 a-C - 54acac6f23ab
+ 1 1 a-B - 548a3d25dbf0
+ 0 1 a-A - 054250a37db4
$ hg init ../beta
$ hg push -r 1 ../beta
@@ -31,21 +31,21 @@
adding file changes
added 2 changesets with 2 changes to 2 files
$ hgph
- 3 1 a-D
- 2 1 a-C
- 1 0 a-B
- 0 0 a-A
+ 3 1 a-D - b555f63b6063
+ 2 1 a-C - 54acac6f23ab
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
$ cd ../beta
$ hgph
- 1 0 a-B
- 0 0 a-A
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
$ hg up -q
$ mkcommit b-A
$ hgph
- 2 1 b-A
- 1 0 a-B
- 0 0 a-A
+ 2 1 b-A - f54f1bb90ff3
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
$ hg pull ../alpha
pulling from ../alpha
searching for changes
@@ -55,30 +55,30 @@
added 2 changesets with 2 changes to 2 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hgph
- 4 0 a-D
- 3 0 a-C
- 2 1 b-A
- 1 0 a-B
- 0 0 a-A
+ 4 0 a-D - b555f63b6063
+ 3 0 a-C - 54acac6f23ab
+ 2 1 b-A - f54f1bb90ff3
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
pull did not updated ../alpha state.
push from alpha to beta should update phase even if nothing is transfered
$ cd ../alpha
$ hgph # not updated by remote pull
- 3 1 a-D
- 2 1 a-C
- 1 0 a-B
- 0 0 a-A
+ 3 1 a-D - b555f63b6063
+ 2 1 a-C - 54acac6f23ab
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
$ hg push ../beta
pushing to ../beta
searching for changes
no changes found
$ hgph
- 3 0 a-D
- 2 0 a-C
- 1 0 a-B
- 0 0 a-A
+ 3 0 a-D - b555f63b6063
+ 2 0 a-C - 54acac6f23ab
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
update must update phase of common changeset too
@@ -93,21 +93,21 @@
$ cd ../beta
$ hgph # not updated by remote pull
- 4 0 a-D
- 3 0 a-C
- 2 1 b-A
- 1 0 a-B
- 0 0 a-A
+ 4 0 a-D - b555f63b6063
+ 3 0 a-C - 54acac6f23ab
+ 2 1 b-A - f54f1bb90ff3
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
$ hg pull ../alpha
pulling from ../alpha
searching for changes
no changes found
$ hgph
- 4 0 a-D
- 3 0 a-C
- 2 0 b-A
- 1 0 a-B
- 0 0 a-A
+ 4 0 a-D - b555f63b6063
+ 3 0 a-C - 54acac6f23ab
+ 2 0 b-A - f54f1bb90ff3
+ 1 0 a-B - 548a3d25dbf0
+ 0 0 a-A - 054250a37db4
Publish configuration option
----------------------------
@@ -130,9 +130,10 @@
added 5 changesets with 5 changes to 5 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hgph
- 4 1 a-D
- 3 1 a-C
- 2 1 b-A
- 1 1 a-B
- 0 1 a-A
+ 4 1 a-D - b555f63b6063
+ 3 1 a-C - 54acac6f23ab
+ 2 1 b-A - f54f1bb90ff3
+ 1 1 a-B - 548a3d25dbf0
+ 0 1 a-A - 054250a37db4
+ $ cd ..