This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2003da12f49b: wireproto: only expose 
"clonebundles" to version 1 transports (authored by indygreg, 
committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3203?vs=7907&id=7982

REVISION DETAIL
  https://phab.mercurial-scm.org/D3203

AFFECTED FILES
  mercurial/wireproto.py
  tests/test-wireproto-command-capabilities.t

CHANGE DETAILS

diff --git a/tests/test-wireproto-command-capabilities.t 
b/tests/test-wireproto-command-capabilities.t
--- a/tests/test-wireproto-command-capabilities.t
+++ b/tests/test-wireproto-command-capabilities.t
@@ -30,11 +30,11 @@
   s>     \r\n
   s>     *\r\n (glob)
   s>     *\x00\x01\x00\x02\x01F (glob)
-  s>     
\xa2Hcommands\xaaEheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyFlegacyKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyFlegacyCnewFlegacyColdFlegacyInamespaceFlegacyKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullHunbundle\xa2Dargs\xa1EheadsFlegacyKpermissions\x81DpushIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullIgetbundle\xa2Dargs\xa1A*FlegacyKpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullLclonebundles\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
+  s>     
\xa2Hcommands\xa9Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyFlegacyKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyFlegacyCnewFlegacyColdFlegacyInamespaceFlegacyKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullHunbundle\xa2Dargs\xa1EheadsFlegacyKpermissions\x81DpushIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullIgetbundle\xa2Dargs\xa1A*FlegacyKpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x82\xa1DnameDzstd\xa1DnameDzlib
   s>     \r\n
   received frame(size=*; request=1; stream=2; streamflags=stream-begin; 
type=bytes-response; flags=eos|cbor) (glob)
   s>     0\r\n
   s>     \r\n
-  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'clonebundles': {b'args': {}, b'permissions': [b'pull']}, b'getbundle': 
{b'args': {b'*': b'legacy'}, b'permissions': [b'pull']}, b'heads': {b'args': 
{b'publiconly': False}, b'permissions': [b'pull']}, b'known': {b'args': 
{b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, b'listkeys': {b'args': 
{b'namespace': b'ns'}, b'permissions': [b'pull']}, b'lookup': {b'args': 
{b'key': b'legacy'}, b'permissions': [b'pull']}, b'pushkey': {b'args': {b'key': 
b'legacy', b'namespace': b'legacy', b'new': b'legacy', b'old': b'legacy'}, 
b'permissions': [b'push']}, b'unbundle': {b'args': {b'heads': b'legacy'}, 
b'permissions': [b'push']}}, b'compression': [{b'name': b'zstd'}, {b'name': 
b'zlib'}]}]
+  response: [{b'commands': {b'branchmap': {b'args': {}, b'permissions': 
[b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, 
b'getbundle': {b'args': {b'*': b'legacy'}, b'permissions': [b'pull']}, 
b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, 
b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, 
b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, 
b'lookup': {b'args': {b'key': b'legacy'}, b'permissions': [b'pull']}, 
b'pushkey': {b'args': {b'key': b'legacy', b'namespace': b'legacy', b'new': 
b'legacy', b'old': b'legacy'}, b'permissions': [b'push']}, b'unbundle': 
{b'args': {b'heads': b'legacy'}, b'permissions': [b'push']}}, b'compression': 
[{b'name': b'zstd'}, {b'name': b'zlib'}]}]
 
   $ cat error.log
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -865,7 +865,8 @@
 
     return wireprototypes.bytesresponse(''.join(r))
 
-@wireprotocommand('clonebundles', '', permission='pull')
+@wireprotocommand('clonebundles', '', permission='pull',
+                  transportpolicy=POLICY_V1_ONLY)
 def clonebundles(repo, proto):
     """Server command for returning info for available bundles to seed clones.
 



To: indygreg, #hg-reviewers, durin42
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to