[PATCH 8 of 8 V5] bundle2: advertise bookmark capability
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Sep 16 11:53:06 EDT 2016
On 09/16/2016 01:10 PM, Stanislau Hlebik wrote:
> # HG changeset patch
> # User Stanislau Hlebik <stash at fb.com>
> # Date 1473954507 25200
> # Thu Sep 15 08:48:27 2016 -0700
> # Node ID b7ff3e9d19041d87bc31ff21e9c3bb2e5e3d857d
> # Parent 837f2f1650ebf323b46924040f180fc966e80fbf
> bundle2: advertise bookmark capability
As pointed earlier, I think we should test these part earlier, eg: as
soon as we have either push or pull working. Testing earlier would
reduce the window were we have untested code and help working with
smaller series.
We can hide the feature under an experimental flag until the API
stabilize. actually, It might actually be an idea to do so in all case
until we get some more field data.
Also please handle the testing of the pushkey version through a
'legacy.devel.xxx' option instead of an extension. This would match what
we are doing elsewhere.
You might want to introduce other test change (like the one for long
bookmark name) in another changeset to make sure they are not lost in
the noise. (point to the related issue would also be useful).
>
> diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
> --- a/mercurial/bundle2.py
> +++ b/mercurial/bundle2.py
> @@ -1259,6 +1259,7 @@
> 'digests': tuple(sorted(util.DIGESTS.keys())),
> 'remote-changegroup': ('http', 'https'),
> 'hgtagsfnodes': (),
> + 'bookmarks': (),
> }
>
> def getrepocaps(repo, allowpushback=False):
> diff --git a/tests/test-acl.t b/tests/test-acl.t
> --- a/tests/test-acl.t
> +++ b/tests/test-acl.t
> @@ -92,13 +92,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -155,13 +155,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -221,13 +221,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -297,13 +297,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -362,13 +362,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -432,13 +432,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -499,13 +499,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -571,13 +571,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -640,13 +640,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -711,13 +711,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -794,13 +794,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -872,13 +872,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -945,13 +945,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1029,13 +1029,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1115,13 +1115,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1197,13 +1197,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1273,13 +1273,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1356,13 +1356,13 @@
> f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd
> 911600dab2ae7a9baff75958b84fe606851ce955
> bundle2-output-bundle: "HG20", 4 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1471,14 +1471,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1559,14 +1559,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1633,14 +1633,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1703,14 +1703,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1767,14 +1767,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1860,14 +1860,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -1952,14 +1952,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -2021,14 +2021,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> @@ -2107,14 +2107,14 @@
> 911600dab2ae7a9baff75958b84fe606851ce955
> e8fc755d4d8217ee5b0c2bb41558c40d43b92c01
> bundle2-output-bundle: "HG20", 5 parts total
> - bundle2-output-part: "replycaps" 155 bytes payload
> + bundle2-output-part: "replycaps" 165 bytes payload
> bundle2-output-part: "check:heads" streamed payload
> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "replycaps" supported
> - bundle2-input-part: total payload size 155
> + bundle2-input-part: total payload size 165
> bundle2-input-part: "check:heads" supported
> bundle2-input-part: total payload size 20
> bundle2-input-part: "changegroup" (params: 1 mandatory) supported
> diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
> --- a/tests/test-bookmarks-pushpull.t
> +++ b/tests/test-bookmarks-pushpull.t
> @@ -770,6 +770,22 @@
> no changes found
> [1]
>
> +Pushing long bookmark
> + >>> a = open('longbook', 'w')
> + >>> a.write('a')
> + >>> for x in xrange(256):
> + ... a.write(str(x))
> + $ LONG_BOOK="`cat longbook`"
> + $ rm longbook
> + $ hg book ${LONG_BOOK}
> + $ hg push -B ${LONG_BOOK} ../unchanged-b
> + pushing to ../unchanged-b
> + searching for changes
> + no changes found
> + exporting bookmark a0123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255
> + [1]
> + $ hg book -d ${LONG_BOOK}
> + $ hg up -q @
>
> Check hook preventing push (issue4455)
> ======================================
> @@ -787,6 +803,14 @@
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> +
> +Disable 'pushbookmarks' part to test pushkey hooks
> + $ cat >> $TESTTMP/removepushbookmarks.py << EOF
> + > import mercurial.exchange as exchange
> + > def uisetup(ui):
> + > exchange.b2partsgenorder.remove('pushbookmarks')
> + > del exchange.b2partsgenmapping['pushbookmarks']
> + > EOF
> $ cat >> .hg/hgrc << EOF
> > [paths]
> > local=../issue4455-dest/
> @@ -794,6 +818,8 @@
> > http=http://localhost:$HGPORT/
> > [ui]
> > ssh=python "$TESTDIR/dummyssh"
> + > [extensions]
> + > removepushbookmarks=$TESTTMP/removepushbookmarks.py
> > EOF
> $ cat >> ../issue4455-dest/.hg/hgrc << EOF
> > [hooks]
> @@ -808,7 +834,6 @@
>
> Local push
> ----------
> -
> $ hg push -B @ local
> pushing to $TESTTMP/issue4455-dest (glob)
> searching for changes
> diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
> --- a/tests/test-bundle2-exchange.t
> +++ b/tests/test-bundle2-exchange.t
> @@ -252,9 +252,6 @@
> remote: pushkey: lock state after "phases"
> remote: lock: free
> remote: wlock: free
> - remote: pushkey: lock state after "bookmarks"
> - remote: lock: free
> - remote: wlock: free
> remote: postclose-tip:eea13746799a public book_eea1
> remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/other (glob)
> updating bookmark book_eea1
> @@ -336,9 +333,6 @@
> remote: added 1 changesets with 1 changes to 1 files
> remote: 1 new obsolescence markers
> remote: pre-close-tip:5fddd98957c8 draft book_5fdd
> - remote: pushkey: lock state after "bookmarks"
> - remote: lock: free
> - remote: wlock: free
> remote: postclose-tip:5fddd98957c8 draft book_5fdd
> remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob)
> updating bookmark book_5fdd
> @@ -390,9 +384,6 @@
> remote: pushkey: lock state after "phases"
> remote: lock: free
> remote: wlock: free
> - remote: pushkey: lock state after "bookmarks"
> - remote: lock: free
> - remote: wlock: free
> remote: postclose-tip:32af7686d403 public book_32af
> remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:127.0.0.1: (glob)
> updating bookmark book_32af
> diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
> --- a/tests/test-clone-uncompressed.t
> +++ b/tests/test-clone-uncompressed.t
> @@ -45,7 +45,7 @@
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> bundle2-input-part: total payload size 58
> - bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> + bundle2-input-part: "bookmarks" supported
> bundle2-input-bundle: 1 parts total
> checking for updated bookmarks
>
> diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
> --- a/tests/test-clonebundles.t
> +++ b/tests/test-clonebundles.t
> @@ -32,7 +32,7 @@
> $ cat server/access.log
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> * - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phases%2Cbookmarks (glob)
> + * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phases (glob)
>
> Empty manifest file results in retrieval
> (the extension only checks if the manifest file exists)
> diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
> --- a/tests/test-hgweb-commands.t
> +++ b/tests/test-hgweb-commands.t
> @@ -1903,7 +1903,7 @@
> $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities'; echo
> 200 Script output follows
>
> - lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
> + lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
>
> heads
>
> @@ -2148,7 +2148,7 @@
> batch
> stream-preferred
> streamreqs=generaldelta,revlogv1
> - bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps
> + bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps
> unbundle=HG10GZ,HG10BZ,HG10UN
> httpheader=1024
>
> diff --git a/tests/test-hook.t b/tests/test-hook.t
> --- a/tests/test-hook.t
> +++ b/tests/test-hook.t
> @@ -220,6 +220,19 @@
> update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc
> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> +Disable 'pushbookmarks' part to test pushkey hooks
> + $ cat >> $TESTTMP/removepushbookmarks.py << EOF
> + > import mercurial.exchange as exchange
> + > def uisetup(ui):
> + > exchange.b2partsgenorder.remove('pushbookmarks')
> + > del exchange.b2partsgenmapping['pushbookmarks']
> + > EOF
> + $ cat >> .hg/hgrc << EOF
> + > [extensions]
> + > removepushbookmarks=$TESTTMP/removepushbookmarks.py
> + > [hooks]
> + > EOF
> +
> pushkey hook
>
> $ echo "pushkey = printenv.py pushkey" >> .hg/hgrc
> diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t
> --- a/tests/test-http-proxy.t
> +++ b/tests/test-http-proxy.t
> @@ -104,16 +104,16 @@
> * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
> * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
> + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases (glob)
> diff --git a/tests/test-http.t b/tests/test-http.t
> --- a/tests/test-http.t
> +++ b/tests/test-http.t
> @@ -262,11 +262,11 @@
> "GET /?cmd=stream_out HTTP/1.1" 401 -
> "GET /?cmd=stream_out HTTP/1.1" 200 -
> "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d
> - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
> + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases
> "GET /?cmd=capabilities HTTP/1.1" 200 -
> "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D
> - "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
> - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks
> + "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases
> + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases
> "GET /?cmd=capabilities HTTP/1.1" 200 -
> "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip
> "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces
> diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t
> --- a/tests/test-obsolete-changeset-exchange.t
> +++ b/tests/test-obsolete-changeset-exchange.t
> @@ -135,7 +135,7 @@
> bundle2-output-bundle: "HG20", 3 parts total
> bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
> bundle2-output-part: "listkeys" (params: 1 mandatory) 58 bytes payload
> - bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
> + bundle2-output-part: "bookmarks" empty payload
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
> adding changesets
> @@ -148,7 +148,7 @@
> bundle2-input-part: total payload size 474
> bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> bundle2-input-part: total payload size 58
> - bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> + bundle2-input-part: "bookmarks" supported
> bundle2-input-bundle: 2 parts total
> checking for updated bookmarks
> (run 'hg heads' to see heads, 'hg merge' to merge)
> diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
> --- a/tests/test-setdiscovery.t
> +++ b/tests/test-setdiscovery.t
> @@ -350,7 +350,7 @@
> $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling
> "GET /?cmd=capabilities HTTP/1.1" 200 -
> "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db
> - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477
> + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
> $ cat errors.log
>
> diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
> --- a/tests/test-ssh-bundle1.t
> +++ b/tests/test-ssh-bundle1.t
> @@ -462,8 +462,8 @@
> running python ".*/dummyssh" user at dummy ('|")hg -R remote serve --stdio('|") (re)
> sending hello command
> sending between command
> - remote: 371
> - remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
> + remote: 383
> + remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
> remote: 1
> preparing listkeys for "bookmarks"
> sending listkeys command
> diff --git a/tests/test-ssh.t b/tests/test-ssh.t
> --- a/tests/test-ssh.t
> +++ b/tests/test-ssh.t
> @@ -454,8 +454,8 @@
> running python ".*/dummyssh" user at dummy ('|")hg -R remote serve --stdio('|") (re)
> sending hello command
> sending between command
> - remote: 371
> - remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
> + remote: 383
> + remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
> remote: 1
> query 1; heads
> sending batch command
> @@ -466,7 +466,7 @@
> bundle2-input-bundle: with-transaction
> bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> bundle2-input-part: total payload size 15
> - bundle2-input-part: "listkeys" (params: 1 mandatory) supported
> + bundle2-input-part: "bookmarks" supported
> bundle2-input-part: total payload size 45
> bundle2-input-bundle: 1 parts total
> checking for updated bookmarks
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list