# HG changeset patch # User Pierre-Yves David # Date 1499009295 -7200 # Node ID 26ec0839865b1116417b0781a9063cf9ff453b71 # Parent 52d5c5ce27e48807c3305701567ab6049e32def7# Parent feabbaa01ff09c716345208942a810af57037680 compat: merge with mercurial-4.1 diff -r 52d5c5ce27e4 -r 26ec0839865b hgext3rd/evolve/templatekw.py diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-discovery-obshashrange.t Sun Jul 02 17:28:15 2017 +0200 @@ -194,8 +194,8 @@ running python "*/dummyssh" user@dummy 'hg -R server serve --stdio' (glob) sending hello command sending between command - remote: 516 - remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash + remote: 532 + remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle httpheader=1024 known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash remote: 1 preparing listkeys for "phases" sending listkeys command diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-evolve-obshistory-complex.t --- a/tests/test-evolve-obshistory-complex.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-evolve-obshistory-complex.t Sun Jul 02 17:28:15 2017 +0200 @@ -80,14 +80,12 @@ | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fold2 | | o changeset: 8:d15d0ffc75f6 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fold1 | | | | o changeset: 7:b868bc49b0a4 @@ -232,27 +230,23 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fold2 | | o changeset: 13:d0f33db50670 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fold1 | | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fold1 | | | | o changeset: 11:e036916b63ea @@ -304,21 +298,18 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: fold2 | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fold1 | | | | o changeset: 10:19e14c8397fc diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-evolve-obshistory.t Sun Jul 02 17:28:15 2017 +0200 @@ -989,14 +989,12 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-evolve-templates.t --- a/tests/test-evolve-templates.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-evolve-templates.t Sun Jul 02 17:28:15 2017 +0200 @@ -432,14 +432,12 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-metaedit.t diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-obsolete.t --- a/tests/test-obsolete.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-obsolete.t Sun Jul 02 17:28:15 2017 +0200 @@ -579,7 +579,6 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: bumped summary: add obsol_d''' $ hg push ../other-new/ @@ -609,7 +608,6 @@ |/ parent: 10:2033b4e49474 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: bumped | summary: add obsol_d''' | | o changeset: 11:9468a5f5d8b2 @@ -673,7 +671,6 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: bumped, divergent summary: add obsol_d''' changeset: 16:50f11e5e3a63 @@ -681,7 +678,6 @@ parent: 11:9468a5f5d8b2 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: divergent summary: add obsolet_conflicting_d @@ -721,14 +717,12 @@ | parent: 2:4538525df7e2 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable | summary: add obsol_d'' | | o changeset: 16:50f11e5e3a63 | | parent: 11:9468a5f5d8b2 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: divergent | | summary: add obsolet_conflicting_d | | | | o changeset: 15:705ab2a6b72e @@ -752,7 +746,6 @@ | | |/ parent: 10:2033b4e49474 | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 - | | | trouble: bumped, divergent | | | summary: add obsol_d''' | | | | o | changeset: 11:9468a5f5d8b2 diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-stabilize-conflict.t Sun Jul 02 17:28:15 2017 +0200 @@ -145,7 +145,6 @@ | o changeset: 5:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: babar count up to fifteen | | | x changeset: 4:5977072d13c5 @@ -236,7 +235,6 @@ | o changeset: 8:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: babar count up to fifteen | | | x changeset: 7:e04690b09bc6 diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-stabilize-order.t Sun Jul 02 17:28:15 2017 +0200 @@ -209,13 +209,11 @@ | | parent: 12:2256dae6521f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: secondambiguous | | | | o changeset: 13:bdc003b6eec2 | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: firstambiguous | | | x changeset: 12:2256dae6521f diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-stablesort-criss-cross.t diff -r 52d5c5ce27e4 -r 26ec0839865b tests/test-topic.t --- a/tests/test-topic.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-topic.t Sun Jul 02 17:28:15 2017 +0200 @@ -565,7 +565,6 @@ | @ changeset: 10:4073470c35e1 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fran? | | @@ -590,11 +589,10 @@ changeset: 12:18b70b8de1f0 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: unstable summary: fran? $ hg sum - parent: 12:18b70b8de1f0 (unstable) + parent: 12:18b70b8de1f0 fran? branch: default commit: (clean) @@ -615,7 +613,6 @@ | @ changeset: 12:18b70b8de1f0 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable | | summary: fran? | |