--- a/tests/test-discovery-obshashrange.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-discovery-obshashrange.t Fri Jun 08 22:52:51 2018 +0530
@@ -183,7 +183,6 @@
remote: * (glob)
remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
remote: 1
- sending protocaps command
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 58 bytes
@@ -319,9 +318,8 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob)
--- a/tests/test-evolve-obshistory.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-evolve-obshistory.t Fri Jun 08 22:52:51 2018 +0530
@@ -218,8 +218,8 @@
}
]
$ hg update 471f378eab4c
- abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '471f378eab4c'!
+ (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
[255]
$ hg update --hidden "desc(A0)"
updating to a hidden changeset 471f378eab4c
@@ -321,8 +321,8 @@
$ hg up 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up 0dec01379d3b
- abort: hidden revision '0dec01379d3b' is pruned!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '0dec01379d3b'!
+ (use --hidden to access hidden revisions; pruned)
[255]
$ hg up --hidden -r 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
@@ -520,8 +520,8 @@
(No patch available, too many successors (2))
$ hg update 471597cad322
- abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '471597cad322'!
+ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
[255]
$ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset 471597cad322
@@ -801,8 +801,8 @@
(No patch available, too many successors (4))
$ hg update de7290d8b885
- abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
- (use --hidden to access hidden revisions)
+ abort: hidden revision 'de7290d8b885'!
+ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
[255]
$ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset de7290d8b885
@@ -1026,8 +1026,8 @@
}
]
$ hg update 471f378eab4c
- abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '471f378eab4c'!
+ (use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
@@ -1036,8 +1036,8 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg update 0dec01379d3b
- abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '0dec01379d3b'!
+ (use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
@@ -1373,8 +1373,8 @@
}
]
$ hg update 471f378eab4c
- abort: hidden revision '471f378eab4c' has diverged!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '471f378eab4c'!
+ (use --hidden to access hidden revisions; diverged)
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
@@ -1604,8 +1604,8 @@
}
]
$ hg update 471f378eab4c
- abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '471f378eab4c'!
+ (use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
--- a/tests/test-fold.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-fold.t Fri Jun 08 22:52:51 2018 +0530
@@ -112,8 +112,8 @@
(test inherited from test-evolve.t)
$ hg fold --from 6 # want to run hg fold 6
- abort: hidden revision '6' was rewritten as: 198b5c405d01!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '6'!
+ (use --hidden to access hidden revisions; successor: 198b5c405d01)
[255]
$ hg log -G
--- a/tests/test-prune.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-prune.t Fri Jun 08 22:52:51 2018 +0530
@@ -306,8 +306,8 @@
bookmark 'todelete' deleted
1 changesets pruned
$ hg id -ir dcbb326fdec2
- abort: hidden revision 'dcbb326fdec2' is pruned!
- (use --hidden to access hidden revisions)
+ abort: hidden revision 'dcbb326fdec2'!
+ (use --hidden to access hidden revisions; pruned)
[255]
$ hg id -ir d62d843c9a01
d62d843c9a01
@@ -340,8 +340,8 @@
3 changesets pruned
$ hg tag --remove --local c
$ hg id -ir 6:2702dd0c91e7
- abort: hidden revision '6' is pruned!
- (use --hidden to access hidden revisions)
+ abort: hidden revision '6'!
+ (use --hidden to access hidden revisions; pruned)
[255]
$ hg debugobsstorestat
--- a/tests/test-userguide.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-userguide.t Fri Jun 08 22:52:51 2018 +0530
@@ -38,8 +38,8 @@
$ echo 'tweak feature Y' >> file1.c
$ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
$ hg shortlog -q -r fe0ecd3bd2a4
- abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
- (use --hidden to access hidden revisions)
+ abort: hidden revision 'fe0ecd3bd2a4'!
+ (use --hidden to access hidden revisions; successor: 934359450037)
[255]
$ hg --hidden shortlog -G
@ 2:934359450037 draft implement feature Y
--- a/tests/test-wireproto.t Tue May 22 23:51:57 2018 +0530
+++ b/tests/test-wireproto.t Fri Jun 08 22:52:51 2018 +0530
@@ -195,7 +195,7 @@
$ cat hg.pid >> $DAEMON_PIDS
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
- _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+ _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
Check we cannot use pushkey for marker exchange anymore