Patchwork [1,of,4,V2] bundle2: don't check for whether we can do stream clones

login
register
mail settings
Submitter Siddharth Agarwal
Date May 11, 2017, 5:51 p.m.
Message ID <b433f29233e32d1c1e66.1494525080@devvm028.frc2.facebook.com>
Download mbox | patch
Permalink /patch/20573/
State Accepted
Headers show

Comments

Siddharth Agarwal - May 11, 2017, 5:51 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1494289851 25200
#      Mon May 08 17:30:51 2017 -0700
# Node ID b433f29233e32d1c1e665b0c04ae0ef356ce0396
# Parent  8f1a2b848b52ea7bf3fe2404e3b62924c7aae93f
bundle2: don't check for whether we can do stream clones

At the moment this isn't used and all stream clones use the legacy protocol.

In an upcoming diff, canperformstreamclone will print out a message if a stream
clone was requested but couldn't happen for some reason. Removing this call
ensures the message isn't printed twice.

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1332,7 +1332,9 @@  def _pullbundle2(pullop):
     For now, the only supported data are changegroup."""
     kwargs = {'bundlecaps': caps20to10(pullop.repo)}
 
-    streaming, streamreqs = streamclone.canperformstreamclone(pullop)
+    # At the moment we don't do stream clones over bundle2. If that is
+    # implemented then here's where the check for that will go.
+    streaming = False
 
     # pulling changegroup
     pullop.stepsdone.add('changegroup')